X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_main.c;h=0e5df3e6331acaf8dd538839e61ab7b3a14fe820;hb=6e3e499d6c68aee0c6a9ada6a99f16c4f6f8445b;hp=98812caeff61ef08b0cb78d1bbb5e7f8171c16a1;hpb=646d941217399e4bc713359fd5ad393e4db8b905;p=libfirm

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index 98812caef..0e5df3e63 100644
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.c
@@ -240,11 +240,11 @@ static void dump(unsigned mask, ir_graph *irg,
 		if(cls) {
 			char buf[256];
 			snprintf(buf, sizeof(buf), "-%s%s", cls->name, suffix);
-			dump_func(irg, buf);
+			be_dump(irg, buf, dump_func);
 		}
 
 		else
-			dump_func(irg, suffix);
+			be_dump(irg, suffix, dump_func);
 	}
 }
 
@@ -260,9 +260,9 @@ static void be_ra_chordal_main(const be_irg_t *bi)
 
 	chordal_env.opts         = &options;
 	chordal_env.irg          = irg;
-	chordal_env.dbg          = firm_dbg_register("firm.be.chordal");
-	chordal_env.birg		 = bi;
+	chordal_env.birg         = bi;
 	chordal_env.dom_front    = be_compute_dominance_frontiers(irg);
+	FIRM_DBG_REGISTER(chordal_env.dbg, "firm.be.chordal");
 
 	obstack_init(&chordal_env.obst);
 
@@ -292,9 +292,6 @@ static void be_ra_chordal_main(const be_irg_t *bi)
 		be_liveness(irg);
 		be_check_pressure(&chordal_env);
 
-		be_liveness(irg);
-		be_check_pressure(&chordal_env);
-
 		/* Color the graph. */
 		be_ra_chordal_color(&chordal_env);
 		dump(BE_CH_DUMP_CONSTR, irg, chordal_env.cls, "-color", dump_ir_block_graph_sched);
@@ -304,13 +301,14 @@ static void be_ra_chordal_main(const be_irg_t *bi)
 		be_ifg_check(chordal_env.ifg);
 
 		/* copy minimization */
-		copystat_collect_cls(&chordal_env);
 #ifdef COPYOPT_STAT
 		co_compare_solvers(&chordal_env);
 #else
 		{
 		copy_opt_t *co = new_copy_opt(&chordal_env, co_get_costs_loop_depth);
+		co_build_ou_structure(co);
 		co_solve_heuristic(co);
+		co_free_ou_structure(co);
 		free_copy_opt(co);
 		}
 #endif
@@ -321,7 +319,7 @@ static void be_ra_chordal_main(const be_irg_t *bi)
 		be_ssa_destruction(&chordal_env);
 		dump(BE_CH_DUMP_SSADESTR, irg, chordal_env.cls, "-ssadestr", dump_ir_block_graph_sched);
 		be_ssa_destruction_check(&chordal_env);
-//		be_ra_chordal_check(&chordal_env);
+		be_ra_chordal_check(&chordal_env);
 
 		copystat_dump(irg);