X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbemain.c;h=17b486d60b694c832d91a73eb6b01230c2d4afa9;hb=7438ae082c9ec7658ccd006b40aa62084aedca2d;hp=d9c0e0dc6bc97f0df1ee39666d1b388498c9ec64;hpb=5e1f95efc1491481487ba22482422b6d6f42bcdb;p=libfirm

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index d9c0e0dc6..17b486d60 100644
--- 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)
@@ -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 }
 };
 
@@ -180,14 +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);
+	arch_env_push_irn_handler(env->arch_env, &be_node_irn_handler);
 
 	return env;
 }
@@ -225,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);
 
@@ -268,6 +266,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);
@@ -284,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_nodes(birg.abi);
+		dump(DUMP_SCHED, irg, "-sched", dump_ir_block_graph_sched);
 
 		/* Verify the schedule */
 		sched_verify_irg(irg);
@@ -303,6 +309,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);