X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespillbelady.c;h=dc8532a7fc6cd676616f35ed911601b1039bdb17;hb=ca1b1615fbe23a4d5cf72e7be5d2ee831615cbc2;hp=c5a021ee601b9603b6d64c32bb2e6c48a3070219;hpb=f9991643ed39d3e0d1f65fad56a7547482b29ebb;p=libfirm

diff --git a/ir/be/bespillbelady.c b/ir/be/bespillbelady.c
index c5a021ee6..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))
 
@@ -257,10 +257,12 @@ static int is_mem_phi(const ir_node *irn, void *data) {
 static INLINE unsigned get_distance(belady_env_t *bel, const ir_node *from, unsigned from_step, const ir_node *def, int skip_from_uses)
 {
 	arch_irn_flags_t fl = arch_irn_get_flags(bel->arch, def);
-	if((fl & (arch_irn_flags_ignore | arch_irn_flags_dont_spill)) != 0)
+	unsigned dist = be_get_next_use(bel->uses, from, from_step, def, skip_from_uses);
+
+	if(!USES_IS_INIFINITE(dist) && (fl & (arch_irn_flags_ignore | arch_irn_flags_dont_spill)) != 0)
 		return 0;
-	else
-		return be_get_next_use(bel->uses, from, from_step, def, skip_from_uses);
+
+	return dist;
 }
 
 /**
@@ -595,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);
 	}
 }
@@ -612,17 +614,20 @@ static void remove_unused_reloads(ir_graph *irg, belady_env_t *bel) {
 		ir_node *spill;
 		DBG((dbg, DBG_SPILL, "Removing %+F before %+F in %+F\n", irn, sched_next(irn), get_nodes_block(irn)));
 
-		spill = get_irn_n(irn, be_pos_Reload_mem);
+		if (be_is_Reload(irn))
+			spill = get_irn_n(irn, be_pos_Reload_mem);
 
 		/* remove reload */
 		set_irn_n(irn, 0, new_Bad());
 		sched_remove(irn);
 
-		/* if spill not used anymore, remove it too
-		 * test of regclass is necessary since spill may be a phi-M */
-		if (get_irn_n_edges(spill) == 0 && bel->cls == arch_get_irn_reg_class(bel->arch, spill, -1)) {
-			set_irn_n(spill, 0, new_Bad());
-			sched_remove(spill);
+		if (be_is_Reload(irn)) {
+			/* if spill not used anymore, remove it too
+			 * test of regclass is necessary since spill may be a phi-M */
+			if (get_irn_n_edges(spill) == 0 && bel->cls == arch_get_irn_reg_class(bel->arch, spill, -1)) {
+				set_irn_n(spill, 0, new_Bad());
+				sched_remove(spill);
+			}
 		}
 	}
 }
@@ -630,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));