copy register on benode lowering to Load

[libfirm] / ir / be / bemain.c

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index d9c0e0d..bba2b16 100644 (file)
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -124,8 +124,10 @@ static const lc_opt_table_entry_t be_main_options[] = {
        LC_OPT_ENT_ENUM_PTR("ra", "register allocator", &ra_var),
        LC_OPT_ENT_ENUM_PTR("isa", "the instruction set architecture", &isa_var),
 
+#ifdef WITH_ILP
        LC_OPT_ENT_STR ("ilp.server", "the ilp server name", be_options.ilp_server, sizeof(be_options.ilp_server)),
        LC_OPT_ENT_STR ("ilp.solver", "the ilp solver name", be_options.ilp_solver, sizeof(be_options.ilp_solver)),
+#endif /* WITH_ILP */
        { NULL }
 };
 
@@ -180,14 +182,14 @@ static be_main_env_t *be_init_env(be_main_env_t *env)
 
        /* Register the irn handler of the architecture */
        if (arch_isa_get_irn_handler(env->arch_env->isa))
-               arch_env_add_irn_handler(env->arch_env, arch_isa_get_irn_handler(env->arch_env->isa));
+               arch_env_push_irn_handler(env->arch_env, arch_isa_get_irn_handler(env->arch_env->isa));
 
                /*
                * Register the node handler of the back end infrastructure.
                * This irn handler takes care of the platform independent
                * spill, reload and perm nodes.
        */
-       arch_env_add_irn_handler(env->arch_env, &be_node_irn_handler);
+       arch_env_push_irn_handler(env->arch_env, &be_node_irn_handler);
 
        return env;
 }
@@ -225,10 +227,6 @@ static void prepare_graph(be_irg_t *birg)
        /* Ensure, that the ir_edges are computed. */
        edges_activate(irg);
 
-       /* Compute loop nesting information (for weighting copies) */
-       if (get_irg_loopinfo_state(irg) != (loopinfo_valid & loopinfo_cf_consistent))
-               construct_cf_backedges(irg);
-
        /* check, if the dominance property is fulfilled. */
        be_check_dominance(irg);
 
@@ -284,16 +282,18 @@ static void be_main_loop(FILE *file_handle)
                dead_node_elimination(irg);
                edges_activate(irg);
 
+               /* Compute loop nesting information (for weighting copies) */
+               construct_cf_backedges(irg);
+
                dump(DUMP_PREPARED, irg, "-prepared", dump_ir_block_graph);
 
                /* Schedule the graphs. */
                arch_code_generator_before_sched(birg.cg);
                list_sched(isa, irg);
 
-               dump(DUMP_SCHED, irg, "-sched", dump_ir_block_graph_sched);
-
                /* connect all stack modifying nodes together (see beabi.c) */
                be_abi_fix_stack_nodes(birg.abi);
+               dump(DUMP_SCHED, irg, "-sched", dump_ir_block_graph_sched);
 
                /* Verify the schedule */
                sched_verify_irg(irg);
@@ -303,6 +303,7 @@ static void be_main_loop(FILE *file_handle)
                ra->allocate(&birg);
                dump(DUMP_RA, irg, "-ra", dump_ir_block_graph_sched);
 
+               arch_code_generator_after_ra(birg.cg);
                be_abi_fix_stack_bias(birg.abi);
 
                arch_code_generator_done(birg.cg);