X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbemain.c;h=bc4f54cebc6729c1d25efc9a7bed4626d8c779bf;hb=afaf4a5efe7dd7fafc2a478e0cb0423fc574ef51;hp=8e9af099739f9ca9591829a71a3947cf2700da34;hpb=4c66ebcce62ceffb68a891142dd309429e03351a;p=libfirm

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index 8e9af0997..bc4f54ceb 100644
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -12,7 +12,7 @@
 #ifdef WITH_LIBCORE
 #include <libcore/lc_opts.h>
 #include <libcore/lc_opts_enum.h>
-#endif
+#endif /* WITH_LIBCORE */
 
 #include "obst.h"
 #include "bitset.h"
@@ -48,11 +48,13 @@
 #include "bespillbelady.h"
 
 #include "firm/bearch_firm.h"
+#include "ia32/bearch_ia32.h"
 
 #define DUMP_INITIAL		(1 << 0)
 #define DUMP_SCHED			(1 << 1)
 #define DUMP_PREPARED		(1 << 2)
-#define DUMP_FINAL			(1 << 3)
+#define DUMP_RA				(1 << 3)
+#define DUMP_FINAL			(1 << 4)
 
 /* options visible for anyone */
 be_options_t be_options = {
@@ -64,7 +66,7 @@ be_options_t be_options = {
 };
 
 /* dump flags */
-static unsigned dump_flags = 0;
+static unsigned dump_flags = DUMP_INITIAL | DUMP_SCHED | DUMP_PREPARED | DUMP_RA | DUMP_FINAL;
 
 /* register allocator to use. */
 static const be_ra_t *ra = &be_ra_chordal_allocator;
@@ -82,6 +84,7 @@ static const lc_opt_enum_mask_items_t dump_items[] = {
 	{ "initial",    DUMP_INITIAL },
 	{ "sched",      DUMP_SCHED  },
 	{ "prepared",   DUMP_PREPARED },
+	{ "regalloc",   DUMP_RA },
 	{ "final",      DUMP_FINAL },
 	{ "all",        2 * DUMP_FINAL - 1 },
 	{ NULL,         0 }
@@ -96,6 +99,7 @@ static const lc_opt_enum_const_ptr_items_t ra_items[] = {
 /* instruction set architectures. */
 static const lc_opt_enum_const_ptr_items_t isa_items[] = {
 	{ "firm",    &firm_isa },
+	{ "ia32",    &ia32_isa_if },
 	{ NULL,      NULL }
 };
 
@@ -112,16 +116,16 @@ static lc_opt_enum_const_ptr_var_t isa_var = {
 };
 
 static const lc_opt_table_entry_t be_main_options[] = {
-	LC_OPT_ENT_ENUM_MASK("dump",			"dump irg on several occasions",		&dump_var),
-	LC_OPT_ENT_ENUM_PTR("ra",				"register allocator",								&ra_var),
-	LC_OPT_ENT_ENUM_PTR("isa",			"the instruction set architecture", &isa_var),
+	LC_OPT_ENT_ENUM_MASK("dump", "dump irg on several occasions", &dump_var),
+	LC_OPT_ENT_ENUM_PTR("ra", "register allocator", &ra_var),
+	LC_OPT_ENT_ENUM_PTR("isa", "the instruction set architecture", &isa_var),
 
-	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)),
+	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)),
 	{ NULL }
 };
 
-#endif
+#endif /* WITH_LIBCORE */
 
 void be_opt_register(void)
 {
@@ -143,7 +147,7 @@ void be_opt_register(void)
 		const arch_isa_if_t *isa = isa_items[i].value;
 		isa->register_options(be_grp_root);
 	}
-#endif
+#endif /* WITH_LIBCORE */
 }
 
 
@@ -205,7 +209,7 @@ static void prepare_graph(be_main_env_t *s, ir_graph *irg)
 	remove_critical_cf_edges(irg);
 
 	/* Compute the dominance information. */
-	free_dom_and_peace(irg);
+	free_dom(irg);
 	compute_doms(irg);
 
 	/* Ensure, that the ir_edges are computed. */
@@ -218,7 +222,7 @@ static void prepare_graph(be_main_env_t *s, ir_graph *irg)
 	be_check_dominance(irg);
 }
 
-static void be_main_loop(void)
+static void be_main_loop(FILE *file_handle)
 {
 	int i, n;
 	arch_isa_t *isa;
@@ -233,6 +237,7 @@ static void be_main_loop(void)
 		ir_graph *irg = get_irp_irg(i);
 
 		arch_code_generator_t *cg;
+		const arch_code_generator_if_t *cg_if;
 
 		DBG((env.dbg, LEVEL_2, "====> IRG: %F\n", irg));
 		dump(DUMP_INITIAL, irg, "-begin", dump_ir_block_graph);
@@ -240,8 +245,11 @@ static void be_main_loop(void)
 		/* set the current graph (this is important for several firm functions) */
 		current_ir_graph = irg;
 
+		/* Get the code generator interface. */
+		cg_if = isa->impl->get_code_generator(isa);
+
 		/* get a code generator for this graph. */
-		cg = arch_isa_make_code_generator(isa, irg);
+		cg = cg_if->init(file_handle, irg, env.arch_env);
 
 		/* create the code generator and generate code. */
 		prepare_graph(&env, irg);
@@ -266,6 +274,8 @@ static void be_main_loop(void)
 		arch_code_generator_before_ra(cg);
 		ra->allocate(&env, irg);
 
+		dump(DUMP_RA, irg, "-ra", dump_ir_block_graph_sched);
+
 		arch_code_generator_done(cg);
 		dump(DUMP_FINAL, irg, "-end", dump_ir_block_graph_sched);
 	}
@@ -273,7 +283,7 @@ static void be_main_loop(void)
 	be_done_env(&env);
 }
 
-void be_main(int argc, const char *argv[])
+void be_main(FILE *file_handle)
 {
-  be_main_loop();
+  be_main_loop(file_handle);
 }