X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespillbelady.c;h=237ef7782af65bb3d3b370bb7449b965974d138b;hb=6e3e499d6c68aee0c6a9ada6a99f16c4f6f8445b;hp=1e765a5c5877af49aa19c2d63e920f2f2f51e842;hpb=db1ec481e0ff8d3afc24c124a597e12bf45d39c4;p=libfirm

diff --git a/ir/be/bespillbelady.c b/ir/be/bespillbelady.c
index 1e765a5c5..237ef7782 100644
--- a/ir/be/bespillbelady.c
+++ b/ir/be/bespillbelady.c
@@ -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;
 }
 
 /**
@@ -588,16 +590,15 @@ static void remove_copies(belady_env_t *bel) {
 	ir_node *irn;
 
 	for (irn = pset_first(bel->copies); irn; irn = pset_next(bel->copies)) {
-		ir_node *src, *spill;
+		ir_node *src, *user;
 
 		assert(be_is_Copy(irn));
 		assert(get_irn_n_edges(irn) == 1 && "This is not a copy introduced in 'compute_block_start_info()'. Who created it?");
 
-		spill = get_irn_edge(get_irn_irg(irn), irn, 0)->src;
-		assert(be_is_Spill(spill) && "This is not a copy introduced in 'compute_block_start_info()'. Who created it?");
+		user = get_irn_edge(get_irn_irg(irn), irn, 0)->src;
 
-		src = get_irn_n(irn, 0);
-		set_irn_n(spill, 0, src);
+		src = get_irn_n(irn, be_pos_Copy_orig);
+		set_irn_n(user, 0, src);
 	}
 }
 
@@ -613,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, 0);
+		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);
+			}
 		}
 	}
 }
@@ -631,7 +635,7 @@ 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);