Get rid of some get_irn_node_nr() which are still there.

[r16482]

diff --git a/ir/be/becopyheur.c b/ir/be/becopyheur.c
index 3551dc7..aeb9193 100644 (file)
--- a/ir/be/becopyheur.c
+++ b/ir/be/becopyheur.c
@@ -114,7 +114,7 @@ static INLINE void qnode_add_conflict(const qnode_t *qn, const ir_node *n1, cons
        conflict_t c;
        DBG((dbg, LEVEL_4, "\t      %+F -- %+F\n", n1, n2));
 
-       if (get_irn_node_nr(n1) < get_irn_node_nr(n2)) {
+       if (get_irn_idx(n1) < get_irn_idx(n2)) {
                c.n1 = n1;
                c.n2 = n2;
        } else {
@@ -133,7 +133,7 @@ static INLINE int qnode_are_conflicting(const qnode_t *qn, const ir_node *n1, co
        if (n1!=n2 && nodes_interfere(qn->ou->co->cenv, n1, n2))
                return 1;
        /* search for recoloring conflicts */
-       if (get_irn_node_nr(n1) < get_irn_node_nr(n2)) {
+       if (get_irn_idx(n1) < get_irn_idx(n2)) {
                c.n1 = n1;
                c.n2 = n2;
        } else {

diff --git a/ir/be/becopyilp2.c b/ir/be/becopyilp2.c
index 3d3de0b..ad41740 100644 (file)
--- a/ir/be/becopyilp2.c
+++ b/ir/be/becopyilp2.c
@@ -88,7 +88,7 @@ static void build_coloring_cstr(ilp_env_t *ienv) {
                        int cst_idx;
                        const arch_register_req_t *req;
                        int curr_node_color = get_irn_col(ienv->co, irn);
-                       int node_nr = (int)get_irn_node_nr(irn);
+                       int node_nr = (int)get_irn_idx(irn);
                        local_env_t *lenv = ienv->env;
 
                        pmap_insert(lenv->nr_2_irn, INT_TO_PTR(node_nr), irn);
@@ -162,7 +162,7 @@ static void build_interference_cstr(ilp_env_t *ienv) {
                                ir_node *irn = clique[i];
 
                                if (!sr_is_removed(ienv->sr, irn)) {
-                                       int var_idx = lpp_get_var_idx(lpp, name_cdd(buf, 'x', (int)get_irn_node_nr(irn), col));
+                                       int var_idx = lpp_get_var_idx(lpp, name_cdd(buf, 'x', (int)get_irn_idx(irn), col));
                                        lpp_set_factor_fast(lpp, cst_idx, var_idx, 1);
                                }
                        }
@@ -189,12 +189,12 @@ static void build_affinity_cstr(ilp_env_t *ienv) {
                int root_col, arg_col;
 
                root = curr->nodes[0];
-               root_nr = (int) get_irn_node_nr(root);
+               root_nr = (int) get_irn_idx(root);
                root_col = get_irn_col(ienv->co, root);
 
                for (i = 1; i < curr->node_count; ++i) {
                        arg = curr->nodes[i];
-                       arg_nr = (int) get_irn_node_nr(arg);
+                       arg_nr = (int) get_irn_idx(arg);
                        arg_col = get_irn_col(ienv->co, arg);
 
                        /* add a new affinity variable */
@@ -375,10 +375,10 @@ static void build_clique_star_cstr(ilp_env_t *ienv) {
                                char buf[16];
 
                                cst_idx = lpp_add_cst(ienv->lp, NULL, lpp_greater, pset_count(clique)-1);
-                               center_nr = get_irn_node_nr(center);
+                               center_nr = get_irn_idx(center);
 
                                pset_foreach(clique, member) {
-                                       member_nr = get_irn_node_nr(member);
+                                       member_nr = get_irn_idx(member);
                                        var_idx = lpp_get_var_idx(ienv->lp, name_cdd_sorted(buf, 'y', center_nr, member_nr));
                                        lpp_set_factor_fast(ienv->lp, cst_idx, var_idx, 1.0);
                                }
@@ -430,8 +430,8 @@ static void extend_path(ilp_env_t *ienv, pdeq *path, ir_node *irn) {
                        int cst_idx = lpp_add_cst(ienv->lp, NULL, lpp_greater, 1.0);
                        for (i=1; i<len; ++i) {
                                char buf[16];
-                               int nr_1    = get_irn_node_nr(curr_path[i-1]);
-                               int nr_2    = get_irn_node_nr(curr_path[i]);
+                               int nr_1    = get_irn_idx(curr_path[i-1]);
+                               int nr_2    = get_irn_idx(curr_path[i]);
                                int var_idx = lpp_get_var_idx(ienv->lp, name_cdd_sorted(buf, 'y', nr_1, nr_2));
                                lpp_set_factor_fast(ienv->lp, cst_idx, var_idx, 1.0);
                        }

diff --git a/ir/be/beifg.c b/ir/be/beifg.c
index fd020ce..fd663f3 100644 (file)
--- a/ir/be/beifg.c
+++ b/ir/be/beifg.c
@@ -261,8 +261,8 @@ static int be_ifg_check_cmp_nodes(const void *a, const void *b)
        const ir_node *node_a = *(ir_node **)a;
        const ir_node *node_b = *(ir_node **)b;
 
-       long nr_a = get_irn_node_nr(node_a);
-       long nr_b = get_irn_node_nr(node_b);
+       long nr_a = get_irn_idx(node_a);
+       long nr_b = get_irn_idx(node_b);
 
        return QSORT_CMP(nr_a, nr_b);
 }