replaced malloc by xmalloc

[libfirm] / ir / be / bemain.c

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index bba2b16..54aee99 100644 (file)
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -50,7 +50,7 @@
 #include "becopystat.h"
 #include "bessadestr.h"
 #include "beabi.h"
-
+#include "belower.h"
 
 #define DUMP_INITIAL           (1 << 0)
 #define DUMP_ABI               (1 << 1)
@@ -184,11 +184,11 @@ static be_main_env_t *be_init_env(be_main_env_t *env)
        if (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.
-       */
+       /*
+        * 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_push_irn_handler(env->arch_env, &be_node_irn_handler);
 
        return env;
@@ -204,9 +204,12 @@ static void dump(int mask, ir_graph *irg, const char *suffix,
                                 void (*dumper)(ir_graph *, const char *))
 {
        if(dump_flags & mask)
-               dumper(irg, suffix);
+               be_dump(irg, suffix, dumper);
 }
 
+/**
+ * Prepare a backend graph for code generation.
+ */
 static void prepare_graph(be_irg_t *birg)
 {
        ir_graph *irg = birg->irg;
@@ -229,9 +232,13 @@ static void prepare_graph(be_irg_t *birg)
 
        /* check, if the dominance property is fulfilled. */
        be_check_dominance(irg);
-
 }
 
+/**
+ * The Firm backend main loop.
+ * Do architecture specific lowering for all graphs
+ * and call the architecture specific code generator.
+ */
 static void be_main_loop(FILE *file_handle)
 {
        int i, n;
@@ -266,6 +273,9 @@ static void be_main_loop(FILE *file_handle)
                /* 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);
@@ -275,7 +285,7 @@ static void be_main_loop(FILE *file_handle)
 
                /*
                 * Since the code generator made a lot of new nodes and skipped
-                * a lot of old ones, we should do dead node elim here.
+                * a lot of old ones, we should do dead node elimination here.
                 * Note that this requires disabling the edges here.
                 */
                edges_deactivate(irg);
@@ -287,9 +297,14 @@ 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);
+
+               dump(DUMP_PREPARED, irg, "-assured", dump_ir_block_graph);
+
                /* Schedule the graphs. */
                arch_code_generator_before_sched(birg.cg);
-               list_sched(isa, irg);
+               list_sched(env.arch_env, irg);
 
                /* connect all stack modifying nodes together (see beabi.c) */
                be_abi_fix_stack_nodes(birg.abi);
@@ -317,7 +332,7 @@ static void be_main_loop(FILE *file_handle)
 void be_main(FILE *file_handle)
 {
        /* never build code for pseudo irgs */
-       set_visit_pseudo_irgs(0);
+       set_visit_pseudo_irgs(0);
 
        be_node_init();
        be_main_loop(file_handle);