make firm compilable with a c++ compiler

[libfirm] / ir / be / bechordal_common.c

diff --git a/ir/be/bechordal_common.c b/ir/be/bechordal_common.c
index 130a1e8..4094add 100644 (file)
--- 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)
 {
@@ -87,7 +86,7 @@ static inline border_t *border_add(be_chordal_env_t *env, struct list_head *head
                 * 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"));
        }
@@ -114,10 +113,10 @@ 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                       = env->birg->lv;
+       be_lv_t *lv                       = be_get_irg_liveness(env->irg);
 
        int i, n;
        unsigned elm;
@@ -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);
 }
 
@@ -255,7 +254,7 @@ ir_node *pre_process_constraints(be_chordal_env_t *env, be_insn_t **the_insn)
         * Make the Perm, recompute liveness and re-scan the insn since the
         * in operands are now the Projs of the Perm.
         */
-       perm = insert_Perm_after(env->birg, env->cls, sched_prev(insn->irn));
+       perm = insert_Perm_after(env->irg, env->cls, sched_prev(insn->irn));
 
        /* Registers are propagated by insert_Perm_after(). Clean them here! */
        if (perm == NULL)