bescripts: Remove unused execution unit specification.
[libfirm] / ir / be / belower.c
index 3082c80..e39cbe3 100644 (file)
@@ -39,6 +39,7 @@
 #include "array_t.h"
 
 #include "bearch.h"
+#include "beirg.h"
 #include "belower.h"
 #include "benode.h"
 #include "besched.h"
@@ -85,8 +86,6 @@ typedef struct reg_pair_t {
 typedef enum perm_type_t {
        PERM_CYCLE,
        PERM_CHAIN,
-       PERM_SWAP,
-       PERM_COPY
 } perm_type_t;
 
 /** Structure to represent cycles or chains in a Perm. */
@@ -381,9 +380,9 @@ static void lower_perm_node(ir_node *irn, lower_env_t *env)
                                 * IN_2  = in  node with register i + 1
                                 * OUT_1 = out node with register i + 1
                                 * OUT_2 = out node with register i */
+                               ir_node *cpyxchg;
                                if (cycle.type == PERM_CYCLE && !do_copy) {
                                        ir_node *in[2];
-                                       ir_node *cpyxchg;
 
                                        in[0] = arg1;
                                        in[1] = arg2;
@@ -440,16 +439,8 @@ static void lower_perm_node(ir_node *irn, lower_env_t *env)
                                        arch_set_irn_register(res2, cycle.elems[i + 1]);
                                        arch_set_irn_register(res1, cycle.elems[i]);
 
-                                       /* insert the copy/exchange node in schedule after the magic schedule node (see above) */
-                                       sched_add_after(skip_Proj(sched_point), cpyxchg);
-
                                        DB((dbg, LEVEL_1, "replacing %+F with %+F, placed new node after %+F\n", irn, cpyxchg, sched_point));
-
-                                       /* set the new scheduling point */
-                                       sched_point = res1;
                                } else {
-                                       ir_node *cpyxchg;
-
                                        DB((dbg, LEVEL_1, "%+F creating copy node (%+F, %s) -> (%+F, %s)\n",
                                                                irn, arg1, cycle.elems[i]->name, res2, cycle.elems[i + 1]->name));
 
@@ -458,13 +449,13 @@ static void lower_perm_node(ir_node *irn, lower_env_t *env)
 
                                        /* exchange copy node and proj */
                                        exchange(res2, cpyxchg);
+                               }
 
-                                       /* insert the copy/exchange node in schedule after the magic schedule node (see above) */
-                                       sched_add_after(skip_Proj(sched_point), cpyxchg);
+                               /* insert the copy/exchange node in schedule after the magic schedule node (see above) */
+                               sched_add_after(sched_point, cpyxchg);
 
-                                       /* set the new scheduling point */
-                                       sched_point = cpyxchg;
-                               }
+                               /* set the new scheduling point */
+                               sched_point = cpyxchg;
                        }
                }
 
@@ -506,7 +497,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 +506,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 +545,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;
@@ -622,19 +614,10 @@ static void assure_constraints_walker(ir_node *block, void *walk_env)
        constraint_env_t *env = (constraint_env_t*)walk_env;
 
        sched_foreach_reverse(block, irn) {
-               ir_mode *mode = get_irn_mode(irn);
-
-               if (mode == mode_T) {
-                       foreach_out_edge(irn, edge) {
-                               ir_node *proj = get_edge_src_irn(edge);
-
-                               mode = get_irn_mode(proj);
-                               if (mode_is_datab(mode))
-                                       assure_different_constraints(proj, irn, env);
-                       }
-               } else if (mode_is_datab(mode)) {
-                       assure_different_constraints(irn, irn, env);
-               }
+               be_foreach_value(irn, value,
+                       if (mode_is_datab(get_irn_mode(value)))
+                               assure_different_constraints(value, irn, env);
+               );
        }
 }
 
@@ -651,9 +634,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 +662,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 +707,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 +761,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 +823,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;
@@ -856,6 +831,7 @@ static int push_through_perm(ir_node *perm)
        int new_size;
        ir_node *frontier = bl;
        int i, n;
+       be_lv_t *lv = be_get_irg_liveness(irg);
 
        /* get some Proj and find out the register class of that Proj. */
        ir_node                     *one_proj = get_edge_src_irn(get_irn_out_edge_first_kind(perm, EDGE_KIND_NORMAL));
@@ -873,23 +849,23 @@ static int push_through_perm(ir_node *perm)
         * the Perm, increasing the register pressure by one.
         */
        sched_foreach_reverse_from(sched_prev(perm), irn) {
-               for (i = get_irn_arity(irn) - 1; i >= 0; --i) {
-                       ir_node *op = get_irn_n(irn, i);
-                       be_lv_t *lv = be_get_irg_liveness(irg);
-                       if (arch_irn_consider_in_reg_alloc(cls, op) &&
-                           !be_values_interfere(lv, op, one_proj)) {
+               be_foreach_use(irn, cls, in_req_, op, op_req_,
+                       if (!be_values_interfere(lv, op, one_proj)) {
                                frontier = irn;
                                goto found_front;
                        }
-               }
+               );
        }
 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 +884,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 +912,6 @@ found_front:
 
                bitset_set(moved, input);
                n_moved++;
-
-               node = sched_prev(node);
        }
 
        /* well, we could not push anything through the perm */