X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_draw.c;h=fdcff5cbb9094245cdfa970f87ceeab7f5319233;hb=d7343573ce41f42a614410632b6aff56b4f30015;hp=2239fa5f9011250a2cb7353496197df5fe005609;hpb=1ce363f80e6a204d4011f85813362d9bd1d0e7e4;p=libfirm

diff --git a/ir/be/bechordal_draw.c b/ir/be/bechordal_draw.c
index 2239fa5f9..fdcff5cbb 100644
--- a/ir/be/bechordal_draw.c
+++ b/ir/be/bechordal_draw.c
@@ -24,9 +24,7 @@
  * @date        12.05.2005
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <limits.h>
 
@@ -163,7 +161,7 @@ const plotter_if_t ps_plotter_vtab = {
 
 plotter_t *new_plotter_ps(const char *filename)
 {
-	ps_plotter_t *ps_plotter = xmalloc(sizeof(*ps_plotter));
+	ps_plotter_t *ps_plotter = XMALLOC(ps_plotter_t);
 	plotter_t *p = (plotter_t *) ps_plotter;
 
 	ps_plotter->filename = filename;
@@ -242,7 +240,6 @@ const draw_chordal_opts_t draw_chordal_def_opts = {
 
 typedef struct _draw_chordal_env_t {
 	const be_chordal_env_t      *chordal_env;
-	const arch_env_t            *arch_env;
 	const arch_register_class_t *cls;
 	pmap                        *block_dims;
 	plotter_t                   *plotter;
@@ -274,7 +271,7 @@ static void block_dims_walker(ir_node *block, void *data)
 
 	list_for_each_entry_reverse(border_t, b, head, list) {
 		ir_node               *irn = b->irn;
-		const arch_register_t *reg = arch_get_irn_register(env->arch_env, irn);
+		const arch_register_t *reg = arch_get_irn_register(irn);
 		int                   col  = arch_register_get_index(reg);
 
 		dims->max_step  = MAX(dims->max_step, b->step);
@@ -397,7 +394,7 @@ static void draw_block(ir_node *bl, void *data)
 
 	list_for_each_entry(border_t, b, head, list) {
 		if (b->is_def) {
-			const arch_register_t *reg = arch_get_irn_register(env->arch_env, b->irn);
+			const arch_register_t *reg = arch_get_irn_register(b->irn);
 			int col      = arch_register_get_index(reg);
 			int live_out = be_is_live_out(lv, bl, b->irn);
 			int x        = (col + 1) * opts->h_inter_gap;
@@ -424,8 +421,8 @@ static void draw_block(ir_node *bl, void *data)
 
 		be_lv_foreach(lv, bl, be_lv_state_in, idx) {
 			ir_node *irn = be_lv_get_irn(lv, bl, idx);
-			if (arch_irn_consider_in_reg_alloc(env->arch_env, env->cls, irn)) {
-				const arch_register_t *reg = arch_get_irn_register(env->arch_env, irn);
+			if (arch_irn_consider_in_reg_alloc(env->cls, irn)) {
+				const arch_register_t *reg = arch_get_irn_register(irn);
 				int     col = arch_register_get_index(reg);
 				int     x   = (col + 1) * opts->h_inter_gap;
 				color_t color;
@@ -467,7 +464,6 @@ void draw_interval_tree(const draw_chordal_opts_t *opts, const be_chordal_env_t
 	struct block_dims  *start_dims;
 	ir_node            *start_block = get_irg_start_block(chordal_env->irg);
 
-	env.arch_env    = chordal_env->birg->main_env->arch_env;
 	env.opts        = opts;
 	env.block_dims  = pmap_create();
 	env.plotter     = plotter;