X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_common.c;h=74f48c7561f0e96fe4933293f749d3a66410e12f;hb=1db02a4692443f95545ede1cabff8c828e33442b;hp=49e617d04b80fa91b1b4b9f21bb9f98432fbcb1f;hpb=7a178059678ff6c6094a7cd8fac5644367417102;p=libfirm

diff --git a/ir/be/bechordal_common.c b/ir/be/bechordal_common.c
index 49e617d04..74f48c756 100644
--- a/ir/be/bechordal_common.c
+++ b/ir/be/bechordal_common.c
@@ -48,8 +48,7 @@
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
 /* Make a fourcc for border checking. */
-#define BORDER_FOURCC				FOURCC('B', 'O', 'R', 'D')
-
+#define BORDER_FOURCC   FOURCC('B', 'O', 'R', 'D')
 
 int has_reg_class(const be_chordal_env_t *env, const ir_node *irn)
 {
@@ -79,17 +78,17 @@ static inline border_t *border_add(be_chordal_env_t *env, struct list_head *head
 		 */
 		set_irn_link(irn, def);
 
-		DEBUG_ONLY(b->magic = BORDER_FOURCC);
-		DEBUG_ONLY(def->magic = BORDER_FOURCC);
+		DEBUG_ONLY(b->magic = BORDER_FOURCC;)
+		DEBUG_ONLY(def->magic = BORDER_FOURCC;)
 	} else {
 		/*
 		 * If the def is encountered, the use was made and so was the
 		 * the def node (see the code above). It was placed into the
 		 * link field of the irn, so we can get it there.
 		 */
-		b = get_irn_link(irn);
+		b = (border_t*)get_irn_link(irn);
 
-		DEBUG_ONLY(assert(b && b->magic == BORDER_FOURCC && "Illegal border encountered"));
+		DEBUG_ONLY(assert(b && b->magic == BORDER_FOURCC && "Illegal border encountered");)
 	}
 
 	b->pressure = pressure;
@@ -114,13 +113,13 @@ void create_borders(ir_node *block, void *env_ptr)
 #define border_use(irn, step, real) \
 	border_add(env, head, irn, step, ++pressure, 0, real)
 
-	be_chordal_env_t *env             = env_ptr;
+	be_chordal_env_t *env             = (be_chordal_env_t*)env_ptr;
 	bitset_t *live                    = bitset_malloc(get_irg_last_idx(env->irg));
 	ir_node *irn;
 	be_lv_t *lv                       = be_get_irg_liveness(env->irg);
 
 	int i, n;
-	unsigned elm;
+	size_t elm;
 	unsigned step = 0;
 	unsigned pressure = 0;
 	struct list_head *head;
@@ -223,9 +222,9 @@ be_insn_t *chordal_scan_insn(be_chordal_env_t *env, ir_node *irn)
 {
 	be_insn_env_t ie;
 
-	ie.ignore_colors = env->ignore_colors;
-	ie.obst          = env->obst;
-	ie.cls           = env->cls;
+	ie.allocatable_regs = env->allocatable_regs;
+	ie.obst             = env->obst;
+	ie.cls              = env->cls;
 	return be_scan_insn(&ie, irn);
 }
 
@@ -294,7 +293,7 @@ ir_node *pre_process_constraints(be_chordal_env_t *env, be_insn_t **the_insn)
 	return perm;
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_chordal_common);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_chordal_common)
 void be_init_chordal_common(void)
 {
 	FIRM_DBG_REGISTER(dbg, "firm.be.chordal_common");