X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal.c;h=bcad9948517eac1a38e01b301fcaab7dd3525d28;hb=8a8b2522aac4612a24d51fc514e782a1f8b6f3f4;hp=48196ace517e6d974d70dff4bc9a7072c80cabd1;hpb=b3d85f8e1705a2a7aff56b6f7d4766c39bde7b10;p=libfirm

diff --git a/ir/be/bechordal.c b/ir/be/bechordal.c
index 48196ace5..bcad99485 100644
--- a/ir/be/bechordal.c
+++ b/ir/be/bechordal.c
@@ -63,7 +63,6 @@
 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. */
@@ -71,6 +70,7 @@ typedef struct _be_chordal_alloc_env_t {
 	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"
@@ -324,12 +324,9 @@ static bitset_t *get_decisive_partner_regs(bitset_t *bs, const operand_t *o1, co
 static void pair_up_operands(const be_chordal_alloc_env_t *alloc_env, 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);
 	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]));
@@ -383,13 +380,13 @@ static ir_node *pre_process_constraints(be_chordal_alloc_env_t *alloc_env, 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;
 	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;
 
@@ -507,15 +504,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;
@@ -665,8 +661,6 @@ end:
 static void constraints(ir_node *bl, void *data)
 {
 	be_chordal_alloc_env_t *env = data;
-	firm_dbg_module_t *dbg      = firm_dbg_register("firm.be.chordal.constr");
-	arch_env_t *arch_env        = env->chordal_env->birg->main_env->arch_env;
 
 	/*
 		Start silent in the start block.
@@ -704,10 +698,9 @@ 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;
@@ -802,11 +795,11 @@ 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;
+	DEBUG_ONLY(firm_dbg_module_t *dbg      = env->dbg;)
 
 	const ir_node *irn;
 	border_t *b;
@@ -925,7 +918,7 @@ void be_ra_chordal_color(be_chordal_env_t *chordal_env)
 	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))