fixed some minor bugs

[libfirm] / ir / be / bemain.c

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index 7f873ba..17b486d 100644 (file)
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -46,11 +46,11 @@
 #include "bechordal_t.h"
 #include "beifg.h"
 #include "beifg_impl.h"
-#include "becopyoptmain.h"
+#include "becopyopt.h"
 #include "becopystat.h"
 #include "bessadestr.h"
 #include "beabi.h"
-
+#include "belower.h"
 
 #define DUMP_INITIAL           (1 << 0)
 #define DUMP_ABI               (1 << 1)
@@ -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 }
 };
 
@@ -171,9 +173,7 @@ void be_init(void)
 
 static be_main_env_t *be_init_env(be_main_env_t *env)
 {
-       int i, j, n;
-
-  memset(env, 0, sizeof(*env));
+       memset(env, 0, sizeof(*env));
        obstack_init(&env->obst);
        env->dbg = firm_dbg_register("be.main");
 
@@ -182,42 +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);
-
-       /*
-       * Create the list of caller save registers.
-       */
-       for(i = 0, n = arch_isa_get_n_reg_class(env->arch_env->isa); i < n; ++i) {
-               const arch_register_class_t *cls = arch_isa_get_reg_class(env->arch_env->isa, i);
-               for(j = 0; j < cls->n_regs; ++j) {
-                       const arch_register_t *reg = arch_register_for_index(cls, j);
-                       if(arch_register_type_is(reg, caller_save))
-                               obstack_ptr_grow(&env->obst, reg);
-               }
-       }
-       obstack_ptr_grow(&env->obst, NULL);
-       env->caller_save = obstack_finish(&env->obst);
-
-       /*
-       * Create the list of callee save registers.
-       */
-       for(i = 0, n = arch_isa_get_n_reg_class(env->arch_env->isa); i < n; ++i) {
-               const arch_register_class_t *cls = arch_isa_get_reg_class(env->arch_env->isa, i);
-               for(j = 0; j < cls->n_regs; ++j) {
-                       const arch_register_t *reg = arch_register_for_index(cls, j);
-                       if(arch_register_type_is(reg, callee_save))
-                               obstack_ptr_grow(&env->obst, reg);
-               }
-       }
-       obstack_ptr_grow(&env->obst, NULL);
-       env->callee_save = obstack_finish(&env->obst);
+       arch_env_push_irn_handler(env->arch_env, &be_node_irn_handler);
 
        return env;
 }
@@ -242,6 +214,9 @@ static void prepare_graph(be_irg_t *birg)
        /* Normalize proj nodes. */
        normalize_proj_nodes(irg);
 
+       /* Make just one return node. */
+       // normalize_one_return(irg);
+
        /* Remove critical edges */
        remove_critical_cf_edges(irg);
 
@@ -252,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);
 
@@ -290,11 +261,14 @@ 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.irg, env.arch_env);
+               birg.cg = cg_if->init(file_handle, &birg);
 
                /* create the code generator and generate code. */
                prepare_graph(&birg);
 
+               /* some transformations need to be done before abi introduce */
+               arch_code_generator_before_abi(birg.cg);
+
                /* implement the ABI conventions. */
                birg.abi = be_abi_introduce(&birg);
                dump(DUMP_ABI, irg, "-abi", dump_ir_block_graph);
@@ -311,16 +285,21 @@ 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);
 
+               /* add Keeps for should_be_different constrained nodes */
+               assure_constraints(&birg);
+
                /* Schedule the graphs. */
                arch_code_generator_before_sched(birg.cg);
-               list_sched(isa, irg);
-
-               dump(DUMP_SCHED, irg, "-sched", dump_ir_block_graph_sched);
+               list_sched(env.arch_env, irg);
 
                /* connect all stack modifying nodes together (see beabi.c) */
-               // be_abi_fix_stack(birg.abi);
+               be_abi_fix_stack_nodes(birg.abi);
+               dump(DUMP_SCHED, irg, "-sched", dump_ir_block_graph_sched);
 
                /* Verify the schedule */
                sched_verify_irg(irg);
@@ -328,11 +307,14 @@ static void be_main_loop(FILE *file_handle)
                /* Do register allocation */
                arch_code_generator_before_ra(birg.cg);
                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);
                dump(DUMP_FINAL, irg, "-end", dump_ir_block_graph_sched);
+               be_abi_free(birg.abi);
        }
 
        be_done_env(&env);