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

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index ef5de13c6..17b486d60 100644
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -46,17 +46,18 @@
 #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_SCHED			(1 << 1)
-#define DUMP_PREPARED		(1 << 2)
-#define DUMP_RA				(1 << 3)
-#define DUMP_FINAL			(1 << 4)
+#define DUMP_ABI    		(1 << 1)
+#define DUMP_SCHED			(1 << 2)
+#define DUMP_PREPARED		(1 << 3)
+#define DUMP_RA				(1 << 4)
+#define DUMP_FINAL			(1 << 5)
 
 /* options visible for anyone */
 be_options_t be_options = {
@@ -68,14 +69,13 @@ be_options_t be_options = {
 };
 
 /* dump flags */
-static unsigned dump_flags = DUMP_INITIAL | DUMP_SCHED | DUMP_PREPARED | DUMP_RA | DUMP_FINAL;
+static unsigned dump_flags = 2 * DUMP_FINAL - 1;
 
 /* register allocator to use. */
 static const be_ra_t *ra = &be_ra_chordal_allocator;
 
 /* back end instruction set architecture to use */
 static const arch_isa_if_t *isa_if = &ia32_isa_if;
-
 #ifdef WITH_LIBCORE
 
 static lc_opt_entry_t *be_grp_root = NULL;
@@ -84,6 +84,7 @@ static lc_opt_entry_t *be_grp_root = NULL;
 static const lc_opt_enum_mask_items_t dump_items[] = {
 	{ "none",       0 },
 	{ "initial",    DUMP_INITIAL },
+	{ "abi",        DUMP_ABI    },
 	{ "sched",      DUMP_SCHED  },
 	{ "prepared",   DUMP_PREPARED },
 	{ "regalloc",   DUMP_RA },
@@ -123,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 }
 };
 
@@ -170,8 +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));
 	obstack_init(&env->obst);
 	env->dbg = firm_dbg_register("be.main");
 
@@ -180,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;
 }
@@ -240,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);
 
@@ -250,15 +227,9 @@ 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);
 
-	/* compute the dominance frontiers. */
-	birg->dom_front = be_compute_dominance_frontiers(irg);
 }
 
 static void be_main_loop(FILE *file_handle)
@@ -290,14 +261,19 @@ 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);
+		birg.abi = be_abi_introduce(&birg);
+		dump(DUMP_ABI, irg, "-abi", dump_ir_block_graph);
 
+		/* generate code */
 		arch_code_generator_prepare_graph(birg.cg);
 
 		/*
@@ -309,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);
@@ -326,13 +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_free_dominance_frontiers(birg.dom_front);
+		be_abi_free(birg.abi);
 	}
 
 	be_done_env(&env);
@@ -340,6 +322,9 @@ 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);
+
 	be_node_init();
 	be_main_loop(file_handle);
 }