config.h added

[libfirm] / ir / be / bemain.c

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index 7f873ba..41ca350 100644 (file)
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -30,6 +30,7 @@
 #include "bearch.h"
 #include "firm/bearch_firm.h"
 #include "ia32/bearch_ia32.h"
+#include "TEMPLATE/bearch_TEMPLATE.h"
 
 #include "be_t.h"
 #include "benumb_t.h"
@@ -46,7 +47,7 @@
 #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"
@@ -104,6 +105,7 @@ 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 },
+       { "TEMPLATE",&TEMPLATE_isa_if },
        { NULL,      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");
 
@@ -191,34 +191,6 @@ static be_main_env_t *be_init_env(be_main_env_t *env)
        */
        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);
-
        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,7 +261,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.irg, env.arch_env);
+               birg.cg = cg_if->init(file_handle, &birg);
 
                /* create the code generator and generate code. */
                prepare_graph(&birg);
@@ -311,6 +282,9 @@ 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);
 
                /* Schedule the graphs. */
@@ -320,7 +294,7 @@ static void be_main_loop(FILE *file_handle)
                dump(DUMP_SCHED, irg, "-sched", dump_ir_block_graph_sched);
 
                /* connect all stack modifying nodes together (see beabi.c) */
-               // be_abi_fix_stack(birg.abi);
+               be_abi_fix_stack_nodes(birg.abi);
 
                /* Verify the schedule */
                sched_verify_irg(irg);
@@ -328,11 +302,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);
 
+               /* This is not ready yet: */
+               /* 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);