From f538c62d4f48ca2921a172961a5a234caa34627d Mon Sep 17 00:00:00 2001 From: Christoph Mallon Date: Sat, 11 Oct 2008 21:35:52 +0000 Subject: [PATCH] Remove the attribute const arch_env_t *arch_env from struct ia32_code_gen_t. We can get the isa by simpler means. [r22770] --- ir/be/ia32/bearch_ia32.c | 1 - ir/be/ia32/bearch_ia32_t.h | 1 - ir/be/ia32/ia32_common_transform.c | 2 +- ir/be/ia32/ia32_emitter.c | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ir/be/ia32/bearch_ia32.c b/ir/be/ia32/bearch_ia32.c index ac2811ccf..7a0f8eb69 100644 --- a/ir/be/ia32/bearch_ia32.c +++ b/ir/be/ia32/bearch_ia32.c @@ -1595,7 +1595,6 @@ static void *ia32_cg_init(be_irg_t *birg) { cg->irg = birg->irg; cg->reg_set = new_set(ia32_cmp_irn_reg_assoc, 1024); cg->isa = isa; - cg->arch_env = birg->main_env->arch_env; cg->birg = birg; cg->blk_sched = NULL; cg->dump = (birg->main_env->options->dump_flags & DUMP_BE) ? 1 : 0; diff --git a/ir/be/ia32/bearch_ia32_t.h b/ir/be/ia32/bearch_ia32_t.h index 06bed8f12..5d8e03da8 100644 --- a/ir/be/ia32/bearch_ia32_t.h +++ b/ir/be/ia32/bearch_ia32_t.h @@ -58,7 +58,6 @@ typedef struct ia32_intrinsic_env_t ia32_intrinsic_env_t; struct ia32_code_gen_t { const arch_code_generator_if_t *impl; /**< implementation */ ir_graph *irg; /**< current irg */ - const arch_env_t *arch_env; /**< the arch env */ set *reg_set; /**< set to memorize registers for non-ia32 nodes (e.g. phi nodes) */ ia32_isa_t *isa; /**< for fast access to the isa object */ be_irg_t *birg; /**< The be-irg (contains additional information about the irg) */ diff --git a/ir/be/ia32/ia32_common_transform.c b/ir/be/ia32/ia32_common_transform.c index 19e5fbe9c..d91cbf336 100644 --- a/ir/be/ia32/ia32_common_transform.c +++ b/ir/be/ia32/ia32_common_transform.c @@ -205,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); diff --git a/ir/be/ia32/ia32_emitter.c b/ir/be/ia32/ia32_emitter.c index 098bcf862..34c75bb32 100644 --- a/ir/be/ia32/ia32_emitter.c +++ b/ir/be/ia32/ia32_emitter.c @@ -2108,7 +2108,7 @@ void ia32_gen_routine(ia32_code_gen_t *ia32_cg, ir_graph *irg) int i, n; cg = ia32_cg; - isa = (const ia32_isa_t*) cg->arch_env; + isa = cg->isa; do_pic = cg->birg->main_env->options->pic; ia32_register_emitters(); -- 2.20.1