we save entities not idents in ia32 symconsts now

[libfirm] / ir / be / bechordal_main.c

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index 438b4d3..6a94f17 100644 (file)
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.c
@@ -10,7 +10,7 @@
  * Driver for the chordal register allocator.
  */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include <time.h>
@@ -80,9 +80,6 @@ static be_ra_chordal_opts_t options = {
        BE_CH_VRFY_WARN,
 };
 
-/** Enable extreme live range splitting. */
-static int be_elr_split = 0;
-
 typedef struct _post_spill_env_t {
        be_chordal_env_t            cenv;
        be_irg_t                    *birg;
@@ -153,7 +150,6 @@ static const lc_opt_table_entry_t be_chordal_options[] = {
        LC_OPT_ENT_ENUM_PTR ("perm",          "perm lowering options", &lower_perm_var),
        LC_OPT_ENT_ENUM_MASK("dump",          "select dump phases", &dump_var),
        LC_OPT_ENT_ENUM_PTR ("vrfy",          "verify options", &be_ch_vrfy_var),
-       LC_OPT_ENT_BOOL     ("elrsplit",      "enable extreme live range splitting", &be_elr_split),
        { NULL }
 };
 
@@ -419,8 +415,13 @@ static void post_spill(post_spill_env_t *pse, int iteration) {
        ir_graph            *irg         = birg->irg;
        const be_main_env_t *main_env    = birg->main_env;
        be_options_t        *main_opts   = main_env->options;
-       static int          splitted     = 0;
        node_stat_t         node_stat;
+       int                 colors_n     = arch_register_class_n_regs(chordal_env->cls);
+       int             allocatable_regs = colors_n - be_put_ignore_regs(birg, chordal_env->cls, NULL);
+
+       /* some special classes contain only ignore regs, no work to be done */
+       if(allocatable_regs == 0)
+               return;
 
 #ifdef FIRM_STATISTICS
        if (be_stat_ev_is_active()) {
@@ -446,28 +447,23 @@ static void post_spill(post_spill_env_t *pse, int iteration) {
        */
        if (iteration == 0) {
                check_for_memory_operands(chordal_env);
-               be_abi_fix_stack_nodes(birg->abi, birg->lv);
+               be_abi_fix_stack_nodes(birg->abi);
        }
 
        BE_TIMER_PUSH(ra_timer.t_verify);
 
        /* verify schedule and register pressure */
        if (chordal_env->opts->vrfy_option == BE_CH_VRFY_WARN) {
-               be_verify_schedule(irg);
+               be_verify_schedule(birg);
                be_verify_register_pressure(birg, pse->cls, irg);
        }
        else if (chordal_env->opts->vrfy_option == BE_CH_VRFY_ASSERT) {
-               assert(be_verify_schedule(irg) && "Schedule verification failed");
+               assert(be_verify_schedule(birg) && "Schedule verification failed");
                assert(be_verify_register_pressure(birg, pse->cls, irg)
                        && "Register pressure verification failed");
        }
        BE_TIMER_POP(ra_timer.t_verify);
 
-       if (be_elr_split && ! splitted) {
-               extreme_liverange_splitting(chordal_env);
-               splitted = 1;
-       }
-
        /* Color the graph. */
        BE_TIMER_PUSH(ra_timer.t_color);
        be_ra_chordal_color(chordal_env);
@@ -627,7 +623,7 @@ static be_ra_t be_ra_chordal_allocator = {
        be_ra_chordal_main,
 };
 
-void be_init_chordal(void)
+void be_init_chordal_main(void)
 {
        lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
        lc_opt_entry_t *ra_grp = lc_opt_get_grp(be_grp, "ra");
@@ -638,4 +634,4 @@ void be_init_chordal(void)
        be_register_allocator("chordal", &be_ra_chordal_allocator);
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_chordal);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_chordal_main);