fixed typedef

[libfirm] / ir / be / bechordal_main.c

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index 2b71f86..21d7a5a 100644 (file)
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.c
@@ -236,7 +236,7 @@ static lc_opt_enum_int_var_t dump_var = {
 
 static const lc_opt_table_entry_t be_chordal_options[] = {
        LC_OPT_ENT_ENUM_MASK("spill", "spill method (belady or ilp)", &spill_var),
-       LC_OPT_ENT_ENUM_PTR("copymin", "copymin method (none, heur1, heur2, ilp1 or ilp2)", &copymin_var),
+       LC_OPT_ENT_ENUM_PTR("copymin", "copymin method (none, heur1, heur2, ilp1, ilp2 or stat)", &copymin_var),
        LC_OPT_ENT_ENUM_PTR("ifg", "interference graph flavour (std or fast)", &ifg_flavor_var),
        LC_OPT_ENT_ENUM_MASK("perm", "perm lowering options (copy or swap)", &lower_perm_var),
        LC_OPT_ENT_ENUM_MASK("dump", "select dump phases", &dump_var),
@@ -286,12 +286,20 @@ static void put_ignore_colors(be_chordal_env_t *chordal_env)
                        bitset_set(chordal_env->ignore_colors, i);
 }
 
+FILE *be_chordal_open(const be_chordal_env_t *env, const char *prefix, const char *suffix)
+{
+       char buf[1024];
+
+       ir_snprintf(buf, sizeof(buf), "%s%F_%s.%s", prefix, env->irg, env->cls->name, suffix);
+       return fopen(buf, "wt");
+}
+
 static void be_ra_chordal_main(const be_irg_t *bi)
 {
        const be_main_env_t *main_env = bi->main_env;
        const arch_isa_t    *isa      = arch_env_get_isa(main_env->arch_env);
        ir_graph            *irg      = bi->irg;
-       copy_opt_t          *co       = NULL;
+       copy_opt_t          *co;
 
        int j, m;
        be_chordal_env_t chordal_env;
@@ -333,6 +341,7 @@ static void be_ra_chordal_main(const be_irg_t *bi)
                        be_spill_belady(&chordal_env);
                }
                dump(BE_CH_DUMP_SPILL, irg, chordal_env.cls, "-spill", dump_ir_block_graph_sched);
+               be_abi_fix_stack_nodes(bi->abi);
                be_liveness(irg);
                be_check_pressure(&chordal_env);
 
@@ -345,6 +354,7 @@ static void be_ra_chordal_main(const be_irg_t *bi)
                be_ifg_check(chordal_env.ifg);
 
                /* copy minimization */
+               co = NULL;
                if (options.copymin_method != BE_CH_COPYMIN_NONE && options.copymin_method != BE_CH_COPYMIN_STAT) {
                        co = new_copy_opt(&chordal_env, co_get_costs_loop_depth);
                        co_build_ou_structure(co);
@@ -355,7 +365,9 @@ static void be_ra_chordal_main(const be_irg_t *bi)
                                co_solve_heuristic(co);
                                break;
                        case BE_CH_COPYMIN_HEUR2:
+                               co_build_graph_structure(co);
                                co_solve_heuristic_new(co);
+                               co_free_graph_structure(co);
                                break;
                        case BE_CH_COPYMIN_STAT:
                                co_compare_solvers(&chordal_env);