removed firm.ini which should not be here

[libfirm] / ir / be / bechordal_main.c

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index c1d7cdf..f9ab17c 100644 (file)
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.c
@@ -35,6 +35,8 @@
 #include "irdom.h"
 #include "ircons.h"
 #include "irbitset.h"
+#include "irnode.h"
+#include "ircons.h"
 #include "debug.h"
 #include "xmalloc.h"
 #include "execfreq.h"
@@ -54,17 +56,20 @@
 
 #include "bespillbelady.h"
 #include "bespillmorgan.h"
+#include "bespillslots.h"
 #include "belower.h"
 
 #ifdef WITH_ILP
 #include "bespillremat.h"
 #endif /* WITH_ILP */
 
+#include "bejavacoal.h"
 #include "becopystat.h"
 #include "becopyopt.h"
 #include "bessadestr.h"
 #include "beverify.h"
 #include "bespillcost.h"
+#include "benode_t.h"
 
 void be_ra_chordal_check(be_chordal_env_t *chordal_env) {
        const arch_env_t *arch_env = chordal_env->birg->main_env->arch_env;
@@ -238,7 +243,7 @@ static void be_ra_chordal_register_options(lc_opt_entry_t *grp)
        }
 
        co_register_options(chordal_grp);
-       java_coal_register_options(chordal_grp);
+       be_java_coal_register_options(chordal_grp);
 }
 #endif /* WITH_LIBCORE */
 
@@ -430,9 +435,6 @@ static be_ra_timer_t *be_ra_chordal_main(const be_irg_t *bi)
 
        /* Perform the following for each register class. */
        for (j = 0, m = arch_isa_get_n_reg_class(isa); j < m; ++j) {
-               FILE *f;
-               copy_opt_t *co = NULL;
-
                chordal_env.cls           = arch_isa_get_reg_class(isa, j);
                chordal_env.border_heads  = pmap_create();
                chordal_env.ignore_colors = bitset_malloc(chordal_env.cls->n_regs);
@@ -477,7 +479,6 @@ static be_ra_timer_t *be_ra_chordal_main(const be_irg_t *bi)
                    );
 
                dump(BE_CH_DUMP_SPILL, irg, chordal_env.cls, "-spill", dump_ir_block_graph_sched);
-               be_compute_spill_offsets(&chordal_env);
                check_for_memory_operands(&chordal_env);
                be_abi_fix_stack_nodes(bi->abi, chordal_env.lv);
 
@@ -573,6 +574,8 @@ static be_ra_timer_t *be_ra_chordal_main(const be_irg_t *bi)
                bitset_free(chordal_env.ignore_colors);
        }
 
+       be_coalesce_spillslots(&chordal_env);
+
        BE_TIMER_PUSH(ra_timer.t_epilog);
 
        dump(BE_CH_DUMP_LOWER, irg, NULL, "-spilloff", dump_ir_block_graph_sched);