Fixed register allocation for fp != sp

[libfirm] / ir / be / bemain.c

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index ce88671..1730dbf 100644 (file)
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -31,6 +31,9 @@
 #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 "benumb_t.h"
@@ -53,12 +56,12 @@
 #include "beabi.h"
 #include "belower.h"
 
-#define DUMP_INITIAL           (1 << 0)
-#define DUMP_ABI               (1 << 1)
-#define DUMP_SCHED                     (1 << 2)
-#define DUMP_PREPARED          (1 << 3)
-#define DUMP_RA                                (1 << 4)
-#define DUMP_FINAL                     (1 << 5)
+#define DUMP_INITIAL    (1 << 0)
+#define DUMP_ABI        (1 << 1)
+#define DUMP_SCHED      (1 << 2)
+#define DUMP_PREPARED   (1 << 3)
+#define DUMP_RA         (1 << 4)
+#define DUMP_FINAL      (1 << 5)
 
 /* options visible for anyone */
 static be_options_t be_options = {
@@ -105,6 +108,9 @@ static const lc_opt_enum_const_ptr_items_t ra_items[] = {
 static const lc_opt_enum_const_ptr_items_t isa_items[] = {
        { "firm",    &firm_isa },
        { "ia32",    &ia32_isa_if },
+       { "arm",     &arm_isa_if },
+       { "ppc32",   &ppc32_isa_if },
+       { "mips",    &mips_isa_if },
        { NULL,      NULL }
 };
 
@@ -124,6 +130,7 @@ static const lc_opt_table_entry_t be_main_options[] = {
        LC_OPT_ENT_ENUM_MASK("dump", "dump irg on several occasions", &dump_var),
        LC_OPT_ENT_ENUM_PTR("ra", "register allocator", &ra_var),
        LC_OPT_ENT_ENUM_PTR("isa", "the instruction set architecture", &isa_var),
+       LC_OPT_ENT_BOOL("omitfp", "omit frame pointer", &be_omit_fp),
 
 #ifdef WITH_ILP
        LC_OPT_ENT_STR ("ilp.server", "the ilp server name", be_options.ilp_server, sizeof(be_options.ilp_server)),
@@ -139,23 +146,34 @@ void be_opt_register(void)
 #ifdef WITH_LIBCORE
        int i;
        lc_opt_entry_t *be_grp_ra;
-
-       be_grp_root = lc_opt_get_grp(firm_opt_get_root(), "be");
-       be_grp_ra   = lc_opt_get_grp(be_grp_root, "ra");
-
-       lc_opt_add_table(be_grp_root, be_main_options);
-
-       /* register allocator options */
-       for(i = 0; ra_items[i].name != NULL; ++i) {
-               const be_ra_t *ra = ra_items[i].value;
-               ra->register_options(be_grp_ra);
+       static int run_once = 0;
+
+       if (! run_once) {
+               run_once    = 1;
+               be_grp_root = lc_opt_get_grp(firm_opt_get_root(), "be");
+               be_grp_ra   = lc_opt_get_grp(be_grp_root, "ra");
+
+               lc_opt_add_table(be_grp_root, be_main_options);
+
+               /* register allocator options */
+               for(i = 0; ra_items[i].name != NULL; ++i) {
+                       const be_ra_t *ra = ra_items[i].value;
+                       ra->register_options(be_grp_ra);
+               }
+
+               /* register isa options */
+               for(i = 0; isa_items[i].name != NULL; ++i) {
+                       const arch_isa_if_t *isa = isa_items[i].value;
+                       isa->register_options(be_grp_root);
+               }
        }
+#endif /* WITH_LIBCORE */
+}
 
-       /* register isa options */
-       for(i = 0; isa_items[i].name != NULL; ++i) {
-               const arch_isa_if_t *isa = isa_items[i].value;
-               isa->register_options(be_grp_root);
-       }
+/* Parse one argument. */
+int be_parse_arg(const char *arg) {
+#ifdef WITH_LIBCORE
+       return lc_opt_from_single_arg(be_grp_root, NULL, arg, NULL);
 #endif /* WITH_LIBCORE */
 }
 
@@ -172,15 +190,15 @@ void be_init(void)
        phi_class_init();
 }
 
-static be_main_env_t *be_init_env(be_main_env_t *env)
+static be_main_env_t *be_init_env(be_main_env_t *env, FILE *file_handle)
 {
        memset(env, 0, sizeof(*env));
        obstack_init(&env->obst);
-       env->dbg      = firm_dbg_register("be.main");
        env->arch_env = obstack_alloc(&env->obst, sizeof(env->arch_env[0]));
        env->options  = &be_options;
+       FIRM_DBG_REGISTER(env->dbg, "be.main");
 
-       arch_env_init(env->arch_env, isa_if);
+       arch_env_init(env->arch_env, isa_if, file_handle);
 
        /* Register the irn handler of the architecture */
        if (arch_isa_get_irn_handler(env->arch_env->isa))
@@ -206,7 +224,7 @@ static void be_done_env(be_main_env_t *env)
 }
 
 static void dump(int mask, ir_graph *irg, const char *suffix,
-                                void (*dumper)(ir_graph *, const char *))
+                 void (*dumper)(ir_graph *, const char *))
 {
        if(dump_flags & mask)
                be_dump(irg, suffix, dumper);
@@ -253,12 +271,12 @@ static void be_main_loop(FILE *file_handle)
        arch_isa_t *isa;
        be_main_env_t env;
 
-       be_init_env(&env);
+       be_init_env(&env, file_handle);
 
        isa = arch_env_get_isa(env.arch_env);
 
        /* For all graphs */
-       for(i = 0, n = get_irp_n_irgs(); i < n; ++i) {
+       for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
                ir_graph *irg = get_irp_irg(i);
                const arch_code_generator_if_t *cg_if;
                be_irg_t birg;
@@ -276,7 +294,7 @@ static void be_main_loop(FILE *file_handle)
                cg_if = isa->impl->get_code_generator_if(isa);
 
                /* get a code generator for this graph. */
-               birg.cg = cg_if->init(file_handle, &birg);
+               birg.cg = cg_if->init(&birg);
 
                /* create the code generator and generate code. */
                prepare_graph(&birg);
@@ -297,7 +315,7 @@ static void be_main_loop(FILE *file_handle)
                 * Note that this requires disabling the edges here.
                 */
                edges_deactivate(irg);
-               dead_node_elimination(irg);
+               //dead_node_elimination(irg);
                edges_activate(irg);
 
                /* Compute loop nesting information (for weighting copies) */
@@ -306,7 +324,7 @@ static void be_main_loop(FILE *file_handle)
                dump(DUMP_PREPARED, irg, "-prepared", dump_ir_block_graph);
 
                /* add Keeps for should_be_different constrained nodes */
-               // assure_constraints(&birg);
+               assure_constraints(&birg);
                dump(DUMP_PREPARED, irg, "-assured", dump_ir_block_graph);
 
                /* Schedule the graphs. */
@@ -331,6 +349,8 @@ static void be_main_loop(FILE *file_handle)
                arch_code_generator_done(birg.cg);
                dump(DUMP_FINAL, irg, "-end", dump_ir_block_graph_sched);
                be_abi_free(birg.abi);
+
+//             free_ir_graph(irg);
        }
 
        be_done_env(&env);