avoid unnecessary macros in ia32_transform.c

[libfirm] / ir / be / becopyheur.c

diff --git a/ir/be/becopyheur.c b/ir/be/becopyheur.c
index 6303f9d..47f6d18 100644 (file)
--- a/ir/be/becopyheur.c
+++ b/ir/be/becopyheur.c
@@ -93,8 +93,10 @@ static inline int nodes_interfere(const be_chordal_env_t *env, const ir_node *a,
 {
        if (env->ifg)
                return be_ifg_connected(env->ifg, a, b);
-       else
-               return be_values_interfere(env->birg->lv, a, b);
+       else {
+               be_lv_t *lv = be_get_irg_liveness(env->irg);
+               return be_values_interfere(lv, a, b);
+       }
 }
 
 static int set_cmp_conflict_t(const void *x, const void *y, size_t size)
@@ -255,7 +257,7 @@ static ir_node *qnode_color_irn(const qnode_t *qn, ir_node *irn, int col, const
        int irn_col = qnode_get_new_color(qn, irn);
        ir_node *sub_res, *curr;
        be_ifg_t *ifg = chordal_env->ifg;
-       void *iter = be_ifg_neighbours_iter_alloca(ifg);
+       neighbours_iter_t iter;
 
 
        DBG((dbg, LEVEL_3, "\t    %+F \tcaused col(%+F) \t%2d --> %2d\n", trigger, irn, irn_col, col));
@@ -298,7 +300,7 @@ static ir_node *qnode_color_irn(const qnode_t *qn, ir_node *irn, int col, const
                bitset_clear(free_cols, irn_col);
 
                /* Exclude all colors used by adjacent nodes */
-               be_ifg_foreach_neighbour(ifg, iter, irn, curr)
+               be_ifg_foreach_neighbour(ifg, &iter, irn, curr)
                        bitset_clear(free_cols, qnode_get_new_color(qn, curr));
 
                free_col = bitset_next_set(free_cols, 0);
@@ -320,12 +322,12 @@ static ir_node *qnode_color_irn(const qnode_t *qn, ir_node *irn, int col, const
         * If we arrive here changing color may be possible, but there may be conflicts.
         * Try to color all conflicting nodes 'curr' with the color of the irn itself.
         */
-       be_ifg_foreach_neighbour(ifg, iter, irn, curr) {
+       be_ifg_foreach_neighbour(ifg, &iter, irn, curr) {
                DBG((dbg, LEVEL_3, "\t      Confl %+F(%d)\n", curr, qnode_get_new_color(qn, curr)));
                if (qnode_get_new_color(qn, curr) == col && curr != trigger) {
                        sub_res = qnode_color_irn(qn, curr, irn_col, irn);
                        if (sub_res != CHANGE_SAVE) {
-                               be_ifg_neighbours_break(ifg, iter);
+                               be_ifg_neighbours_break(&iter);
                                return sub_res;
                        }
                }
@@ -397,7 +399,7 @@ static inline void qnode_max_ind_set(qnode_t *qn, const unit_t *ou)
        ir_node **safe, **unsafe;
        int i, o, safe_count, safe_costs, unsafe_count, *unsafe_costs;
        bitset_t *curr, *best;
-       bitset_pos_t pos;
+       unsigned pos;
        int next, curr_weight, best_weight = 0;
 
        /* assign the nodes into two groups.
@@ -552,8 +554,8 @@ static void ou_optimize(unit_t *ou)
        qnode_t                     *tmp;
        const arch_register_req_t   *req;
        bitset_t const*              ignore;
-       bitset_pos_t                 n_regs;
-       bitset_pos_t                 idx;
+       unsigned                     n_regs;
+       unsigned                     idx;
        int                          i;
 
        DBG((dbg, LEVEL_1, "\tOptimizing unit:\n"));
@@ -567,7 +569,7 @@ static void ou_optimize(unit_t *ou)
        ignore  = ou->co->cenv->ignore_colors;
        n_regs  = req->cls->n_regs;
        if (arch_register_req_is(req, limited)) {
-               rawbs_base_t const* limited = req->limited;
+               unsigned const* limited = req->limited;
 
                for (idx = 0; idx != n_regs; ++idx) {
                        if (bitset_is_set(ignore, idx))