remove #ifdef HAVE_CONFIG_Hs

[libfirm] / ir / be / ia32 / ia32_transform.c

diff --git a/ir/be/ia32/ia32_transform.c b/ir/be/ia32/ia32_transform.c
index ec25834..3ad3e9d 100644 (file)
--- a/ir/be/ia32/ia32_transform.c
+++ b/ir/be/ia32/ia32_transform.c
@@ -24,9 +24,7 @@
  * @author      Christian Wuerdig, Matthias Braun
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <limits.h>
 #include <stdbool.h>
@@ -3440,7 +3438,7 @@ static ir_node *gen_be_FrameAddr(ir_node *node)
        ir_node  *new_node;
 
        new_node = new_rd_ia32_Lea(dbgi, irg, block, new_op, noreg);
-       set_ia32_frame_ent(new_node, arch_get_frame_entity(env_cg->arch_env, node));
+       set_ia32_frame_ent(new_node, arch_get_frame_entity(node));
        set_ia32_use_frame(new_node);
 
        SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env_cg, node));
@@ -3969,7 +3967,7 @@ static ir_node *gen_Proj_be_AddSP(ir_node *node)
        if (proj == pn_be_AddSP_sp) {
                ir_node *res = new_rd_Proj(dbgi, irg, block, new_pred, mode_Iu,
                                           pn_ia32_SubSP_stack);
-               arch_set_irn_register(env_cg->arch_env, res, &ia32_gp_regs[REG_ESP]);
+               arch_set_irn_register(res, &ia32_gp_regs[REG_ESP]);
                return res;
        } else if (proj == pn_be_AddSP_res) {
                return new_rd_Proj(dbgi, irg, block, new_pred, mode_Iu,
@@ -3996,7 +3994,7 @@ static ir_node *gen_Proj_be_SubSP(ir_node *node)
        if (proj == pn_be_SubSP_sp) {
                ir_node *res = new_rd_Proj(dbgi, irg, block, new_pred, mode_Iu,
                                           pn_ia32_AddSP_stack);
-               arch_set_irn_register(env_cg->arch_env, res, &ia32_gp_regs[REG_ESP]);
+               arch_set_irn_register(res, &ia32_gp_regs[REG_ESP]);
                return res;
        } else if (proj == pn_be_SubSP_M) {
                return new_rd_Proj(dbgi, irg, block, new_pred, mode_M, pn_ia32_AddSP_M);
@@ -4276,8 +4274,7 @@ static ir_node *gen_be_Call(ir_node *node)
        i    = get_irn_arity(node) - 1;
        fpcw = be_transform_node(get_irn_n(node, i--));
        for (; i >= be_pos_Call_first_arg; --i) {
-               arch_register_req_t const *const req =
-                       arch_get_register_req(env_cg->arch_env, node, i);
+               arch_register_req_t const *const req = arch_get_register_req(node, i);
                ir_node *const reg_parm = be_transform_node(get_irn_n(node, i));
 
                assert(req->type == arch_register_req_type_limited);
@@ -4392,7 +4389,7 @@ static ir_node *gen_Proj_be_Call(ir_node *node)
 
        /* transform call modes */
        if (mode_is_data(mode)) {
-               cls  = arch_get_irn_reg_class(env_cg->arch_env, node, -1);
+               cls  = arch_get_irn_reg_class(node, -1);
                mode = cls->mode;
        }
 
@@ -4402,7 +4399,7 @@ static ir_node *gen_Proj_be_Call(ir_node *node)
        } else if (proj == pn_be_Call_M_regular) {
                proj = pn_ia32_Call_M;
        } else {
-               arch_register_req_t const *const req    = arch_get_register_req(env_cg->arch_env, node, BE_OUT_POS(proj));
+               arch_register_req_t const *const req    = arch_get_register_req(node, BE_OUT_POS(proj));
                int                        const n_outs = get_ia32_n_res(new_call);
                int                              i;
 
@@ -4428,11 +4425,11 @@ static ir_node *gen_Proj_be_Call(ir_node *node)
        /* TODO arch_set_irn_register() only operates on Projs, need variant with index */
        switch (proj) {
                case pn_ia32_Call_stack:
-                       arch_set_irn_register(env_cg->arch_env, res, &ia32_gp_regs[REG_ESP]);
+                       arch_set_irn_register(res, &ia32_gp_regs[REG_ESP]);
                        break;
 
                case pn_ia32_Call_fpcw:
-                       arch_set_irn_register(env_cg->arch_env, res, &ia32_fp_cw_regs[REG_FPCW]);
+                       arch_set_irn_register(res, &ia32_fp_cw_regs[REG_FPCW]);
                        break;
        }