X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespill.c;h=4eecd8eb61bad9fa5e8b8ff3c00c04e993e9eed7;hb=dc846fc56d4adb28ee4811ea1ae16cf0bd8fb85f;hp=2d3436a2bf2a945981b14d59b8dbbae32e18b860;hpb=ac4539bca5c39db469e9e54cfa81072ead93f5c1;p=libfirm

diff --git a/ir/be/bespill.c b/ir/be/bespill.c
index 2d3436a2b..4eecd8eb6 100644
--- a/ir/be/bespill.c
+++ b/ir/be/bespill.c
@@ -29,7 +29,7 @@
 #include "irtools.h"
 #include "debug.h"
 #include "iredges_t.h"
-#include "adt/raw_bitset.h"
+#include "raw_bitset.h"
 #include "statev.h"
 #include "irgwalk.h"
 
@@ -39,7 +39,7 @@
 #include "belive_t.h"
 #include "beirg.h"
 #include "bearch.h"
-#include "benode_t.h"
+#include "benode.h"
 #include "besched.h"
 #include "bera.h"
 #include "beintlive_t.h"
@@ -50,7 +50,7 @@
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
 typedef struct be_pre_spill_env_t {
-	be_irg_t                    *birg;
+	ir_graph                    *irg;
 	const arch_register_class_t *cls;
 } be_pre_spill_env_t;
 
@@ -58,8 +58,9 @@ static void prepare_constr_insn(be_pre_spill_env_t *env, ir_node *node)
 {
 	const arch_register_class_t *cls = env->cls;
 	ir_node  *block      = get_nodes_block(node);
-	const be_irg_t *birg = env->birg;
-	be_lv_t *lv          = birg->lv;
+	const ir_graph *irg  = env->irg;
+	be_irg_t       *birg = be_birg_from_irg(irg);
+	be_lv_t *lv          = be_get_irg_liveness(irg);
 	unsigned *tmp        = NULL;
 	unsigned *def_constr = NULL;
 	int       arity      = get_irn_arity(node);
@@ -70,15 +71,14 @@ static void prepare_constr_insn(be_pre_spill_env_t *env, ir_node *node)
 	 * fullfil the constraint
 	 * (typical example: stack pointer as input to copyb)
 	 * TODO: This really just checks precolored registers at the moment and
-	 *       ignore the general case of not matching in/out constraints
+	 *       ignores the general case of not matching in/out constraints
 	 */
 	for (i = 0; i < arity; ++i) {
-		ir_node *op = get_irn_n(node, i);
-		ir_node *copy;
-		const arch_register_t *reg;
-		const arch_register_req_t *req;
+		ir_node                   *op  = get_irn_n(node, i);
+		const arch_register_req_t *req = arch_get_register_req(node, i);
+		const arch_register_t     *reg;
+		ir_node                   *copy;
 
-		req = arch_get_register_req(node, i);
 		if (req->cls != cls)
 			continue;
 		reg = arch_get_irn_register(op);
@@ -87,8 +87,8 @@ static void prepare_constr_insn(be_pre_spill_env_t *env, ir_node *node)
 
 		/* precolored with an ignore register (which is not a joker like
 		   unknown/noreg) */
-		if (arch_register_type_is(reg, joker)
-				|| !arch_register_type_is(reg, ignore))
+		if ((reg->type & arch_register_type_joker) ||
+		    rbitset_is_set(birg->allocatable_regs, reg->global_index))
 			continue;
 
 		if (! (req->type & arch_register_req_type_limited))
@@ -100,7 +100,8 @@ static void prepare_constr_insn(be_pre_spill_env_t *env, ir_node *node)
 		stat_ev_int("constr_copy", 1);
 		sched_add_before(node, copy);
 		set_irn_n(node, i, copy);
-		DBG((dbg, LEVEL_3, "inserting ignore arg copy %+F for %+F pos %d\n", copy, node, i));
+		DBG((dbg, LEVEL_3, "inserting ignore arg copy %+F for %+F pos %d\n",
+		     copy, node, i));
 	}
 
 	/* insert copies for nodes that occur constrained more than once. */
@@ -136,15 +137,9 @@ static void prepare_constr_insn(be_pre_spill_env_t *env, ir_node *node)
 
 			/* if the constraint is the same, no copy is necessary
 			 * TODO generalise unequal but overlapping constraints */
-			if (rbitset_equal(req->limited, req2->limited, cls->n_regs))
+			if (rbitsets_equal(req->limited, req2->limited, cls->n_regs))
 				continue;
 
-#if 0
-			/* Matze: looks fishy to me disabled it for now */
-			if (be_is_Copy(get_irn_n(insn->irn, a_op->pos)))
-				continue;
-#endif
-
 			copy = be_new_Copy(cls, block, in);
 			stat_ev_int("constr_copy", 1);
 
@@ -238,21 +233,23 @@ static void prepare_constr_insn(be_pre_spill_env_t *env, ir_node *node)
 
 static void pre_spill_prepare_constr_walker(ir_node *block, void *data)
 {
-	be_pre_spill_env_t *env = data;
+	be_pre_spill_env_t *env = (be_pre_spill_env_t*)data;
 	ir_node *node;
 	sched_foreach(block, node) {
 		prepare_constr_insn(env, node);
 	}
 }
 
-void be_pre_spill_prepare_constr(be_irg_t *birg,
+void be_pre_spill_prepare_constr(ir_graph *irg,
                                  const arch_register_class_t *cls)
 {
-	ir_graph *irg = birg->irg;
 	be_pre_spill_env_t env;
 	memset(&env, 0, sizeof(env));
-	env.birg = birg;
-	env.cls  = cls;
+	env.irg = irg;
+	env.cls = cls;
+
+	be_assure_liveness(irg);
+
 	irg_block_walk_graph(irg, pre_spill_prepare_constr_walker, NULL, &env);
 }
 
@@ -277,14 +274,14 @@ void be_register_spiller(const char *name, be_spiller_t *spiller)
 	be_add_module_to_list(&spillers, name, spiller);
 }
 
-void be_do_spill(be_irg_t *birg, const arch_register_class_t *cls)
+void be_do_spill(ir_graph *irg, const arch_register_class_t *cls)
 {
 	assert(selected_spiller != NULL);
-	if (selected_spiller != NULL) {
-		selected_spiller->spill(birg, cls);
-	}
+
+	selected_spiller->spill(irg, cls);
 }
 
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_spilloptions);
 void be_init_spilloptions(void)
 {
 	lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
@@ -296,5 +293,3 @@ void be_init_spilloptions(void)
 
 	FIRM_DBG_REGISTER(dbg, "firm.be.spillprepare");
 }
-
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_spilloptions);