fixed addressmode bug

[libfirm] / ir / be / bemain.c

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index d301466..15c8118 100644 (file)
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -26,10 +26,14 @@
 #include "iredges_t.h"
 #include "irloop_t.h"
 #include "irtools.h"
+#include "return.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 "benumb_t.h"
@@ -52,15 +56,15 @@
 #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 */
-be_options_t be_options = {
+static be_options_t be_options = {
        /* ilp server */
        "i44pc52.info.uni-karlsruhe.de",
 
@@ -104,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 },
+       { "ppc",     &ppc32_isa_if },
+       { "mips",    &mips_isa_if },
        { NULL,      NULL }
 };
 
@@ -175,9 +182,10 @@ static be_main_env_t *be_init_env(be_main_env_t *env)
 {
        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);
 
        /* Register the irn handler of the architecture */
@@ -190,6 +198,8 @@ static be_main_env_t *be_init_env(be_main_env_t *env)
         * spill, reload and perm nodes.
         */
        arch_env_push_irn_handler(env->arch_env, &be_node_irn_handler);
+       env->phi_handler = be_phi_handler_new(env->arch_env);
+       arch_env_push_irn_handler(env->arch_env, env->phi_handler);
 
        return env;
 }
@@ -197,6 +207,7 @@ static be_main_env_t *be_init_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);
+       be_phi_handler_free(env->phi_handler);
        obstack_free(&env->obst, NULL);
 }
 
@@ -218,7 +229,7 @@ static void prepare_graph(be_irg_t *birg)
        normalize_proj_nodes(irg);
 
        /* Make just one return node. */
-       // normalize_one_return(irg);
+       normalize_one_return(irg);
 
        /* Remove critical edges */
        remove_critical_cf_edges(irg);
@@ -232,6 +243,9 @@ static void prepare_graph(be_irg_t *birg)
 
        /* check, if the dominance property is fulfilled. */
        be_check_dominance(irg);
+
+       /* reset the phi handler. */
+       be_phi_handler_reset(birg->main_env->phi_handler);
 }
 
 /**
@@ -289,7 +303,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) */
@@ -299,7 +313,6 @@ static void be_main_loop(FILE *file_handle)
 
                /* add Keeps for should_be_different constrained nodes */
                assure_constraints(&birg);
-
                dump(DUMP_PREPARED, irg, "-assured", dump_ir_block_graph);
 
                /* Schedule the graphs. */
@@ -324,11 +337,14 @@ 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);
 }
 
+/* Main interface to the frontend. */
 void be_main(FILE *file_handle)
 {
        /* never build code for pseudo irgs */
@@ -337,3 +353,19 @@ void be_main(FILE *file_handle)
        be_node_init();
        be_main_loop(file_handle);
 }
+
+/** The debug info retriever function. */
+static retrieve_dbg_func retrieve_dbg = NULL;
+
+/* Sets a debug info retriever. */
+void be_set_debug_retrieve(retrieve_dbg_func func) {
+       retrieve_dbg = func;
+}
+
+/* Retrieve the debug info. */
+const char *be_retrieve_dbg_info(const dbg_info *dbg, unsigned *line) {
+       if (retrieve_dbg)
+               return retrieve_dbg(dbg, line);
+       *line = 0;
+       return NULL;
+}