change register allocator and related interfaces to use ir_graph* instead of be_irg_t*
[libfirm] / ir / be / belower.c
index 443bc43..3a75c0e 100644 (file)
 #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"
@@ -60,15 +60,15 @@ typedef struct {
 
 /** Environment for constraints. */
 typedef struct {
-       be_irg_t       *birg;
+       ir_graph      *irg;
        ir_nodemap_t   op_set;
        struct obstack obst;
 } constraint_env_t;
 
 /** Lowering walker environment. */
 typedef struct _lower_env_t {
-       be_irg_t         *birg;
-       unsigned          do_copy : 1;
+       ir_graph *irg;
+       unsigned  do_copy : 1;
 } lower_env_t;
 
 /** Holds a Perm register pair. */
@@ -120,7 +120,8 @@ static int get_n_unchecked_pairs(reg_pair_t const *const pairs, int const n)
  * @param reg    The register to look for
  * @return The corresponding node or NULL if not found
  */
-static ir_node *get_node_for_in_register(reg_pair_t *pairs, int n, const arch_register_t *reg) {
+static ir_node *get_node_for_in_register(reg_pair_t *pairs, int n, const arch_register_t *reg)
+{
        int i;
 
        for (i = 0; i < n; i++) {
@@ -142,7 +143,8 @@ static ir_node *get_node_for_in_register(reg_pair_t *pairs, int n, const arch_re
  * @param reg    The register to look for
  * @return The corresponding node or NULL if not found
  */
-static ir_node *get_node_for_out_register(reg_pair_t *pairs, int n, const arch_register_t *reg) {
+static ir_node *get_node_for_out_register(reg_pair_t *pairs, int n, const arch_register_t *reg)
+{
        int i;
 
        for (i = 0; i < n; i++) {
@@ -164,7 +166,8 @@ static ir_node *get_node_for_out_register(reg_pair_t *pairs, int n, const arch_r
  *
  * @return The corresponding index in pairs or -1 if not found
  */
-static int get_pairidx_for_in_regidx(reg_pair_t *pairs, int n, unsigned reg_idx) {
+static int get_pairidx_for_in_regidx(reg_pair_t *pairs, int n, unsigned reg_idx)
+{
        int i;
 
        for (i = 0; i < n; i++) {
@@ -185,7 +188,8 @@ static int get_pairidx_for_in_regidx(reg_pair_t *pairs, int n, unsigned reg_idx)
  *
  * @return The corresponding index in pairs or -1 if not found
  */
-static int get_pairidx_for_out_regidx(reg_pair_t *pairs, int n, unsigned reg_idx) {
+static int get_pairidx_for_out_regidx(reg_pair_t *pairs, int n, unsigned reg_idx)
+{
        int i;
 
        for (i = 0; i < n; i++) {
@@ -288,7 +292,6 @@ static void get_perm_cycle(perm_cycle_t *const cycle,
 static void lower_perm_node(ir_node *irn, lower_env_t *env)
 {
        const arch_register_class_t *const reg_class   = arch_get_irn_register(get_irn_n(irn, 0))->reg_class;
-       ir_graph                    *const irg         = get_irn_irg(irn);
        ir_node                     *const block       = get_nodes_block(irn);
        int                          const arity       = get_irn_arity(irn);
        reg_pair_t                  *const pairs       = ALLOCAN(reg_pair_t, arity);
@@ -327,9 +330,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;
        }
 
@@ -418,14 +421,14 @@ static void lower_perm_node(ir_node *irn, lower_env_t *env)
                                        DBG((dbg, LEVEL_1, "%+F                        (%+F, %s) and (%+F, %s)\n",
                                                                irn, res1, cycle.elems[i]->name, res2, cycle.elems[i + 1]->name));
 
-                                       cpyxchg = be_new_Perm(reg_class, irg, block, 2, in);
+                                       cpyxchg = be_new_Perm(reg_class, block, 2, in);
 
                                        if (i > 0) {
                                                /* cycle is not done yet */
                                                int pidx = get_pairidx_for_in_regidx(pairs, n, cycle.elems[i]->index);
 
                                                /* create intermediate proj */
-                                               res1 = new_r_Proj(irg, block, cpyxchg, get_irn_mode(res1), 0);
+                                               res1 = new_r_Proj(cpyxchg, get_irn_mode(res1), 0);
 
                                                /* set as in for next Perm */
                                                pairs[pidx].in_node = res1;
@@ -452,7 +455,7 @@ static void lower_perm_node(ir_node *irn, lower_env_t *env)
                                        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));
 
-                                       cpyxchg = be_new_Copy(reg_class, irg, block, arg1);
+                                       cpyxchg = be_new_Copy(reg_class, block, arg1);
                                        arch_set_irn_register(cpyxchg, cycle.elems[i + 1]);
 
                                        /* exchange copy node and proj */
@@ -479,7 +482,8 @@ static void lower_perm_node(ir_node *irn, lower_env_t *env)
 
 
 
-static int has_irn_users(const ir_node *irn) {
+static int has_irn_users(const ir_node *irn)
+{
        return get_irn_out_edge_first_kind(irn, EDGE_KIND_NORMAL) != 0;
 }
 
@@ -496,8 +500,8 @@ static ir_node *find_copy(ir_node *irn, ir_node *op)
        }
 }
 
-static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different, constraint_env_t *env) {
-       ir_graph                    *irg;
+static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different, constraint_env_t *env)
+{
        ir_nodemap_t                *op_set;
        ir_node                     *block;
        const arch_register_class_t *cls;
@@ -510,7 +514,6 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
                return;
        }
 
-       irg    = be_get_birg_irg(env->birg);
        op_set = &env->op_set;
        block  = get_nodes_block(irn);
        cls    = arch_get_irn_reg_class_out(other_different);
@@ -523,7 +526,7 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
        /* check if already exists such a copy in the schedule immediately before */
        cpy = find_copy(skip_Proj(irn), other_different);
        if (! cpy) {
-               cpy = be_new_Copy(cls, irg, block, other_different);
+               cpy = be_new_Copy(cls, block, other_different);
                arch_irn_set_flags(cpy, arch_irn_flags_dont_spill);
                DB((dbg_constr, LEVEL_1, "created non-spillable %+F for value %+F\n", cpy, other_different));
        } else {
@@ -533,14 +536,14 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
        /* Add the Keep resp. CopyKeep and reroute the users */
        /* of the other_different irn in case of CopyKeep.   */
        if (has_irn_users(other_different)) {
-               keep = be_new_CopyKeep_single(cls, irg, block, cpy, irn, get_irn_mode(other_different));
+               keep = be_new_CopyKeep_single(cls, block, cpy, irn, get_irn_mode(other_different));
                be_node_set_reg_class_in(keep, 1, cls);
        } else {
                ir_node *in[2];
 
                in[0] = irn;
                in[1] = cpy;
-               keep = be_new_Keep(cls, irg, block, 2, in);
+               keep = be_new_Keep(block, 2, in);
        }
 
        DB((dbg_constr, LEVEL_1, "created %+F(%+F, %+F)\n\n", keep, irn, cpy));
@@ -554,7 +557,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);
 
@@ -577,7 +580,8 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
  * @param skipped_irn  if irn is a Proj node, its predecessor, else irn
  * @param env          the constraint environment
  */
-static void assure_different_constraints(ir_node *irn, ir_node *skipped_irn, constraint_env_t *env) {
+static void assure_different_constraints(ir_node *irn, ir_node *skipped_irn, constraint_env_t *env)
+{
        const arch_register_req_t *req = arch_get_register_req_out(irn);
 
        if (arch_register_req_is(req, must_be_different)) {
@@ -615,7 +619,8 @@ static void assure_different_constraints(ir_node *irn, ir_node *skipped_irn, con
  * @param block    The block to be checked
  * @param walk_env The walker environment
  */
-static void assure_constraints_walker(ir_node *block, void *walk_env) {
+static void assure_constraints_walker(ir_node *block, void *walk_env)
+{
        ir_node *irn;
 
        sched_foreach_reverse(block, irn) {
@@ -641,9 +646,8 @@ static void assure_constraints_walker(ir_node *block, void *walk_env) {
  * Melt all copykeeps pointing to the same node
  * (or Projs of the same node), copying the same operand.
  */
-static void melt_copykeeps(constraint_env_t *cenv) {
-       be_irg_t *birg = cenv->birg;
-       ir_graph *irg  = be_get_birg_irg(birg);
+static void melt_copykeeps(constraint_env_t *cenv)
+{
        ir_nodemap_iterator_t map_iter;
        ir_nodemap_entry_t    map_entry;
 
@@ -728,10 +732,10 @@ static void melt_copykeeps(constraint_env_t *cenv) {
                                }
 
 #ifdef KEEP_ALIVE_COPYKEEP_HACK
-                               new_ck = be_new_CopyKeep(entry->cls, irg, get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in, mode_ANY);
+                               new_ck = be_new_CopyKeep(entry->cls, get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in, mode_ANY);
                                keep_alive(new_ck);
 #else
-                               new_ck = be_new_CopyKeep(entry->cls, irg, get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in, get_irn_mode(ref));
+                               new_ck = be_new_CopyKeep(entry->cls, get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in, get_irn_mode(ref));
 #endif /* KEEP_ALIVE_COPYKEEP_HACK */
 
                                /* set register class for all kept inputs */
@@ -759,20 +763,15 @@ static void melt_copykeeps(constraint_env_t *cenv) {
        }
 }
 
-/**
- * Walks over all nodes to assure register constraints.
- *
- * @param birg  The birg structure containing the irg
- */
-void assure_constraints(be_irg_t *birg) {
-       ir_graph              *irg = be_get_birg_irg(birg);
+void assure_constraints(ir_graph *irg)
+{
        constraint_env_t      cenv;
        ir_nodemap_iterator_t map_iter;
        ir_nodemap_entry_t    map_entry;
 
        FIRM_DBG_REGISTER(dbg_constr, "firm.be.lower.constr");
 
-       cenv.birg = birg;
+       cenv.irg = irg;
        ir_nodemap_init(&cenv.op_set);
        obstack_init(&cenv.obst);
 
@@ -805,7 +804,7 @@ void assure_constraints(be_irg_t *birg) {
                DB((dbg_constr, LEVEL_1, "\n"));
 
                /* introduce the copies for the operand and it's copies */
-               be_ssa_construction_init(&senv, birg);
+               be_ssa_construction_init(&senv, irg);
                be_ssa_construction_add_copy(&senv, map_entry.node);
                be_ssa_construction_add_copies(&senv, nodes, n);
                be_ssa_construction_fix_users(&senv, map_entry.node);
@@ -815,11 +814,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, irg, 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. */
@@ -833,7 +831,7 @@ void assure_constraints(be_irg_t *birg) {
 
        ir_nodemap_destroy(&cenv.op_set);
        obstack_free(&cenv.obst, NULL);
-       be_liveness_invalidate(be_get_birg_liveness(birg));
+       be_liveness_invalidate(be_get_irg_liveness(irg));
 }
 
 
@@ -850,7 +848,7 @@ void assure_constraints(be_irg_t *birg) {
  * @return     1, if there is something left to perm over.
  *             0, if removed the complete perm.
  */
-static int push_through_perm(ir_node *perm, lower_env_t *env)
+static int push_through_perm(ir_node *perm)
 {
        ir_graph *irg     = get_irn_irg(perm);
        ir_node *bl       = get_nodes_block(perm);
@@ -884,8 +882,9 @@ static int push_through_perm(ir_node *perm, lower_env_t *env)
        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) &&
-                           !values_interfere(env->birg, op, one_proj)) {
+                           !be_values_interfere(lv, op, one_proj)) {
                                frontier = irn;
                                goto found_front;
                        }
@@ -955,11 +954,11 @@ found_front:
        }
 
        /* well, we could not push anything through the perm */
-       if(n_moved == 0)
+       if (n_moved == 0)
                return 1;
 
        new_size = arity - n_moved;
-       if(new_size == 0) {
+       if (new_size == 0) {
                sched_remove(perm);
                kill_node(perm);
                return 0;
@@ -1002,31 +1001,23 @@ static void lower_nodes_after_ra_walker(ir_node *irn, void *walk_env)
        if (!be_is_Perm(irn))
                return;
 
-       perm_stayed = push_through_perm(irn, walk_env);
+       perm_stayed = push_through_perm(irn);
        if (perm_stayed)
                lower_perm_node(irn, walk_env);
 }
 
-/**
- * Walks over all blocks in an irg and performs lowering need to be
- * done after register allocation (e.g. perm lowering).
- *
- * @param birg      The birg object
- * @param do_copy   1 == resolve cycles with a free reg if available
- */
-void lower_nodes_after_ra(be_irg_t *birg, int do_copy) {
+void lower_nodes_after_ra(ir_graph *irg, int do_copy)
+{
        lower_env_t env;
-       ir_graph    *irg;
 
        FIRM_DBG_REGISTER(dbg, "firm.be.lower");
        FIRM_DBG_REGISTER(dbg_permmove, "firm.be.lower.permmove");
 
-       env.birg    = birg;
+       env.irg     = irg;
        env.do_copy = do_copy;
 
        /* we will need interference */
-       be_liveness_assure_chk(be_get_birg_liveness(birg));
+       be_liveness_assure_chk(be_get_irg_liveness(irg));
 
-       irg = be_get_birg_irg(birg);
        irg_walk_graph(irg, NULL, lower_nodes_after_ra_walker, &env);
 }