be_remove_empty_blocks() now return non-zero if the graph was changed

[libfirm] / ir / be / bemain.c

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index bfc6e0e..2320c98 100644 (file)
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -37,12 +37,6 @@
 #include "execfreq.h"
 
 #include "bearch.h"
-#include "firm/bearch_firm.h"
-#include "ia32/bearch_ia32.h"
-#include "arm/bearch_arm.h"
-#include "ppc32/bearch_ppc32.h"
-#include "mips/bearch_mips.h"
-
 #include "be_t.h"
 #include "bemodule.h"
 #include "beutil.h"
@@ -89,11 +83,8 @@ static be_options_t be_options = {
 /* config file. */
 static char config_file[256] = { 0 };
 
-/* register allocator to use. */
-//static const be_ra_t *ra = &be_ra_chordal_allocator;
-
 /* back end instruction set architecture to use */
-static const arch_isa_if_t *isa_if = &ia32_isa_if;
+static const arch_isa_if_t *isa_if = NULL;
 
 #ifdef WITH_LIBCORE
 
@@ -111,18 +102,6 @@ static const lc_opt_enum_mask_items_t dump_items[] = {
        { NULL,         0 }
 };
 
-/* instruction set architectures. */
-static const lc_opt_enum_const_ptr_items_t isa_items[] = {
-       { "ia32",    &ia32_isa_if },
-#if 0
-       { "sta",     &sta_isa_if },
-       { "arm",     &arm_isa_if },
-       { "ppc32",   &ppc32_isa_if },
-       { "mips",    &mips_isa_if },
-#endif
-       { NULL,      NULL }
-};
-
 /* verify options. */
 static const lc_opt_enum_int_items_t vrfy_items[] = {
        { "off",    BE_VRFY_OFF    },
@@ -144,10 +123,6 @@ static lc_opt_enum_mask_var_t dump_var = {
        &be_options.dump_flags, dump_items
 };
 
-static lc_opt_enum_const_ptr_var_t isa_var = {
-       (const void **) &isa_if, isa_items
-};
-
 static lc_opt_enum_int_var_t vrfy_var = {
        &be_options.vrfy_option, vrfy_items
 };
@@ -159,7 +134,6 @@ static lc_opt_enum_int_var_t sched_var = {
 static const lc_opt_table_entry_t be_main_options[] = {
        LC_OPT_ENT_STR      ("config",   "read another config file containing backend options", config_file, sizeof(config_file)),
        LC_OPT_ENT_ENUM_MASK("dump",     "dump irg on several occasions",                       &dump_var),
-       LC_OPT_ENT_ENUM_PTR ("isa",      "the instruction set architecture",                    &isa_var),
        LC_OPT_ENT_NEGBOOL  ("noomitfp", "do not omit frame pointer",                           &be_options.omit_fp),
        LC_OPT_ENT_BOOL     ("stabs",    "enable stabs debug support",                          &be_options.stabs_debug_support),
        LC_OPT_ENT_ENUM_PTR ("vrfy",     "verify the backend irg",                              &vrfy_var),
@@ -177,6 +151,16 @@ static const lc_opt_table_entry_t be_main_options[] = {
 
 #endif /* WITH_LIBCORE */
 
+static be_module_list_entry_t *isa_ifs = NULL;
+
+void be_register_isa_if(const char *name, const arch_isa_if_t *isa)
+{
+       if(isa_if == NULL)
+               isa_if = isa;
+
+       be_add_module_to_list(&isa_ifs, name, (void*) isa);
+}
+
 void be_opt_register(void)
 {
 #ifdef WITH_LIBCORE
@@ -192,6 +176,9 @@ void be_opt_register(void)
 
        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 /* WITH_LIBCORE */
 }
 
@@ -546,7 +533,6 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                edges_activate(irg);
 
                /* Compute loop nesting information (for weighting copies) */
-               construct_cf_backedges(irg);
                dump(DUMP_PREPARED, irg, "-prepared", dump_ir_block_graph);
                BE_TIMER_ONLY(num_nodes_r = get_num_reachable_nodes(irg));
 
@@ -626,7 +612,7 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 
                /* Do register allocation */
                BE_TIMER_PUSH(t_regalloc);
-               //ra_timer = ra->allocate(birg);
+               be_allocate_registers(birg);
                BE_TIMER_POP(t_regalloc);
 
 #ifdef FIRM_STATISTICS
@@ -651,6 +637,8 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                be_abi_fix_stack_bias(birg->abi);
                BE_TIMER_POP(t_abi);
 
+               dump(DUMP_SCHED, irg, "-fix_stack_after_ra", dump_ir_block_graph_sched);
+
                BE_TIMER_PUSH(t_finish);
                arch_code_generator_finish(birg->cg);
                BE_TIMER_POP(t_finish);