projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make verifier a bit less strict about keeps
[libfirm]
/
ir
/
be
/
bemain.c
diff --git
a/ir/be/bemain.c
b/ir/be/bemain.c
index
8e77a74
..
8da5054
100644
(file)
--- a/
ir/be/bemain.c
+++ b/
ir/be/bemain.c
@@
-250,8
+250,6
@@
const backend_params *be_init(void)
*/
static be_main_env_t *be_init_env(be_main_env_t *env, FILE *file_handle)
{
*/
static be_main_env_t *be_init_env(be_main_env_t *env, FILE *file_handle)
{
- arch_get_irn_ops_t *handler;
-
memset(env, 0, sizeof(*env));
env->options = &be_options;
env->ent_trampoline_map = pmap_create();
memset(env, 0, sizeof(*env));
env->options = &be_options;
env->ent_trampoline_map = pmap_create();
@@
-263,11
+261,7
@@
static be_main_env_t *be_init_env(be_main_env_t *env, FILE *file_handle)
remove_irp_type(env->pic_symbols_type);
set_class_final(env->pic_trampolines_type, 1);
remove_irp_type(env->pic_symbols_type);
set_class_final(env->pic_trampolines_type, 1);
- arch_env_init(&env->arch_env, isa_if, file_handle, env);
-
- /* Register the irn handler of the architecture */
- handler = arch_isa_get_irn_handler(env->arch_env.isa);
- arch_env_set_irn_handler(&env->arch_env, handler);
+ env->arch_env = arch_env_init(isa_if, file_handle, env);
be_phi_handler_new(env);
be_phi_handler_new(env);
@@
-280,9
+274,9
@@
static be_main_env_t *be_init_env(be_main_env_t *env, FILE *file_handle)
*/
static void be_done_env(be_main_env_t *env)
{
*/
static void be_done_env(be_main_env_t *env)
{
-
env->arch_env.isa->impl->done(env->arch_env.isa
);
+
arch_env_done(env->arch_env
);
be_dbg_close();
be_dbg_close();
- be_phi_handler_free(
env
);
+ be_phi_handler_free();
pmap_destroy(env->ent_trampoline_map);
pmap_destroy(env->ent_pic_symbol_map);
pmap_destroy(env->ent_trampoline_map);
pmap_destroy(env->ent_pic_symbol_map);
@@
-320,7
+314,7
@@
static void initialize_birg(be_irg_t *birg, ir_graph *irg, be_main_env_t *env)
dump(DUMP_INITIAL, irg, "-begin", dump_ir_block_graph);
dump(DUMP_INITIAL, irg, "-begin", dump_ir_block_graph);
- be_stat_init_irg(
&
env->arch_env, irg);
+ be_stat_init_irg(env->arch_env, irg);
be_do_stat_nodes(irg, "01 Begin");
/* set the current graph (this is important for several firm functions) */
be_do_stat_nodes(irg, "01 Begin");
/* set the current graph (this is important for several firm functions) */
@@
-381,13
+375,13
@@
ir_timer_t *t_ra_other;
static void be_main_loop(FILE *file_handle, const char *cup_name)
{
int i;
static void be_main_loop(FILE *file_handle, const char *cup_name)
{
int i;
- arch_isa_t *isa;
be_main_env_t env;
char prof_filename[256];
static const char suffix[] = ".prof";
be_irg_t *birgs;
int num_birgs;
ir_graph **irg_list, **backend_irg_list;
be_main_env_t env;
char prof_filename[256];
static const char suffix[] = ".prof";
be_irg_t *birgs;
int num_birgs;
ir_graph **irg_list, **backend_irg_list;
+ arch_env_t *arch_env;
be_timing = (be_options.timing == BE_TIME_ON);
be_timing = (be_options.timing == BE_TIME_ON);
@@
-420,14
+414,14
@@
static void be_main_loop(FILE *file_handle, const char *cup_name)
be_init_env(&env, file_handle);
env.cup_name = cup_name;
be_init_env(&env, file_handle);
env.cup_name = cup_name;
- isa = arch_env_get_isa(&env.arch_env);
-
be_dbg_so(cup_name);
be_dbg_types();
be_dbg_so(cup_name);
be_dbg_types();
+ arch_env = env.arch_env;
+
/* backend may provide an ordered list of irgs where code should be generated for */
irg_list = NEW_ARR_F(ir_graph *, 0);
/* backend may provide an ordered list of irgs where code should be generated for */
irg_list = NEW_ARR_F(ir_graph *, 0);
- backend_irg_list = arch_
isa_get_backend_irg_list(isa
, &irg_list);
+ backend_irg_list = arch_
env_get_backend_irg_list(arch_env
, &irg_list);
/* we might need 1 birg more for instrumentation constructor */
num_birgs = backend_irg_list ? ARR_LEN(backend_irg_list) : get_irp_n_irgs();
/* we might need 1 birg more for instrumentation constructor */
num_birgs = backend_irg_list ? ARR_LEN(backend_irg_list) : get_irp_n_irgs();
@@
-479,7
+473,7
@@
static void be_main_loop(FILE *file_handle, const char *cup_name)
be_sched_init_phase(irg);
/* reset the phi handler. */
be_sched_init_phase(irg);
/* reset the phi handler. */
- be_phi_handler_reset(
&env
);
+ be_phi_handler_reset();
stat_ev_ctx_push_fobj("bemain_irg", irg);
stat_ev_ctx_push_fobj("bemain_irg", irg);
@@
-498,7
+492,7
@@
static void be_main_loop(FILE *file_handle, const char *cup_name)
BE_TIMER_POP(t_verify);
/* Get the code generator interface. */
BE_TIMER_POP(t_verify);
/* Get the code generator interface. */
- cg_if =
isa->impl->get_code_generator_if(isa
);
+ cg_if =
arch_env_get_code_generator_if(arch_env
);
/* get a code generator for this graph. */
birg->cg = cg_if->init(birg);
/* get a code generator for this graph. */
birg->cg = cg_if->init(birg);
@@
-530,7
+524,7
@@
static void be_main_loop(FILE *file_handle, const char *cup_name)
stat_ev_ctx_pop("bemain_phase");
/* reset the phi handler. */
stat_ev_ctx_pop("bemain_phase");
/* reset the phi handler. */
- be_phi_handler_reset(
&env
);
+ be_phi_handler_reset();
be_do_stat_nodes(irg, "03 Prepare");
be_do_stat_nodes(irg, "03 Prepare");
@@
-629,14
+623,14
@@
static void be_main_loop(FILE *file_handle, const char *cup_name)
//be_do_stat_reg_pressure(birg);
#ifdef FIRM_STATISTICS
//be_do_stat_reg_pressure(birg);
#ifdef FIRM_STATISTICS
- stat_ev_dbl("costs_before_ra", be_estimate_irg_costs(irg,
&env.
arch_env, birg->exec_freq));
+ stat_ev_dbl("costs_before_ra", be_estimate_irg_costs(irg, arch_env, birg->exec_freq));
#endif
/* Do register allocation */
be_allocate_registers(birg);
#ifdef FIRM_STATISTICS
#endif
/* Do register allocation */
be_allocate_registers(birg);
#ifdef FIRM_STATISTICS
- stat_ev_dbl("costs_before_ra", be_estimate_irg_costs(irg,
&env.
arch_env, birg->exec_freq));
+ stat_ev_dbl("costs_before_ra", be_estimate_irg_costs(irg, arch_env, birg->exec_freq));
#endif
dump(DUMP_RA, irg, "-ra", dump_ir_block_graph_sched);
#endif
dump(DUMP_RA, irg, "-ra", dump_ir_block_graph_sched);
@@
-823,7
+817,7
@@
unsigned be_put_ignore_regs(const be_irg_t *birg, const arch_register_class_t *c
bitset_clear_all(bs);
assert(bitset_size(bs) == (unsigned)cls->n_regs);
bitset_clear_all(bs);
assert(bitset_size(bs) == (unsigned)cls->n_regs);
- arch_put_non_ignore_regs(
&
birg->main_env->arch_env, cls, bs);
+ arch_put_non_ignore_regs(birg->main_env->arch_env, cls, bs);
bitset_flip_all(bs);
be_abi_put_ignore_regs(birg->abi, cls, bs);
bitset_flip_all(bs);
be_abi_put_ignore_regs(birg->abi, cls, bs);