Complement r22830.

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

diff --git a/ir/be/ia32/ia32_common_transform.c b/ir/be/ia32/ia32_common_transform.c
index c50e4ca..d91cbf3 100644 (file)
--- a/ir/be/ia32/ia32_common_transform.c
+++ b/ir/be/ia32/ia32_common_transform.c
@@ -24,9 +24,7 @@
  * @author      Matthias Braun, Sebastian Buchwald
  * @version     $Id: ia32_common_transform.c 21012 2008-08-06 13:35:17Z beck $
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "error.h"
 #include "irargs_t.h"
@@ -174,7 +172,7 @@ ir_node *create_Immediate(ir_entity *symconst, int symconst_sign, long val)
        ir_node  *start_block = get_irg_start_block(irg);
        ir_node  *immediate   = new_rd_ia32_Immediate(NULL, irg, start_block,
                                                      symconst, symconst_sign, val);
-       arch_set_irn_register(env_cg->arch_env, immediate, &ia32_gp_regs[REG_GP_NOREG]);
+       arch_set_irn_register(immediate, &ia32_gp_regs[REG_GP_NOREG]);
 
        return immediate;
 }
@@ -207,7 +205,7 @@ const arch_register_t *ia32_get_clobber_register(const char *clobber)
 
 #ifndef NDEBUG
 const char *ia32_get_old_node_name(ia32_code_gen_t *cg, ir_node *irn) {
-       ia32_isa_t *isa = (ia32_isa_t*) cg->arch_env;
+       const ia32_isa_t *isa = cg->isa;
 
        lc_eoprintf(firm_get_arg_env(), isa->name_obst, "%+F", irn);
        obstack_1grow(isa->name_obst, 0);