X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbemain.c;h=30ce5c1db35a0397d6e9becb58ec5e2122f9c945;hb=c0c19ea2c6ecb81353ffa725418e088554f85684;hp=bbf888b749531d5ea48b6881b3be699faa5e266a;hpb=068a58281f8951feaf3866c4b9659dc09b08ed41;p=libfirm

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index bbf888b74..30ce5c1db 100644
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -26,6 +26,7 @@
 #include "iredges_t.h"
 #include "irloop_t.h"
 #include "irtools.h"
+#include "return.h"
 
 #include "bearch.h"
 #include "firm/bearch_firm.h"
@@ -50,7 +51,7 @@
 #include "becopystat.h"
 #include "bessadestr.h"
 #include "beabi.h"
-
+#include "belower.h"
 
 #define DUMP_INITIAL		(1 << 0)
 #define DUMP_ABI    		(1 << 1)
@@ -60,7 +61,7 @@
 #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",
 
@@ -175,21 +176,24 @@ 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->dbg      = firm_dbg_register("be.main");
 	env->arch_env = obstack_alloc(&env->obst, sizeof(env->arch_env[0]));
+	env->options  = &be_options;
+
 	arch_env_init(env->arch_env, isa_if);
 
 	/* Register the irn handler of the architecture */
 	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);
+	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 +201,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);
 }
 
@@ -204,9 +209,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;
@@ -215,7 +223,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);
@@ -230,8 +238,15 @@ 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);
 }
 
+/**
+ * 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 +281,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 +293,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 +305,13 @@ 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);
@@ -303,6 +325,7 @@ static void be_main_loop(FILE *file_handle)
 		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);
@@ -316,7 +339,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);