remove #ifdef HAVE_CONFIG_Hs
[libfirm] / ir / be / belower.c
index ea759db..2934508 100644 (file)
@@ -24,9 +24,7 @@
  * @date        14.12.2005
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 
@@ -68,7 +66,6 @@ typedef struct {
 /** Lowering walker environment. */
 typedef struct _lower_env_t {
        be_irg_t         *birg;
-       const arch_env_t *arch_env;
        unsigned          do_copy : 1;
        DEBUG_ONLY(firm_dbg_module_t *dbg_module;)
 } lower_env_t;
@@ -283,7 +280,6 @@ static perm_cycle_t *get_perm_cycle(perm_cycle_t *cycle, reg_pair_t *pairs, int
 static void lower_perm_node(ir_node *irn, void *walk_env) {
        ir_graph        *irg = get_irn_irg(irn);
        const arch_register_class_t *reg_class;
-       const arch_env_t            *arch_env;
        lower_env_t     *env         = walk_env;
        int             real_size    = 0;
        int             keep_perm    = 0;
@@ -295,7 +291,6 @@ static void lower_perm_node(ir_node *irn, void *walk_env) {
        ir_node         *cpyxchg = NULL;
        DEBUG_ONLY(firm_dbg_module_t *mod;)
 
-       arch_env = env->arch_env;
        do_copy  = env->do_copy;
        DEBUG_ONLY(mod = env->dbg_module;)
        block    = get_nodes_block(irn);
@@ -314,7 +309,7 @@ static void lower_perm_node(ir_node *irn, void *walk_env) {
        n = get_irn_arity(irn);
        assert(n == get_irn_n_edges(irn) && "perm's in and out numbers different");
 
-       reg_class = arch_get_irn_register(arch_env, get_irn_n(irn, 0))->reg_class;
+       reg_class = arch_get_irn_register(get_irn_n(irn, 0))->reg_class;
        pairs     = alloca(n * sizeof(pairs[0]));
 
        /* build the list of register pairs (in, out) */
@@ -324,8 +319,8 @@ static void lower_perm_node(ir_node *irn, void *walk_env) {
                pn                = get_Proj_proj(pairs[i].out_node);
                pairs[i].in_node  = get_irn_n(irn, pn);
 
-               pairs[i].in_reg  = arch_get_irn_register(arch_env, pairs[i].in_node);
-               pairs[i].out_reg = arch_get_irn_register(arch_env, pairs[i].out_node);
+               pairs[i].in_reg  = arch_get_irn_register(pairs[i].in_node);
+               pairs[i].out_reg = arch_get_irn_register(pairs[i].out_node);
 
                pairs[i].checked = 0;
                i++;
@@ -465,8 +460,8 @@ static void lower_perm_node(ir_node *irn, void *walk_env) {
                                set_Proj_pred(res1, cpyxchg);
                                set_Proj_proj(res1, 1);
 
-                               arch_set_irn_register(arch_env, res2, cycle->elems[i + 1]);
-                               arch_set_irn_register(arch_env, res1, cycle->elems[i]);
+                               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(sched_point, cpyxchg);
@@ -481,7 +476,7 @@ static void lower_perm_node(ir_node *irn, void *walk_env) {
                                        irn, arg1, cycle->elems[i]->name, res2, cycle->elems[i + 1]->name));
 
                                cpyxchg = be_new_Copy(reg_class, irg, block, arg1);
-                               arch_set_irn_register(arch_env, cpyxchg, cycle->elems[i + 1]);
+                               arch_set_irn_register(cpyxchg, cycle->elems[i + 1]);
                                n_ops++;
 
                                /* exchange copy node and proj */
@@ -521,16 +516,16 @@ static INLINE ir_node *belower_skip_proj(ir_node *irn) {
        return irn;
 }
 
-static ir_node *find_copy(constraint_env_t *env, ir_node *irn, ir_node *op) {
-       const arch_env_t *arch_env = be_get_birg_arch_env(env->birg);
-       ir_node          *block    = get_nodes_block(irn);
-       ir_node          *cur_node;
+static ir_node *find_copy(ir_node *irn, ir_node *op)
+{
+       ir_node *block    = get_nodes_block(irn);
+       ir_node *cur_node;
 
        for (cur_node = sched_prev(irn);
                ! is_Block(cur_node) && be_is_Copy(cur_node) && get_nodes_block(cur_node) == block;
                cur_node = sched_prev(cur_node))
        {
-               if (be_get_Copy_op(cur_node) == op && arch_irn_is(arch_env, cur_node, dont_spill))
+               if (be_get_Copy_op(cur_node) == op && arch_irn_is(cur_node, dont_spill))
                        return cur_node;
        }
 
@@ -541,14 +536,14 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
        be_irg_t                    *birg     = env->birg;
        ir_graph                    *irg      = be_get_birg_irg(birg);
        pset                        *op_set   = env->op_set;
-       const arch_env_t            *arch_env = be_get_birg_arch_env(birg);
        ir_node                     *block    = get_nodes_block(irn);
-       const arch_register_class_t *cls      = arch_get_irn_reg_class(arch_env, other_different, -1);
+       const arch_register_class_t *cls      = arch_get_irn_reg_class(other_different, -1);
        ir_node                     *in[2], *keep, *cpy;
        op_copy_assoc_t             key, *entry;
        DEBUG_ONLY(firm_dbg_module_t *mod     = env->dbg;)
 
-       if (arch_irn_is(arch_env, other_different, ignore) || ! mode_is_datab(get_irn_mode(other_different))) {
+       if (arch_irn_is(other_different, ignore) ||
+                       !mode_is_datab(get_irn_mode(other_different))) {
                DBG((mod, LEVEL_1, "ignore constraint for %+F because other_irn is ignore or not a datab node\n", irn));
                return;
        }
@@ -559,7 +554,7 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
        /* The copy is optimized later if not needed         */
 
        /* check if already exists such a copy in the schedule immediately before */
-       cpy = find_copy(env, belower_skip_proj(irn), other_different);
+       cpy = find_copy(belower_skip_proj(irn), other_different);
        if (! cpy) {
                cpy = be_new_Copy(cls, irg, block, other_different);
                be_node_set_flags(cpy, BE_OUT_POS(0), arch_irn_flags_dont_spill);
@@ -617,11 +612,8 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
  * then to assure the constraint.
  */
 static void assure_different_constraints(ir_node *irn, constraint_env_t *env) {
-       const arch_register_req_t *req;
-       const arch_env_t          *arch_env    = be_get_birg_arch_env(env->birg);
        ir_node                   *skipped_irn = belower_skip_proj(irn);
-
-       req = arch_get_register_req(arch_env, irn, -1);
+       const arch_register_req_t *req         = arch_get_register_req(irn, -1);
 
        if (arch_register_req_is(req, must_be_different)) {
                const unsigned other = req->other_different;
@@ -793,7 +785,6 @@ static void melt_copykeeps(constraint_env_t *cenv) {
  */
 void assure_constraints(be_irg_t *birg) {
        ir_graph         *irg      = be_get_birg_irg(birg);
-       const arch_env_t *arch_env = be_get_birg_arch_env(birg);
        constraint_env_t cenv;
        op_copy_assoc_t  *entry;
        ir_node          **nodes;
@@ -847,7 +838,7 @@ void assure_constraints(be_irg_t *birg) {
                                ir_node *keep;
                                int     n = get_irn_arity(cp);
 
-                               keep = be_new_Keep(arch_get_irn_reg_class(arch_env, cp, -1),
+                               keep = be_new_Keep(arch_get_irn_reg_class(cp, -1),
                                        irg, get_nodes_block(cp), n, get_irn_in(cp) + 1);
                                sched_add_before(cp, keep);
 
@@ -879,8 +870,7 @@ void assure_constraints(be_irg_t *birg) {
  */
 static int push_through_perm(ir_node *perm, void *data)
 {
-       lower_env_t *env       = data;
-       const arch_env_t *aenv = env->arch_env;
+       lower_env_t *env = data;
 
        ir_graph *irg     = get_irn_irg(perm);
        ir_node *bl       = get_nodes_block(perm);
@@ -905,7 +895,7 @@ static int push_through_perm(ir_node *perm, void *data)
        edge     = get_irn_out_edge_first_kind(perm, EDGE_KIND_NORMAL);
        one_proj = get_edge_src_irn(edge);
        assert(is_Proj(one_proj));
-       cls      = arch_get_irn_reg_class(aenv, one_proj, -1);
+       cls      = arch_get_irn_reg_class(one_proj, -1);
 
        /* Find the point in the schedule after which the
         * potentially movable nodes must be defined.
@@ -918,7 +908,7 @@ static int push_through_perm(ir_node *perm, void *data)
        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);
-                       if (arch_irn_consider_in_reg_alloc(aenv, cls, op) &&
+                       if (arch_irn_consider_in_reg_alloc(cls, op) &&
                            !values_interfere(env->birg, op, one_proj)) {
                                frontier = irn;
                                goto found_front;
@@ -952,19 +942,19 @@ found_front:
                        break;
                if(!sched_comes_after(frontier, node))
                        break;
-               if(arch_irn_is(aenv, node, modify_flags))
+               if (arch_irn_is(node, modify_flags))
                        break;
                if(is_Proj(node)) {
-                       req = arch_get_register_req(aenv, get_Proj_pred(node),
+                       req = arch_get_register_req(get_Proj_pred(node),
                                                    -1 - get_Proj_proj(node));
                } else {
-                       req = arch_get_register_req(aenv, node, -1);
+                       req = arch_get_register_req(node, -1);
                }
                if(req->type != arch_register_req_type_normal)
                        break;
                for(i = get_irn_arity(node) - 1; i >= 0; --i) {
                        ir_node *opop = get_irn_n(node, i);
-                       if (arch_irn_consider_in_reg_alloc(aenv, cls, opop)) {
+                       if (arch_irn_consider_in_reg_alloc(cls, opop)) {
                                break;
                        }
                }
@@ -978,7 +968,7 @@ found_front:
                sched_add_after(perm, node);
 
                /* give it the proj's register */
-               arch_set_irn_register(aenv, node, arch_get_irn_register(aenv, proj));
+               arch_set_irn_register(node, arch_get_irn_register(proj));
 
                /* reroute all users of the proj to the moved node. */
                edges_reroute(proj, node, irg);
@@ -1058,9 +1048,8 @@ void lower_nodes_after_ra(be_irg_t *birg, int do_copy) {
        lower_env_t env;
        ir_graph    *irg = be_get_birg_irg(birg);
 
-       env.birg     = birg;
-       env.arch_env = be_get_birg_arch_env(birg);
-       env.do_copy  = do_copy;
+       env.birg    = birg;
+       env.do_copy = do_copy;
        FIRM_DBG_REGISTER(env.dbg_module, "firm.be.lower");
 
        /* we will need interference */