X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespill.c;h=23d2a0aca7e40c07ac87ad2ff72598c19accef3d;hb=b269a558ba158e761c06161b14e4208c85a07955;hp=5738414d6c400ff89536b48297ebe564756fe9be;hpb=c9623d3dd138aca08572167934c1a7c1fb826344;p=libfirm

diff --git a/ir/be/bespill.c b/ir/be/bespill.c
index 5738414d6..23d2a0aca 100644
--- a/ir/be/bespill.c
+++ b/ir/be/bespill.c
@@ -27,6 +27,7 @@
 #include "benode_t.h"
 #include "bechordal_t.h"
 
+#undef REMAT
 /* This enables re-computation of values. Current state: Unfinished and buggy. */
 #undef BUGGY_REMAT
 
@@ -182,6 +183,7 @@ static void phi_walker(ir_node *irn, void *env) {
 	}
 }
 
+#ifdef REMAT
 
 #ifdef BUGGY_REMAT
 
@@ -237,6 +239,18 @@ is_alive:	;
 	return 1;
 }
 
+#else /* BUGGY_REMAT */
+
+static int check_remat_conditions(spill_env_t *senv, ir_node *spill, ir_node *spilled, ir_node *reloader) {
+	const arch_env_t *aenv = senv->chordal_env->birg->main_env->arch_env;
+
+	return get_irn_arity(spilled) == 0 &&
+		   be_is_Spill(spill) &&
+		   arch_irn_is(aenv, spilled, rematerializable);
+}
+
+#endif /* BUGGY_REMAT */
+
 static ir_node *do_remat(spill_env_t *senv, ir_node *spilled, ir_node *reloader) {
 	ir_node *res;
 	ir_node *bl = (is_Block(reloader)) ? reloader : get_nodes_block(reloader);
@@ -247,6 +261,7 @@ static ir_node *do_remat(spill_env_t *senv, ir_node *spilled, ir_node *reloader)
 		get_irn_mode(spilled),
 		get_irn_arity(spilled),
 		get_irn_in(spilled));
+	copy_node_attr(spilled, res);
 
 	DBG((senv->dbg, LEVEL_1, "Insert remat %+F before reloader %+F\n", res, reloader));
 
@@ -304,7 +319,7 @@ void be_insert_spills_reloads(spill_env_t *senv, pset *reload_set) {
 			/* the spill for this reloader */
 			ir_node *spill   = be_spill_node(senv, si->spilled_node);
 
-#ifdef BUGGY_REMAT
+#ifdef REMAT
 			if (check_remat_conditions(senv, spill, si->spilled_node, rld->reloader))
 				new_val = do_remat(senv, si->spilled_node, rld->reloader);
 			else
@@ -568,7 +583,7 @@ void be_compute_spill_offsets(be_chordal_env_t *cenv) {
 	ssenv.cenv  = cenv;
 	ssenv.slots = pmap_create();
 	ssenv.types = pmap_create();
-	ssenv.dbg   = firm_dbg_register("ir.be.spillslots");
+	FIRM_DBG_REGISTER(ssenv.dbg, "ir.be.spillslots");
 
 	/* Get initial spill slots */
 	irg_walk_graph(cenv->irg, NULL, compute_spill_slots_walker, &ssenv);