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

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index 8e9af0997..a0e0e584d 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"
@@ -27,32 +27,35 @@
 #include "irloop_t.h"
 #include "irtools.h"
 
+#include "bearch.h"
+#include "firm/bearch_firm.h"
+#include "ia32/bearch_ia32.h"
+
 #include "be_t.h"
-#include "bechordal_t.h"
-#include "bera.h"
-#include "beifg.h"
-#include "beifg_impl.h"
 #include "benumb_t.h"
+#include "beutil.h"
+#include "benode_t.h"
+#include "beirgmod.h"
 #include "besched_t.h"
 #include "belistsched.h"
 #include "belive_t.h"
-#include "beutil.h"
-#include "bechordal.h"
-#include "bearch.h"
+#include "bespillilp.h"
+#include "bespillbelady.h"
+#include "bera.h"
+#include "beraextern.h"
+#include "bechordal_t.h"
+#include "beifg.h"
+#include "beifg_impl.h"
 #include "becopyoptmain.h"
 #include "becopystat.h"
 #include "bessadestr.h"
-#include "benode_t.h"
-#include "beirgmod.h"
-#include "bespillilp.h"
-#include "bespillbelady.h"
 
-#include "firm/bearch_firm.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,13 +67,13 @@ 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;
 
 /* back end instruction set architecture to use */
-static const arch_isa_if_t *isa_if = &firm_isa;
+static const arch_isa_if_t *isa_if = &ia32_isa_if;
 
 #ifdef WITH_LIBCORE
 
@@ -82,6 +85,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 }
@@ -90,12 +94,14 @@ static const lc_opt_enum_mask_items_t dump_items[] = {
 /* register allocators */
 static const lc_opt_enum_const_ptr_items_t ra_items[] = {
 	{ "chordal", &be_ra_chordal_allocator },
+	{ "external", &be_ra_external_allocator },
 	{ NULL,      NULL }
 };
 
 /* instruction set architectures. */
 static const lc_opt_enum_const_ptr_items_t isa_items[] = {
 	{ "firm",    &firm_isa },
+	{ "ia32",    &ia32_isa_if },
 	{ NULL,      NULL }
 };
 
@@ -112,30 +118,32 @@ 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)
 {
 #ifdef WITH_LIBCORE
 	int i;
+	lc_opt_entry_t *be_grp_ra;
 
 	be_grp_root = lc_opt_get_grp(firm_opt_get_root(), "be");
+	be_grp_ra   = lc_opt_get_grp(be_grp_root, "ra");
 
 	lc_opt_add_table(be_grp_root, be_main_options);
 
-	/* register register allocator options */
+	/* register allocator options */
 	for(i = 0; ra_items[i].name != NULL; ++i) {
 		const be_ra_t *ra = ra_items[i].value;
-		ra->register_options(be_grp_root);
+		ra->register_options(be_grp_ra);
 	}
 
 	/* register isa options */
@@ -143,7 +151,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 */
 }
 
 
@@ -176,9 +184,7 @@ static be_main_env_t *be_init_env(be_main_env_t *env)
    * This irn handler takes care of the platform independent
    * spill, reload and perm nodes.
    */
-  env->node_factory = obstack_alloc(&env->obst, sizeof(*env->node_factory));
-  be_node_factory_init(env->node_factory, env->arch_env->isa);
-  arch_env_add_irn_handler(env->arch_env, be_node_get_irn_handler(env->node_factory));
+  arch_env_add_irn_handler(env->arch_env, &be_node_irn_handler);
 
   return env;
 }
@@ -205,7 +211,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 +224,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;
@@ -232,7 +238,7 @@ static void be_main_loop(void)
 	for(i = 0, n = get_irp_n_irgs(); i < n; ++i) {
 		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,12 +246,15 @@ 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_if(isa);
+
 		/* get a code generator for this graph. */
-		cg = arch_isa_make_code_generator(isa, irg);
+		env.cg = cg_if->init(file_handle, irg, env.arch_env);
 
 		/* create the code generator and generate code. */
 		prepare_graph(&env, irg);
-		arch_code_generator_prepare_graph(cg);
+		arch_code_generator_prepare_graph(env.cg);
 
 		edges_deactivate(irg);
 		dead_node_elimination(irg);
@@ -254,7 +263,7 @@ static void be_main_loop(void)
 		dump(DUMP_PREPARED, irg, "-prepared", dump_ir_block_graph);
 
 		/* Schedule the graphs. */
-		arch_code_generator_before_sched(cg);
+		arch_code_generator_before_sched(env.cg);
 		list_sched(isa, irg);
 
 		dump(DUMP_SCHED, irg, "-sched", dump_ir_block_graph_sched);
@@ -263,17 +272,20 @@ static void be_main_loop(void)
 		sched_verify_irg(irg);
 
 		/* Do register allocation */
-		arch_code_generator_before_ra(cg);
+		arch_code_generator_before_ra(env.cg);
 		ra->allocate(&env, irg);
 
-		arch_code_generator_done(cg);
+		dump(DUMP_RA, irg, "-ra", dump_ir_block_graph_sched);
+
+		arch_code_generator_done(env.cg);
 		dump(DUMP_FINAL, irg, "-end", dump_ir_block_graph_sched);
 	}
 
 	be_done_env(&env);
 }
 
-void be_main(int argc, const char *argv[])
+void be_main(FILE *file_handle)
 {
-  be_main_loop();
+	be_node_init();
+	be_main_loop(file_handle);
 }