tv: Remove mul_table[][][] and simply use * and <<.

[libfirm] / ir / be / belower.c

diff --git a/ir/be/belower.c b/ir/be/belower.c
index eebec36..18052a0 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"
@@ -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 */
@@ -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);
+               );
        }
 }
 
@@ -807,10 +790,9 @@ void assure_constraints(ir_graph *irg)
                                ir_node *keep;
 
                                keep = be_new_Keep(get_nodes_block(cp), n, get_irn_in(cp) + 1);
-                               sched_add_before(cp, keep);
+                               sched_replace(cp, keep);
 
                                /* Set all ins (including the block) of the CopyKeep BAD to keep the verifier happy. */
-                               sched_remove(cp);
                                kill_node(cp);
                        }
                }
@@ -848,6 +830,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));
@@ -865,15 +848,12 @@ 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: