fix abs creation after recent reassoc changes

[libfirm] / ir / be / bemain.c

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index ef17abe..c164ba4 100644 (file)
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -31,6 +31,10 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#include <libcore/lc_opts.h>
+#include <libcore/lc_opts_enum.h>
+#include <libcore/lc_timing.h>
+
 #include "obst.h"
 #include "bitset.h"
 
@@ -98,11 +102,6 @@ static char config_file[256] = { 0 };
 /* back end instruction set architecture to use */
 static const arch_isa_if_t *isa_if = NULL;
 
-#ifdef WITH_LIBCORE
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
-#include <libcore/lc_timing.h>
-
 /* possible dumping options */
 static const lc_opt_enum_mask_items_t dump_items[] = {
        { "none",       DUMP_NONE },
@@ -163,7 +162,6 @@ static const lc_opt_table_entry_t be_main_options[] = {
 #endif /* WITH_ILP */
        LC_OPT_LAST
 };
-#endif /* WITH_LIBCORE */
 
 static be_module_list_entry_t *isa_ifs = NULL;
 
@@ -187,27 +185,21 @@ void be_opt_register(void)
 
        be_init_modules();
 
-#ifdef WITH_LIBCORE
        be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
        lc_opt_add_table(be_grp, be_main_options);
 
        be_add_module_list_opt(be_grp, "isa", "the instruction set architecture",
                               &isa_ifs, (void**) &isa_if);
-#endif
 }
 
 /* Parse one argument. */
 int be_parse_arg(const char *arg) {
-#ifdef WITH_LIBCORE
        lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
        if (strcmp(arg, "help") == 0 || (arg[0] == '?' && arg[1] == '\0')) {
                lc_opt_print_help(be_grp, stdout);
                return -1;
        }
        return lc_opt_from_single_arg(be_grp, NULL, arg, NULL);
-#else
-       return 0;
-#endif
 }
 
 /** The be parameters returned by default, all off. */
@@ -331,9 +323,6 @@ static void initialize_birg(be_irg_t *birg, ir_graph *irg, be_main_env_t *env)
        /* Ensure, that the ir_edges are computed. */
        edges_assure(irg);
 
-       /* reset the phi handler. */
-       be_phi_handler_reset(env->phi_handler);
-
        set_irg_phase_state(irg, phase_backend);
 
        dump(DUMP_INITIAL, irg, "-prepared", dump_ir_block_graph);
@@ -458,9 +447,10 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                /* set the current graph (this is important for several firm functions) */
                current_ir_graph = irg;
 
-#ifdef FIRM_STATISTICS
-               stat_ev_ctx_push_fobj("irg", irg);
-#endif
+               /* reset the phi handler. */
+               be_phi_handler_reset(env.phi_handler);
+
+               stat_ev_ctx_push_fobj("bemain_irg", irg);
 
                /* stop and reset timers */
                BE_TIMER_ONLY(
@@ -498,9 +488,6 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                /* some transformations need to be done before abi introduce */
                arch_code_generator_before_abi(birg->cg);
 
-               /* reset the phi handler. */
-               be_phi_handler_reset(env.phi_handler);
-
                /* implement the ABI conventions. */
                BE_TIMER_PUSH(t_abi);
                birg->abi = be_abi_introduce(birg);
@@ -518,9 +505,14 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                }
 
                /* generate code */
+               stat_ev_ctx_push("bemain_phase", "prepare");
                BE_TIMER_PUSH(t_codegen);
                arch_code_generator_prepare_graph(birg->cg);
                BE_TIMER_POP(t_codegen);
+               stat_ev_ctx_pop();
+
+               /* reset the phi handler. */
+               be_phi_handler_reset(env.phi_handler);
 
                be_do_stat_nodes(irg, "03 Prepare");
 
@@ -548,9 +540,11 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                /* be_live_chk_compare(birg); */
 
                /* let backend prepare scheduling */
+               stat_ev_ctx_push("bemain_phase", "before_sched");
                BE_TIMER_PUSH(t_codegen);
                arch_code_generator_before_sched(birg->cg);
                BE_TIMER_POP(t_codegen);
+               stat_ev_ctx_pop();
 
                /* schedule the irg */
                BE_TIMER_PUSH(t_sched);
@@ -655,13 +649,13 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                        be_check_dominance(irg);
                        be_verify_out_edges(irg);
                        be_verify_schedule(birg);
-                       be_verify_register_allocation(env.arch_env, irg);
+                       be_verify_register_allocation(birg);
                } else if (be_options.vrfy_option == BE_VRFY_ASSERT) {
                        assert(irg_verify(irg, VRFY_ENFORCE_SSA) && "irg verification failed");
                        assert(be_verify_out_edges(irg) && "out edge verification failed");
                        assert(be_check_dominance(irg) && "Dominance verification failed");
                        assert(be_verify_schedule(birg) && "Schedule verification failed");
-                       assert(be_verify_register_allocation(env.arch_env, irg)
+                       assert(be_verify_register_allocation(birg)
                               && "register allocation verification failed");
 
                }
@@ -772,6 +766,7 @@ void be_main(FILE *file_handle, const char *cup_name)
                const char *pos = dot ? dot : cup_name + strlen(cup_name);
                char       *buf = alloca(pos - cup_name + 1);
                strncpy(buf, cup_name, pos - cup_name);
+               buf[pos - cup_name] = '\0';
 
                stat_ev_begin(buf);
        }