X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal.c;h=dc37f886c5250b9065e8f2a7fdb19f9f4cdefa2d;hb=d920844bd5cd3296b03bb281ce43782967e0ce65;hp=52c4e497a8740927747e7706cd38c28d365c8d56;hpb=51db25711d0d37d9a45cb707e772bcb9c74c44b6;p=libfirm

diff --git a/ir/be/bechordal.c b/ir/be/bechordal.c
index 52c4e497a..dc37f886c 100644
--- a/ir/be/bechordal.c
+++ b/ir/be/bechordal.c
@@ -46,6 +46,7 @@
 #include "bearch.h"
 #include "beirgmod.h"
 #include "beifg.h"
+#include "beinsn_t.h"
 
 #include "bechordal_t.h"
 #include "bechordal_draw.h"
@@ -63,14 +64,13 @@
 typedef struct _be_chordal_alloc_env_t {
 	be_chordal_env_t *chordal_env;
 
-	firm_dbg_module_t *constr_dbg;  /**< Debug output for the constraint handler. */
 	pset *pre_colored;              /**< Set of precolored nodes. */
 	bitset_t *live;				    /**< A liveness bitset. */
 	bitset_t *tmp_colors;           /**< An auxiliary bitset which is as long as the number of colors in the class. */
 	bitset_t *colors;			    /**< The color mask. */
 	bitset_t *in_colors;            /**< Colors used by live in values. */
-	bitset_t *ignore_regs;          /**< A bitset of all ignore registers in the current class. */
 	int colors_n;                   /**< The number of colors. */
+	DEBUG_ONLY(firm_dbg_module_t *constr_dbg;)  /**< Debug output for the constraint handler. */
 } be_chordal_alloc_env_t;
 
 #include "fourcc.h"
@@ -167,8 +167,8 @@ static INLINE border_t *border_add(be_chordal_env_t *env, struct list_head *head
  */
 static INLINE int has_reg_class(const be_chordal_env_t *env, const ir_node *irn)
 {
-	// return arch_irn_has_reg_class(env->main_env->arch_env, irn, -1, env->cls);
-	return arch_irn_consider_in_reg_alloc(env->birg->main_env->arch_env, env->cls, irn);
+	return arch_irn_has_reg_class(env->birg->main_env->arch_env, irn, -1, env->cls);
+	// return arch_irn_consider_in_reg_alloc(env->birg->main_env->arch_env, env->cls, irn);
 }
 
 #define has_limited_constr(req, irn) \
@@ -178,124 +178,11 @@ static int get_next_free_reg(const be_chordal_alloc_env_t *alloc_env, bitset_t *
 {
 	bitset_t *tmp = alloc_env->tmp_colors;
 	bitset_copy(tmp, colors);
-	bitset_or(tmp, alloc_env->ignore_regs);
+	bitset_or(tmp, alloc_env->chordal_env->ignore_colors);
 	return bitset_next_clear(tmp, 0);
 }
 
-typedef struct _operand_t operand_t;
-
-struct _operand_t {
-	ir_node *irn;
-	ir_node *carrier;
-	operand_t *partner;
-	bitset_t *regs;
-	int pos;
-	arch_register_req_t req;
-	unsigned has_constraints : 1;
-};
-
-typedef struct {
-	operand_t *ops;
-	int n_ops;
-	int use_start;
-	ir_node *next_insn;
-	ir_node *irn;
-	unsigned in_constraints  : 1;
-	unsigned out_constraints : 1;
-	unsigned has_constraints : 1;
-	unsigned pre_colored     : 1;
-} insn_t;
-
-#define insn_n_defs(insn) ((insn)->use_start)
-#define insn_n_uses(insn) ((insn)->n_ops - (insn)->use_start)
-
-static insn_t *scan_insn(be_chordal_alloc_env_t *alloc_env, ir_node *irn, struct obstack *obst)
-{
-	const be_chordal_env_t *env = alloc_env->chordal_env;
-	const arch_env_t *arch_env  = env->birg->main_env->arch_env;
-	operand_t o;
-	insn_t *insn;
-	int i, n;
-	int pre_colored = 0;
-
-	insn = obstack_alloc(obst, sizeof(insn[0]));
-	memset(insn, 0, sizeof(insn[0]));
-
-	insn->irn       = irn;
-	insn->next_insn = sched_next(irn);
-	if(get_irn_mode(irn) == mode_T) {
-		ir_node *p;
-
-		for(p = sched_next(irn); is_Proj(p); p = sched_next(p)) {
-			if(arch_irn_consider_in_reg_alloc(arch_env, env->cls, p)) {
-				arch_get_register_req(arch_env, &o.req, p, -1);
-				o.carrier         = p;
-				o.irn             = irn;
-				o.pos             = -(get_Proj_proj(p) + 1);
-				o.partner         = NULL;
-				o.has_constraints = arch_register_req_is(&o.req, limited);
-				obstack_grow(obst, &o, sizeof(o));
-				insn->n_ops++;
-				insn->out_constraints |= o.has_constraints;
-				pre_colored += arch_get_irn_register(arch_env, p) != NULL;
-			}
-		}
-
-		insn->next_insn = p;
-	}
-
-	else if(arch_irn_consider_in_reg_alloc(arch_env, env->cls, irn)) {
-		arch_get_register_req(arch_env, &o.req, irn, -1);
-		o.carrier = irn;
-		o.irn     = irn;
-		o.pos     = -1;
-		o.partner = NULL;
-		o.has_constraints = arch_register_req_is(&o.req, limited);
-		obstack_grow(obst, &o, sizeof(o));
-		insn->n_ops++;
-		insn->out_constraints |= o.has_constraints;
-		pre_colored += arch_get_irn_register(arch_env, irn) != NULL;
-	}
-
-	insn->pre_colored = pre_colored == insn->n_ops && insn->n_ops > 0;
-	insn->use_start   = insn->n_ops;
-
-	for(i = 0, n = get_irn_arity(irn); i < n; ++i) {
-		ir_node *op = get_irn_n(irn, i);
-
-		if(arch_irn_consider_in_reg_alloc(arch_env, env->cls, op)) {
-			arch_get_register_req(arch_env, &o.req, irn, i);
-			o.carrier = op;
-			o.irn     = irn;
-			o.pos     = i;
-			o.partner = NULL;
-			o.has_constraints = arch_register_req_is(&o.req, limited);
-			obstack_grow(obst, &o, sizeof(o));
-			insn->n_ops++;
-			insn->in_constraints |= o.has_constraints;
-		}
-	}
-
-	insn->has_constraints = insn->in_constraints | insn->out_constraints;
-	insn->ops = obstack_finish(obst);
-
-	/* Compute the admissible registers bitsets. */
-	for(i = 0; i < insn->n_ops; ++i) {
-		operand_t *op = &insn->ops[i];
-
-		assert(op->req.cls == env->cls);
-		op->regs   = bitset_obstack_alloc(obst, env->cls->n_regs);
-
-		if(arch_register_req_is(&op->req, limited))
-			op->req.limited(op->req.limited_env, op->regs);
-		else
-			arch_put_non_ignore_regs(env->birg->main_env->arch_env, env->cls, op->regs);
-	}
-
-	return insn;
-}
-
-static bitset_t *get_decisive_partner_regs(bitset_t *bs, const operand_t *o1, const operand_t *o2)
+static bitset_t *get_decisive_partner_regs(bitset_t *bs, const be_operand_t *o1, const be_operand_t *o2)
 {
 	bitset_t *res = bs;
 
@@ -321,15 +208,23 @@ static bitset_t *get_decisive_partner_regs(bitset_t *bs, const operand_t *o1, co
 	return res;
 }
 
-static void pair_up_operands(const be_chordal_alloc_env_t *alloc_env, insn_t *insn)
+static be_insn_t *chordal_scan_insn(be_chordal_alloc_env_t *env, ir_node *irn)
+{
+	be_insn_env_t ie;
+
+	ie.ignore_colors = env->chordal_env->ignore_colors;
+	ie.aenv          = env->chordal_env->birg->main_env->arch_env;
+	ie.obst          = &env->chordal_env->obst;
+	ie.cls           = env->chordal_env->cls;
+	return be_scan_insn(&ie, irn);
+}
+
+static void pair_up_operands(const be_chordal_alloc_env_t *alloc_env, be_insn_t *insn)
 {
 	const be_chordal_env_t *env = alloc_env->chordal_env;
-	const arch_env_t *aenv      = env->birg->main_env->arch_env;
-	firm_dbg_module_t *dbg      = alloc_env->constr_dbg;
 
-	int n_uses         = insn_n_uses(insn);
-	int n_defs         = insn_n_defs(insn);
-	int max_pairs      = MIN(n_uses, n_defs);
+	int n_uses         = be_insn_n_uses(insn);
+	int n_defs         = be_insn_n_defs(insn);
 	bitset_t *bs       = bitset_alloca(env->cls->n_regs);
 	bipartite_t *bp    = bipartite_new(n_defs, n_uses);
 	int *pairing       = alloca(MAX(n_defs, n_uses) * sizeof(pairing[0]));
@@ -341,11 +236,11 @@ static void pair_up_operands(const be_chordal_alloc_env_t *alloc_env, insn_t *in
 		same register as the out operand.
 	*/
 	for(j = 0; j < insn->use_start; ++j) {
-		operand_t *out_op = &insn->ops[j];
+		be_operand_t *out_op = &insn->ops[j];
 
 		/* Try to find an in operand which has ... */
 		for(i = insn->use_start; i < insn->n_ops; ++i) {
-			const operand_t *op = &insn->ops[i];
+			const be_operand_t *op = &insn->ops[i];
 
 			/*
 			The in operand can only be paired with a def, if the node defining the
@@ -379,17 +274,17 @@ static void pair_up_operands(const be_chordal_alloc_env_t *alloc_env, insn_t *in
 }
 
 
-static ir_node *pre_process_constraints(be_chordal_alloc_env_t *alloc_env, insn_t **the_insn)
+static ir_node *pre_process_constraints(be_chordal_alloc_env_t *alloc_env, be_insn_t **the_insn)
 {
 	be_chordal_env_t *env       = alloc_env->chordal_env;
 	const arch_env_t *aenv      = env->birg->main_env->arch_env;
-	firm_dbg_module_t *dbg      = alloc_env->constr_dbg;
-	insn_t *insn                = *the_insn;
+	be_insn_t *insn             = *the_insn;
 	ir_node *bl                 = get_nodes_block(insn->irn);
 	ir_node *copy               = NULL;
 	ir_node *perm               = NULL;
 	bitset_t *out_constr        = bitset_alloca(env->cls->n_regs);
 	bitset_t *bs                = bitset_alloca(env->cls->n_regs);
+	DEBUG_ONLY(firm_dbg_module_t *dbg      = alloc_env->constr_dbg;)
 
 	int i;
 
@@ -402,7 +297,7 @@ static ir_node *pre_process_constraints(be_chordal_alloc_env_t *alloc_env, insn_
 		be copied.
 	*/
 	for(i = 0; i < insn->use_start; ++i) {
-		operand_t *op = &insn->ops[i];
+		be_operand_t *op = &insn->ops[i];
 		if(op->has_constraints)
 			bitset_or(out_constr, op->regs);
 	}
@@ -412,7 +307,7 @@ static ir_node *pre_process_constraints(be_chordal_alloc_env_t *alloc_env, insn_
 		constraints which are also output constraints.
 	*/
 	for(i = insn->use_start; i < insn->n_ops; ++i) {
-		operand_t *op = &insn->ops[i];
+		be_operand_t *op = &insn->ops[i];
 		if(op->has_constraints && (values_interfere(op->carrier, insn->irn) || arch_irn_is(aenv, op->carrier, ignore))) {
 			bitset_copy(bs, op->regs);
 			bitset_and(bs, out_constr);
@@ -422,9 +317,10 @@ static ir_node *pre_process_constraints(be_chordal_alloc_env_t *alloc_env, insn_
 				which also occur as output constraints, so insert a copy.
 			*/
 			if(bitset_popcnt(bs) > 0) {
-				copy                 = be_new_Copy(op->req.cls, env->irg, bl, op->carrier);
-				insn->ops[i].carrier = copy;
+				copy        = be_new_Copy(op->req.cls, env->irg, bl, op->carrier);
+				op->carrier = copy;
 				sched_add_before(insn->irn, copy);
+				set_irn_n(insn->irn, op->pos, op->carrier);
 
 				DBG((dbg, LEVEL_2, "adding copy for interfering and constrained op %+F\n", op->carrier));
 			}
@@ -453,14 +349,14 @@ static ir_node *pre_process_constraints(be_chordal_alloc_env_t *alloc_env, insn_
 		*/
 		be_liveness(env->irg);
 		obstack_free(&env->obst, insn);
-		*the_insn = insn = scan_insn(alloc_env, insn->irn, &env->obst);
+		*the_insn = insn = chordal_scan_insn(alloc_env, insn->irn);
 
 		/*
 			Copy the input constraints of the insn to the Perm as output
 			constraints. Succeeding phases (coalescing will need that).
 		*/
 		for(i = insn->use_start; i < insn->n_ops; ++i) {
-			operand_t *op = &insn->ops[i];
+			be_operand_t *op = &insn->ops[i];
 			ir_node *proj = op->carrier;
 			/*
 				Note that the predecessor must not be a Proj of the Perm,
@@ -475,12 +371,13 @@ static ir_node *pre_process_constraints(be_chordal_alloc_env_t *alloc_env, insn_
 	return perm;
 }
 
-static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *irn)
+static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *irn, int *silent)
 {
 	be_chordal_env_t *env  = alloc_env->chordal_env;
 	void *base             = obstack_base(&env->obst);
-	insn_t *insn           = scan_insn(alloc_env, irn, &env->obst);
+	be_insn_t *insn        = chordal_scan_insn(alloc_env, irn);
 	ir_node *res           = insn->next_insn;
+	int be_silent          = *silent;
 
 	if(insn->pre_colored) {
 		int i;
@@ -488,7 +385,17 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
 			pset_insert_ptr(alloc_env->pre_colored, insn->ops[i].carrier);
 	}
 
-	if(be_is_Perm(irn) || be_is_RegParams(irn) || (be_is_Barrier(irn) && !insn->in_constraints))
+	/*
+		If the current node is a barrier toggle the silent flag.
+		If we are in the start block, we are ought to be silent at the beginning,
+		so the toggling activates the constraint handling but skips the barrier.
+		If we are in the end block we handle the in requirements of the barrier
+		and set the rest to silent.
+	*/
+	if(be_is_Barrier(irn))
+		*silent = !*silent;
+
+	if(be_silent)
 		goto end;
 
 	/*
@@ -496,15 +403,14 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
 		correctly precolored. These Perms arise during the ABI handling phase.
 	*/
 	if(insn->has_constraints) {
-		firm_dbg_module_t *dbg = alloc_env->constr_dbg;
 		const arch_env_t *aenv = env->birg->main_env->arch_env;
 		int n_regs             = env->cls->n_regs;
 		bitset_t *bs           = bitset_alloca(n_regs);
-		bitset_t *non_ignore   = bitset_alloca(n_regs);
 		ir_node **alloc_nodes  = alloca(n_regs * sizeof(alloc_nodes[0]));
 		bipartite_t *bp        = bipartite_new(n_regs, n_regs);
 		int *assignment        = alloca(n_regs * sizeof(assignment[0]));
 		pmap *partners         = pmap_create();
+		DEBUG_ONLY(firm_dbg_module_t *dbg = alloc_env->constr_dbg;)
 
 		int i, n_alloc;
 		long col;
@@ -526,7 +432,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
 			to a bipartite graph (left: nodes with partners, right: admissible colors).
 		*/
 		for(i = 0, n_alloc = 0; i < insn->n_ops; ++i) {
-			operand_t *op = &insn->ops[i];
+			be_operand_t *op = &insn->ops[i];
 
 			/*
 				If the operand has no partner or the partner has not been marked
@@ -563,7 +469,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
 
 				assert(is_Proj(proj));
 
-				if(values_interfere(proj, irn)) {
+				if(values_interfere(proj, irn) && !pmap_contains(partners, proj)) {
 					assert(n_alloc < n_regs);
 					alloc_nodes[n_alloc] = proj;
 					pmap_insert(partners, proj, NULL);
@@ -646,20 +552,30 @@ end:
 
 /**
  * Handle constraint nodes in each basic block.
- * be_insert_constr_perms() inserts Perm nodes which perm
+ * handle_constraints() inserts Perm nodes which perm
  * over all values live at the constrained node right in front
  * of the constrained node. These Perms signal a constrained node.
- * For further comments, refer to handle_constraints_at_perm().
+ * For further comments, refer to handle_constraints().
  */
 static void constraints(ir_node *bl, void *data)
 {
-	firm_dbg_module_t *dbg      = firm_dbg_register("firm.be.chordal.constr");
 	be_chordal_alloc_env_t *env = data;
-	arch_env_t *arch_env        = env->chordal_env->birg->main_env->arch_env;
+
+	/*
+		Start silent in the start block.
+		The silence remains until the first barrier is seen.
+		Each other block is begun loud.
+	*/
+	int silent                  = bl == get_irg_start_block(get_irn_irg(bl));
 	ir_node *irn;
 
+	/*
+		If the block is the start block search the barrier and
+		start handling constraints from there.
+	*/
+
 	for(irn = sched_first(bl); !sched_is_end(irn);) {
-		irn = handle_constraints(env, irn);
+		irn = handle_constraints(env, irn, &silent);
 	}
 }
 
@@ -681,16 +597,15 @@ static void pressure(ir_node *block, void *env_ptr)
 
 	be_chordal_alloc_env_t *alloc_env = env_ptr;
 	be_chordal_env_t *env             = alloc_env->chordal_env;
-	const arch_env_t *arch_env        = env->birg->main_env->arch_env;
 	bitset_t *live                    = alloc_env->live;
-	firm_dbg_module_t *dbg            = env->dbg;
 	ir_node *irn;
+	DEBUG_ONLY(firm_dbg_module_t *dbg            = env->dbg;)
 
 	int i, n;
 	unsigned step = 0;
 	unsigned pressure = 0;
 	struct list_head *head;
-	pset *live_in = put_live_in(block, pset_new_ptr_default());
+	pset *live_in  = put_live_in(block, pset_new_ptr_default());
 	pset *live_end = put_live_end(block, pset_new_ptr_default());
 
 	DBG((dbg, LEVEL_1, "Computing pressure in block %+F\n", block));
@@ -706,10 +621,10 @@ static void pressure(ir_node *block, void *env_ptr)
 	 * Make final uses of all values live out of the block.
 	 * They are necessary to build up real intervals.
 	 */
-	for(irn = pset_first(live_end); irn; irn = pset_next(live_end)) {
+	foreach_pset(live_end, irn) {
 		if(has_reg_class(env, irn)) {
-			DBG((dbg, LEVEL_3, "\tMaking live: %+F/%d\n", irn, get_irn_graph_nr(irn)));
-			bitset_set(live, get_irn_graph_nr(irn));
+			DBG((dbg, LEVEL_3, "\tMaking live: %+F/%d\n", irn, get_irn_idx(irn)));
+			bitset_set(live, get_irn_idx(irn));
 			border_use(irn, step, 0);
 		}
 	}
@@ -721,14 +636,14 @@ static void pressure(ir_node *block, void *env_ptr)
 	 */
 	sched_foreach_reverse(block, irn) {
 		DBG((dbg, LEVEL_1, "\tinsn: %+F, pressure: %d\n", irn, pressure));
-		DBG((dbg, LEVEL_2, "\tlive: %b\n", live));
+		DBG((dbg, LEVEL_2, "\tlive: %B\n", live));
 
 		/*
 		 * If the node defines some value, which can put into a
 		 * register of the current class, make a border for it.
 		 */
 		if(has_reg_class(env, irn)) {
-			int nr = get_irn_graph_nr(irn);
+			int nr = get_irn_idx(irn);
 
 			bitset_clear(live, nr);
 			border_def(irn, step, 1);
@@ -742,14 +657,16 @@ static void pressure(ir_node *block, void *env_ptr)
 				ir_node *op = get_irn_n(irn, i);
 
 				if(has_reg_class(env, op)) {
-					int nr = get_irn_graph_nr(op);
-
-					DBG((dbg, LEVEL_4, "\t\tpos: %d, use: %+F\n", i, op));
+					int nr = get_irn_idx(op);
+					const char *msg = "-";
 
 					if(!bitset_is_set(live, nr)) {
 						border_use(op, step, 1);
 						bitset_set(live, nr);
+						msg = "X";
 					}
+
+					DBG((dbg, LEVEL_4, "\t\t%s pos: %d, use: %+F\n", msg, i, op));
 				}
 			}
 		}
@@ -759,36 +676,35 @@ static void pressure(ir_node *block, void *env_ptr)
 	/*
 	 * Add initial defs for all values live in.
 	 */
-	for(irn = pset_first(live_in); irn; irn = pset_next(live_in)) {
+	foreach_pset(live_in, irn) {
 		if(has_reg_class(env, irn)) {
 
 			/* Mark the value live in. */
-			bitset_set(live, get_irn_graph_nr(irn));
+			bitset_set(live, get_irn_idx(irn));
 
 			/* Add the def */
 			border_def(irn, step, 0);
 		}
 	}
 
-
-  del_pset(live_in);
-  del_pset(live_end);
+	del_pset(live_in);
+	del_pset(live_end);
 }
 
 static void assign(ir_node *block, void *env_ptr)
 {
 	be_chordal_alloc_env_t *alloc_env = env_ptr;
 	be_chordal_env_t *env       = alloc_env->chordal_env;
-	firm_dbg_module_t *dbg      = env->dbg;
 	bitset_t *live              = alloc_env->live;
 	bitset_t *colors            = alloc_env->colors;
 	bitset_t *in_colors         = alloc_env->in_colors;
 	const arch_env_t *arch_env  = env->birg->main_env->arch_env;
+	struct list_head *head      = get_block_border_head(env, block);
+	pset *live_in               = put_live_in(block, pset_new_ptr_default());
 
 	const ir_node *irn;
 	border_t *b;
-	struct list_head *head = get_block_border_head(env, block);
-	pset *live_in = put_live_in(block, pset_new_ptr_default());
+	DEBUG_ONLY(firm_dbg_module_t *dbg = env->dbg;)
 
 	bitset_clear_all(colors);
 	bitset_clear_all(live);
@@ -798,7 +714,7 @@ static void assign(ir_node *block, void *env_ptr)
 	DBG((dbg, LEVEL_4, "\tusedef chain for block\n"));
 	list_for_each_entry(border_t, b, head, list) {
 		DBG((dbg, LEVEL_4, "\t%s %+F/%d\n", b->is_def ? "def" : "use",
-					b->irn, get_irn_graph_nr(b->irn)));
+					b->irn, get_irn_idx(b->irn)));
 	}
 
 	/*
@@ -806,7 +722,7 @@ static void assign(ir_node *block, void *env_ptr)
 	 * Since their colors have already been assigned (The dominators were
 	 * allocated before), we have to mark their colors as used also.
 	 */
-	for(irn = pset_first(live_in); irn; irn = pset_next(live_in)) {
+	foreach_pset(live_in, irn) {
 		if(has_reg_class(env, irn)) {
 			const arch_register_t *reg = arch_get_irn_register(arch_env, irn);
 			int col;
@@ -814,12 +730,14 @@ static void assign(ir_node *block, void *env_ptr)
 			assert(reg && "Node must have been assigned a register");
 			col = arch_register_get_index(reg);
 
+			DBG((dbg, LEVEL_4, "%+F has reg %s\n", irn, reg->name));
+
 			/* Mark the color of the live in value as used. */
 			bitset_set(colors, col);
 			bitset_set(in_colors, col);
 
 			/* Mark the value live in. */
-			bitset_set(live, get_irn_graph_nr(irn));
+			bitset_set(live, get_irn_idx(irn));
 		}
 	}
 
@@ -831,7 +749,8 @@ static void assign(ir_node *block, void *env_ptr)
 	 */
 	list_for_each_entry_reverse(border_t, b, head, list) {
 		ir_node *irn = b->irn;
-		int nr = get_irn_graph_nr(irn);
+		int nr       = get_irn_idx(irn);
+		int ignore   = arch_irn_is(arch_env, irn, ignore);
 
 		/*
 		 * Assign a color, if it is a local def. Global defs already have a
@@ -841,7 +760,7 @@ static void assign(ir_node *block, void *env_ptr)
 			const arch_register_t *reg;
 			int col = NO_COLOR;
 
-			if(pset_find_ptr(alloc_env->pre_colored, irn)) {
+			if(pset_find_ptr(alloc_env->pre_colored, irn) || ignore) {
 				reg = arch_get_irn_register(arch_env, irn);
 				col = reg->index;
 				assert(!bitset_is_set(colors, col) && "pre-colored register must be free");
@@ -857,8 +776,7 @@ static void assign(ir_node *block, void *env_ptr)
 			bitset_set(colors, col);
 			arch_set_irn_register(arch_env, irn, reg);
 
-			DBG((dbg, LEVEL_1, "\tassigning register %s(%d) to %+F\n",
-            arch_register_get_name(reg), col, irn));
+			DBG((dbg, LEVEL_1, "\tassigning register %s(%d) to %+F\n", arch_register_get_name(reg), col, irn));
 
 			assert(!bitset_is_set(live, nr) && "Value's definition must not have been encountered");
 			bitset_set(live, nr);
@@ -886,27 +804,21 @@ void be_ra_chordal_color(be_chordal_env_t *chordal_env)
 {
 	be_chordal_alloc_env_t env;
 	char buf[256];
-	int i;
 
 	int colors_n          = arch_register_class_n_regs(chordal_env->cls);
 	ir_graph *irg         = chordal_env->irg;
 
 
-	if(get_irg_dom_state(irg) != dom_consistent)
-		compute_doms(irg);
+	assure_doms(irg);
 
 	env.chordal_env   = chordal_env;
 	env.colors_n      = colors_n;
 	env.colors        = bitset_alloca(colors_n);
 	env.tmp_colors    = bitset_alloca(colors_n);
 	env.in_colors     = bitset_alloca(colors_n);
-	env.ignore_regs   = bitset_alloca(colors_n);
 	env.pre_colored   = pset_new_ptr_default();
-	env.constr_dbg    = firm_dbg_register("firm.be.chordal.constr");
+	FIRM_DBG_REGISTER(env.constr_dbg, "firm.be.chordal.constr");
 
-	for(i = 0; i < colors_n; ++i)
-		if(arch_register_type_is(&chordal_env->cls->regs[i], ignore))
-			bitset_set(env.ignore_regs, i);
 
 	/* Handle register targeting constraints */
 	dom_tree_walk_irg(irg, constraints, NULL, &env);
@@ -917,7 +829,7 @@ void be_ra_chordal_color(be_chordal_env_t *chordal_env)
 	}
 
 	be_numbering(irg);
-	env.live = bitset_malloc(get_graph_node_count(chordal_env->irg));
+	env.live = bitset_malloc(get_irg_last_idx(chordal_env->irg));
 
 	/* First, determine the pressure */
 	dom_tree_walk_irg(irg, pressure, NULL, &env);
@@ -928,11 +840,11 @@ void be_ra_chordal_color(be_chordal_env_t *chordal_env)
 	be_numbering_done(irg);
 
 	if(chordal_env->opts->dump_flags & BE_CH_DUMP_TREE_INTV) {
-    	plotter_t *plotter;
+		plotter_t *plotter;
 		ir_snprintf(buf, sizeof(buf), "ifg_%s_%F.eps", chordal_env->cls->name, irg);
-    	plotter = new_plotter_ps(buf);
-    	draw_interval_tree(&draw_chordal_def_opts, chordal_env, plotter);
-    	plotter_free(plotter);
+		plotter = new_plotter_ps(buf);
+		draw_interval_tree(&draw_chordal_def_opts, chordal_env, plotter);
+		plotter_free(plotter);
 	}
 
 	del_pset(env.pre_colored);