Adapted to previous commit.

[libfirm] / ir / be / belower.c

diff --git a/ir/be/belower.c b/ir/be/belower.c
index 1441c76..241607d 100644 (file)
--- a/ir/be/belower.c
+++ b/ir/be/belower.c
@@ -38,10 +38,10 @@
 #include "irgwalk.h"
 #include "array_t.h"
 
-#include "bearch_t.h"
+#include "bearch.h"
 #include "belower.h"
-#include "benode_t.h"
-#include "besched_t.h"
+#include "benode.h"
+#include "besched.h"
 #include "bestat.h"
 #include "bessaconstr.h"
 #include "beintlive_t.h"
@@ -326,9 +326,9 @@ static void lower_perm_node(ir_node *irn, lower_env_t *env)
 
                pair           = &pairs[n++];
                pair->in_node  = in;
-               pair->in_reg   = arch_get_irn_register(in);
+               pair->in_reg   = in_reg;
                pair->out_node = out;
-               pair->out_reg  = arch_get_irn_register(out);
+               pair->out_reg  = out_reg;
                pair->checked  = 0;
        }
 
@@ -539,7 +539,7 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
 
                in[0] = irn;
                in[1] = cpy;
-               keep = be_new_Keep(cls, block, 2, in);
+               keep = be_new_Keep(block, 2, in);
        }
 
        DB((dbg_constr, LEVEL_1, "created %+F(%+F, %+F)\n\n", keep, irn, cpy));
@@ -553,7 +553,7 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
        /* insert the other different and it's copies into the map */
        entry = ir_nodemap_get(op_set, other_different);
        if (! entry) {
-               entry      = obstack_alloc(&env->obst, sizeof(*entry));
+               entry      = OALLOC(&env->obst, op_copy_assoc_t);
                entry->cls = cls;
                ir_nodeset_init(&entry->copies);
 
@@ -812,11 +812,10 @@ void assure_constraints(be_irg_t *birg) {
                /* so we transform unnecessary ones into Keeps.       */
                foreach_ir_nodeset(&entry->copies, cp, iter) {
                        if (be_is_CopyKeep(cp) && get_irn_n_edges(cp) < 1) {
-                               const arch_register_class_t *cls = arch_get_irn_reg_class_out(cp);
-                               int                          n   = get_irn_arity(cp);
-                               ir_node                     *keep;
+                               int      n   = get_irn_arity(cp);
+                               ir_node *keep;
 
-                               keep = be_new_Keep(cls, get_nodes_block(cp), n, get_irn_in(cp) + 1);
+                               keep = be_new_Keep(get_nodes_block(cp), n, get_irn_in(cp) + 1);
                                sched_add_before(cp, keep);
 
                                /* Set all ins (including the block) of the CopyKeep BAD to keep the verifier happy. */
@@ -882,7 +881,7 @@ static int push_through_perm(ir_node *perm, lower_env_t *env)
                for (i = get_irn_arity(irn) - 1; i >= 0; --i) {
                        ir_node *op = get_irn_n(irn, i);
                        if (arch_irn_consider_in_reg_alloc(cls, op) &&
-                           !values_interfere(env->birg, op, one_proj)) {
+                           !be_values_interfere(env->birg->lv, op, one_proj)) {
                                frontier = irn;
                                goto found_front;
                        }