X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespillbelady.c;h=b54008a2dbca892973535d295905efb7594e632e;hb=7ac90687a76ac7f73c98dca2881b641f2f77ed55;hp=c475e55fc364f1db2f0d78b4ff437fbc983a6e28;hpb=511792418c6b68ed1778f585c32633b93951f34b;p=libfirm

diff --git a/ir/be/bespillbelady.c b/ir/be/bespillbelady.c
index c475e55fc..b54008a2d 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;
 }
 
 /**
@@ -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, 0);
+		src = get_irn_n(irn, be_pos_Copy_orig);
 		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, 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);
+			}
 		}
 	}
 }