X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelower.c;h=ae3db13f572e7e4203974048bfcaa6bf38ec7e00;hb=3a0fdee861ad2cfc195fad0a34ee9f9981d28486;hp=d4224ec5c3bd7b9492cc529ac08b34437eeba471;hpb=48bb3d05a2605481bf32b4fb20dbb41c4898e24e;p=libfirm

diff --git a/ir/be/belower.c b/ir/be/belower.c
index d4224ec5c..ae3db13f5 100644
--- a/ir/be/belower.c
+++ b/ir/be/belower.c
@@ -26,10 +26,11 @@
 #include "iredges_t.h"
 #include "irgwalk.h"
 
-#ifdef _WIN32
-#include <malloc.h>
-#else
-#include <alloca.h>
+#ifdef HAVE_MALLOC_H
+ #include <malloc.h>
+#endif
+#ifdef HAVE_ALLOCA_H
+ #include <alloca.h>
 #endif
 
 #undef is_Perm
@@ -42,7 +43,7 @@
 typedef struct _lower_env_t {
 	be_chordal_env_t  *chord_env;
 	int                do_copy;
-	firm_dbg_module_t *dbg_module;
+	DEBUG_ONLY(firm_dbg_module_t *dbg_module;)
 } lower_env_t;
 
 /* holds a perm register pair */
@@ -247,7 +248,6 @@ static perm_cycle_t *get_perm_cycle(perm_cycle_t *cycle, reg_pair_t *pairs, int
 static void lower_perm_node(ir_node *irn, void *walk_env) {
 	const arch_register_class_t *reg_class;
 	const arch_env_t            *arch_env;
-	firm_dbg_module_t           *mod;
 	lower_env_t     *env = walk_env;
 	reg_pair_t      *pairs;
 	const ir_edge_t *edge;
@@ -256,10 +256,11 @@ static void lower_perm_node(ir_node *irn, void *walk_env) {
 	ir_node         *sched_point, *block, *in[2];
 	ir_node         *arg1, *arg2, *res1, *res2;
 	ir_node         *cpyxchg = NULL;
+	DEBUG_ONLY(firm_dbg_module_t *mod;)
 
 	arch_env = env->chord_env->birg->main_env->arch_env;
 	do_copy  = env->do_copy;
-	mod      = env->dbg_module;
+	DEBUG_ONLY(mod = env->dbg_module;)
 	block    = get_nodes_block(irn);
 
 	/*
@@ -505,8 +506,8 @@ static void gen_assure_different_pattern(ir_node *irn, be_irg_t *birg, ir_node *
 	const arch_env_t          *arch_env = birg->main_env->arch_env;
 	ir_node                   *in[2], *keep, *cpy, *temp;
 	ir_node                   *block = get_nodes_block(irn);
-	firm_dbg_module_t         *mod   = firm_dbg_register("firm.be.lower");
 	const arch_register_class_t *cls = arch_get_irn_reg_class(arch_env, other_different, -1);
+	FIRM_DBG_REGISTER(firm_dbg_module_t *mod, "firm.be.lower");
 
 	if (arch_irn_is(arch_env, other_different, ignore) || ! mode_is_datab(get_irn_mode(other_different))) {
 		DBG((mod, LEVEL_1, "ignore constraint for %+F because other_irn is ignore or not a datab node\n", irn));
@@ -535,6 +536,7 @@ static void gen_assure_different_pattern(ir_node *irn, be_irg_t *birg, ir_node *
 	}
 	else {
 		keep = be_new_CopyKeep_single(cls, birg->irg, block, cpy, irn, get_irn_mode(other_different));
+		be_node_set_reg_class(keep, 1, cls);
 		edges_reroute(other_different, keep, birg->irg);
 	}
 
@@ -633,7 +635,7 @@ void lower_nodes_after_ra(be_chordal_env_t *chord_env, int do_copy) {
 
 	env.chord_env  = chord_env;
 	env.do_copy    = do_copy;
-	env.dbg_module = firm_dbg_register("firm.be.lower");
+	FIRM_DBG_REGISTER(env.dbg_module, "firm.be.lower");
 
 	irg_walk_blkwise_graph(chord_env->irg, NULL, lower_nodes_after_ra_walker, &env);
 }