X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_main.c;h=1d514fdd448cad47835a9fb1c7a21a7fdec841a6;hb=4cedd3bc8f85d75971bdd1fe6606f37c951babfb;hp=61c981abe7c0b1d4399178e643924b079cf06e38;hpb=41714aaa5485ebc1f8b8a8b031781c5ecc986032;p=libfirm

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index 61c981abe..1d514fdd4 100644
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.c
@@ -235,7 +235,7 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
 	compute_doms(irg);
 
 	chordal_env.irg          = irg;
-	chordal_env.dbg          = firm_dbg_register("be.chordal");
+	chordal_env.dbg          = firm_dbg_register("firm.be.chordal");
 	chordal_env.main_env     = main_env;
 	chordal_env.dom_front    = be_compute_dominance_frontiers(irg);
 
@@ -243,10 +243,12 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
 
 	/* Perform the following for each register class. */
 	for(j = 0, m = arch_isa_get_n_reg_class(isa); j < m; ++j) {
+		chordal_env.cls          = arch_isa_get_reg_class(isa, j);
 		chordal_env.border_heads = pmap_create();
-		chordal_env.cls = arch_isa_get_reg_class(isa, j);
+		chordal_env.constr_irn   = pset_new_ptr(32);
 
 		be_liveness(irg);
+		dump(BE_CH_DUMP_LIVE, irg, chordal_env.cls, "-live", dump_ir_block_graph_sched);
 
 		/* spilling */
 		switch(options.spill_method) {
@@ -264,12 +266,13 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
 		be_liveness(irg);
 		be_check_pressure(&chordal_env);
 
+#if 0
 		/* Insert perms before reg-constrained instructions */
 		be_insert_constr_perms(&chordal_env);
 		dump(BE_CH_DUMP_CONSTR, irg, chordal_env.cls, "-constr", dump_ir_block_graph_sched);
+#endif
 
 		be_liveness(irg);
-		be_numbering(irg);
 		be_check_pressure(&chordal_env);
 
 		/* Color the graph. */
@@ -295,17 +298,17 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
 		copystat_dump(irg);
 
 		be_ifg_free(chordal_env.ifg);
-		be_numbering_done(irg);
 
 		pmap_destroy(chordal_env.border_heads);
+		del_pset(chordal_env.constr_irn);
 	}
 
 	be_compute_spill_offsets(&chordal_env);
 
 	dump(BE_CH_DUMP_LOWER, irg, NULL, "-spilloff", dump_ir_block_graph_sched);
 
-	lower_nodes(&chordal_env, options.lower_perm_method == BE_CH_LOWER_PERM_COPY ? 1 : 0);
-	dump(BE_CH_DUMP_LOWER, irg, NULL, "-belower", dump_ir_block_graph_sched);
+	lower_nodes_after_ra(&chordal_env, options.lower_perm_method == BE_CH_LOWER_PERM_COPY ? 1 : 0);
+	dump(BE_CH_DUMP_LOWER, irg, NULL, "-belower-after-ra", dump_ir_block_graph_sched);
 
 	be_free_dominance_frontiers(chordal_env.dom_front);
 	obstack_free(&chordal_env.obst, NULL);