bearch: Use arch_register_req_is(req, ignore) instead of arch_irn_is_ignore(...)...

[libfirm] / ir / be / belower.c

diff --git a/ir/be/belower.c b/ir/be/belower.c
index 3082c80..b8a1d01 100644 (file)
--- a/ir/be/belower.c
+++ b/ir/be/belower.c
@@ -39,6 +39,7 @@
 #include "array_t.h"
 
 #include "bearch.h"
+#include "beirg.h"
 #include "belower.h"
 #include "benode.h"
 #include "besched.h"
@@ -506,7 +507,8 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
        ir_node                     *keep, *cpy;
        op_copy_assoc_t             *entry;
 
-       if (arch_irn_is_ignore(other_different) ||
+       arch_register_req_t const *const req = arch_get_irn_register_req(other_different);
+       if (arch_register_req_is(req, ignore) ||
                        !mode_is_datab(get_irn_mode(other_different))) {
                DB((dbg_constr, LEVEL_1, "ignore constraint for %+F because other_irn is ignore or not a datab node\n", irn));
                return;
@@ -514,7 +516,7 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
 
        op_set = &env->op_set;
        block  = get_nodes_block(irn);
-       cls    = arch_get_irn_reg_class(other_different);
+       cls    = req->cls;
 
        /* Make a not spillable copy of the different node   */
        /* this is needed because the different irn could be */
@@ -553,7 +555,7 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
        sched_add_after(skip_Proj(irn), keep);
 
        /* insert the other different and its copies into the map */
-       entry = (op_copy_assoc_t*)ir_nodehashmap_get(op_set, other_different);
+       entry = ir_nodehashmap_get(op_copy_assoc_t, op_set, other_different);
        if (! entry) {
                entry      = OALLOC(&env->obst, op_copy_assoc_t);
                entry->cls = cls;
@@ -651,9 +653,7 @@ static void melt_copykeeps(constraint_env_t *cenv)
        foreach_ir_nodehashmap(&cenv->op_set, map_entry, map_iter) {
                op_copy_assoc_t *entry = (op_copy_assoc_t*)map_entry.data;
                int     idx, num_ck;
-               ir_node *cp;
                struct obstack obst;
-               ir_nodeset_iterator_t iter;
                ir_node **ck_arr, **melt_arr;
 
                obstack_init(&obst);
@@ -681,7 +681,6 @@ static void melt_copykeeps(constraint_env_t *cenv)
                        if (ck_arr[idx]) {
                                int j, n_melt;
                                ir_node **new_ck_in;
-                               ir_node *new_ck;
                                ir_node *sched_pt = NULL;
 
                                n_melt     = 1;
@@ -727,11 +726,9 @@ static void melt_copykeeps(constraint_env_t *cenv)
                                                kill_node(melt_arr[j]);
                                }
 
+                               ir_node *const new_ck = be_new_CopyKeep(get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in);
 #ifdef KEEP_ALIVE_COPYKEEP_HACK
-                               new_ck = be_new_CopyKeep(get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in);
                                keep_alive(new_ck);
-#else
-                               new_ck = be_new_CopyKeep(get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in);
 #endif /* KEEP_ALIVE_COPYKEEP_HACK */
 
                                /* set register class for all kept inputs */
@@ -783,8 +780,6 @@ void assure_constraints(ir_graph *irg)
                op_copy_assoc_t          *entry = (op_copy_assoc_t*)map_entry.data;
                size_t                    n     = ir_nodeset_size(&entry->copies);
                ir_node                 **nodes = ALLOCAN(ir_node*, n);
-               ir_node                  *cp;
-               ir_nodeset_iterator_t     iter;
                be_ssa_construction_env_t senv;
 
                /* put the node in an array */
@@ -847,7 +842,6 @@ static int push_through_perm(ir_node *perm)
 {
        ir_graph *irg     = get_irn_irg(perm);
        ir_node *bl       = get_nodes_block(perm);
-       ir_node *node;
        int  arity        = get_irn_arity(perm);
        int *map;
        int *proj_map;
@@ -887,9 +881,12 @@ found_front:
 
        DB((dbg_permmove, LEVEL_2, "\tfrontier: %+F\n", frontier));
 
-       node = sched_prev(perm);
        n_moved = 0;
-       while (!sched_is_begin(node)) {
+       for (;;) {
+               ir_node *const node = sched_prev(perm);
+               if (node == frontier)
+                       break;
+
                const arch_register_req_t *req;
                int                        input = -1;
                ir_node                   *proj  = NULL;
@@ -908,8 +905,6 @@ found_front:
                /* it wasn't an input to the perm, we can't do anything more */
                if (input < 0)
                        break;
-               if (!sched_comes_after(frontier, node))
-                       break;
                if (arch_irn_is(node, modify_flags))
                        break;
                req = arch_get_irn_register_req(node);
@@ -938,8 +933,6 @@ found_front:
 
                bitset_set(moved, input);
                n_moved++;
-
-               node = sched_prev(node);
        }
 
        /* well, we could not push anything through the perm */