X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespillbelady.c;h=dc8532a7fc6cd676616f35ed911601b1039bdb17;hb=80fd56ac0ffd1de6c526a5c820a1ff31f659104b;hp=b54008a2dbca892973535d295905efb7594e632e;hpb=48bb3d05a2605481bf32b4fb20dbb41c4898e24e;p=libfirm

diff --git a/ir/be/bespillbelady.c b/ir/be/bespillbelady.c
index b54008a2d..dc8532a7f 100644
--- a/ir/be/bespillbelady.c
+++ b/ir/be/bespillbelady.c
@@ -47,7 +47,7 @@
 #define DBG_SLOTS  32
 #define DBG_TRACE  64
 #define DEBUG_LVL 0 //(DBG_START | DBG_DECIDE | DBG_WSETS | DBG_FIX | DBG_SPILL)
-static firm_dbg_module_t *dbg = NULL;
+DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
 #define MIN(a,b) (((a)<(b))?(a):(b))
 
@@ -597,7 +597,7 @@ static void remove_copies(belady_env_t *bel) {
 
 		user = get_irn_edge(get_irn_irg(irn), irn, 0)->src;
 
-		src = get_irn_n(irn, be_pos_Copy_orig);
+		src = be_get_Copy_op(irn);
 		set_irn_n(user, 0, src);
 	}
 }
@@ -635,18 +635,19 @@ static void remove_unused_reloads(ir_graph *irg, belady_env_t *bel) {
 void be_spill_belady(const be_chordal_env_t *chordal_env) {
 	belady_env_t bel;
 
-	dbg = firm_dbg_register("ir.be.spillbelady");
+	FIRM_DBG_REGISTER(dbg, "ir.be.spillbelady");
 
 	/* init belady env */
 	obstack_init(&bel.ob);
-	bel.arch    = chordal_env->birg->main_env->arch_env;
-	bel.cls     = chordal_env->cls;
-	bel.n_regs  = arch_register_class_n_regs(bel.cls);
-	bel.ws      = new_workset(&bel.ob, &bel);
-	bel.uses    = be_begin_uses(chordal_env->irg, chordal_env->birg->main_env->arch_env, bel.cls);
-	bel.senv    = be_new_spill_env(dbg, chordal_env, is_mem_phi, NULL);
-	bel.reloads = pset_new_ptr_default();
-	bel.copies  = pset_new_ptr_default();
+	bel.arch      = chordal_env->birg->main_env->arch_env;
+	bel.cls       = chordal_env->cls;
+	bel.n_regs    = arch_register_class_n_regs(bel.cls);
+	bel.ws        = new_workset(&bel.ob, &bel);
+	bel.uses      = be_begin_uses(chordal_env->irg, chordal_env->birg->main_env->arch_env, bel.cls);
+	bel.senv      = be_new_spill_env(chordal_env, is_mem_phi, NULL);
+	DEBUG_ONLY(be_set_spill_env_dbg_module(bel.senv, dbg);)
+	bel.reloads   = pset_new_ptr_default();
+	bel.copies    = pset_new_ptr_default();
 
 	DBG((dbg, LEVEL_1, "running on register class: %s\n", bel.cls->name));