X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Fbemain.c;h=d5cb7aa0e27802edba334b6b77febb7e87bd5720;hb=79b1f6ae0ee6860a7d96b6c5a90944931550039c;hp=ddf438bb6540d9d6d4b9fae7c00d1039fde2b667;hpb=3e32262d83cf529f74aae833c7557557ab39782a;p=libfirm

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index ddf438bb6..d5cb7aa0e 100644
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -70,7 +70,6 @@
 #include "belower.h"
 #include "bestat.h"
 #include "beverify.h"
-#include "be_dbgout.h"
 #include "beirg.h"
 #include "bestack.h"
 #include "beemitter.h"
@@ -78,7 +77,7 @@
 #define NEW_ID(s) new_id_from_chars(s, sizeof(s) - 1)
 
 /* options visible for anyone */
-static be_options_t be_options = {
+be_options_t be_options = {
 	DUMP_NONE,                         /* dump flags */
 	BE_TIME_OFF,                       /* no timing */
 	false,                             /* profile_generate */
@@ -90,6 +89,7 @@ static be_options_t be_options = {
 	"",                                /* ilp solver */
 	0,                                 /* enable statistic event dumping */
 	"",                                /* print stat events */
+	1,                                 /* verbose assembler output */
 };
 
 /* back end instruction set architecture to use */
@@ -135,6 +135,7 @@ static const lc_opt_table_entry_t be_main_options[] = {
 	LC_OPT_ENT_BOOL     ("profileuse",      "use existing profile data",                           &be_options.opt_profile_use),
 	LC_OPT_ENT_BOOL     ("statev",     "dump statistic events",                               &be_options.statev),
 	LC_OPT_ENT_STR      ("filtev",     "filter for stat events (regex if support is active",   be_options.filtev),
+	LC_OPT_ENT_BOOL     ("verboseasm", "enable verbose assembler output",                     &be_options.verbose_asm),
 
 	LC_OPT_ENT_STR("ilp.server", "the ilp server name", be_options.ilp_server),
 	LC_OPT_ENT_STR("ilp.solver", "the ilp solver name", be_options.ilp_solver),
@@ -151,6 +152,15 @@ static void initialize_isa(void)
 	if (isa_initialized)
 		return;
 	isa_if->init();
+	isa_initialized = true;
+}
+
+static void finish_isa(void)
+{
+	if (isa_initialized) {
+		isa_if->finish();
+		isa_initialized = false;
+	}
 }
 
 void be_init_default_asm_constraint_flags(void)
@@ -341,6 +351,7 @@ void firm_be_init(void)
 /* Finalize the Firm backend. */
 void firm_be_finish(void)
 {
+	finish_isa();
 	be_quit_modules();
 }
 
@@ -361,7 +372,6 @@ static be_main_env_t *be_init_env(be_main_env_t *env, FILE *file_handle,
                                   const char *compilation_unit_name)
 {
 	memset(env, 0, sizeof(*env));
-	env->options              = &be_options;
 	env->file_handle          = file_handle;
 	env->ent_trampoline_map   = pmap_create();
 	env->pic_trampolines_type = new_type_class(NEW_ID("$PIC_TRAMPOLINE_TYPE"));
@@ -419,9 +429,10 @@ static void initialize_birg(be_irg_t *birg, ir_graph *irg, be_main_env_t *env)
 	birg->irg = irg;
 	birg->main_env = env;
 	obstack_init(&birg->obst);
+	birg->lv = be_liveness_new(irg);
 
-	edges_deactivate_kind(irg, EDGE_KIND_DEP);
-	edges_activate_kind(irg, EDGE_KIND_DEP);
+	edges_deactivate(irg);
+	edges_activate(irg);
 
 	/* set the current graph (this is important for several firm functions) */
 	current_ir_graph = irg;
@@ -438,7 +449,7 @@ static void initialize_birg(be_irg_t *birg, ir_graph *irg, be_main_env_t *env)
 	remove_bads(irg);
 
 	/* Ensure, that the ir_edges are computed. */
-	edges_assure(irg);
+	assure_edges(irg);
 
 	set_irg_phase_state(irg, phase_backend);
 	be_info_init_irg(irg);
@@ -455,6 +466,7 @@ static const char *get_timer_name(be_timer_id_t id)
 	case T_CODEGEN:        return "codegen";
 	case T_RA_PREPARATION: return "ra_preparation";
 	case T_SCHED:          return "sched";
+	case T_SPLIT:          return "split";
 	case T_CONSTR:         return "constr";
 	case T_FINISH:         return "finish";
 	case T_EMIT:           return "emit";
@@ -509,7 +521,9 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 {
 	static const char suffix[] = ".prof";
 
-	size_t        i, num_birgs;
+	size_t        i;
+	size_t        num_irgs;
+	size_t        num_birgs;
 	be_main_env_t env;
 	char          prof_filename[256];
 	be_irg_t      *birgs;
@@ -532,15 +546,19 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 	arch_env = env.arch_env;
 
 	/* we might need 1 birg more for instrumentation constructor */
-	num_birgs = get_irp_n_irgs();
-	birgs     = ALLOCAN(be_irg_t, num_birgs + 1);
+	num_irgs = get_irp_n_irgs();
+	birgs    = ALLOCAN(be_irg_t, num_irgs + 1);
 
 	be_info_init();
 
 	/* First: initialize all birgs */
-	for (i = 0; i < num_birgs; ++i) {
-		ir_graph *irg = get_irp_irg(i);
-		initialize_birg(&birgs[i], irg, &env);
+	num_birgs = 0;
+	for (i = 0; i < num_irgs; ++i) {
+		ir_graph  *irg    = get_irp_irg(i);
+		ir_entity *entity = get_irg_entity(irg);
+		if (get_entity_linkage(entity) & IR_LINKAGE_NO_CODEGEN)
+			continue;
+		initialize_birg(&birgs[num_birgs++], irg, &env);
 	}
 	arch_env_handle_intrinsics(arch_env);
 
@@ -720,8 +738,8 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 		dump(DUMP_RA, irg, "ra");
 
 		be_timer_push(T_FINISH);
-		if (arch_env->impl->finish != NULL)
-			arch_env->impl->finish(irg);
+		if (arch_env->impl->finish_graph != NULL)
+			arch_env->impl->finish_graph(irg);
 		be_timer_pop(T_FINISH);
 
 		dump(DUMP_FINAL, irg, "finish");