fix for c++ commit
[libfirm] / ir / be / bechordal_main.c
index 7897c01..e74cfac 100644 (file)
@@ -223,9 +223,10 @@ static void memory_operand_walker(ir_node *irn, void *env)
 
        /* kill the Reload */
        if (get_irn_n_edges(irn) == 0) {
+               ir_graph *irg = get_irn_irg(irn);
                sched_remove(irn);
-               set_irn_n(irn, be_pos_Reload_mem, new_Bad());
-               set_irn_n(irn, be_pos_Reload_frame, new_Bad());
+               set_irn_n(irn, be_pos_Reload_mem, new_r_Bad(irg));
+               set_irn_n(irn, be_pos_Reload_frame, new_r_Bad(irg));
        }
 }
 
@@ -249,10 +250,10 @@ static void pre_spill(post_spill_env_t *pse, const arch_register_class_t *cls)
        ir_graph         *irg         = pse->irg;
        ir_exec_freq     *exec_freq   = be_get_irg_exec_freq(irg);
 
-       pse->cls                   = cls;
-       chordal_env->cls           = cls;
-       chordal_env->border_heads  = pmap_create();
-       chordal_env->ignore_colors = bitset_malloc(chordal_env->cls->n_regs);
+       pse->cls                      = cls;
+       chordal_env->cls              = cls;
+       chordal_env->border_heads     = pmap_create();
+       chordal_env->allocatable_regs = bitset_malloc(chordal_env->cls->n_regs);
 
        be_assure_liveness(irg);
        be_liveness_assure_chk(be_get_irg_liveness(irg));
@@ -260,7 +261,7 @@ static void pre_spill(post_spill_env_t *pse, const arch_register_class_t *cls)
        stat_ev_do(pse->pre_spill_cost = be_estimate_irg_costs(irg, exec_freq));
 
        /* put all ignore registers into the ignore register set. */
-       be_put_ignore_regs(irg, pse->cls, chordal_env->ignore_colors);
+       be_put_allocatable_regs(irg, pse->cls, chordal_env->allocatable_regs);
 
        be_timer_push(T_RA_CONSTR);
        be_pre_spill_prepare_constr(irg, chordal_env->cls);
@@ -274,12 +275,10 @@ static void pre_spill(post_spill_env_t *pse, const arch_register_class_t *cls)
  */
 static void post_spill(post_spill_env_t *pse, int iteration)
 {
-       be_chordal_env_t    *chordal_env = &pse->cenv;
-       ir_graph            *irg         = pse->irg;
-       ir_exec_freq        *exec_freq   = be_get_irg_exec_freq(irg);
-       int                  colors_n    = arch_register_class_n_regs(chordal_env->cls);
-       int             allocatable_regs
-               = colors_n - be_put_ignore_regs(irg, chordal_env->cls, NULL);
+       be_chordal_env_t *chordal_env = &pse->cenv;
+       ir_graph         *irg         = pse->irg;
+       ir_exec_freq     *exec_freq   = be_get_irg_exec_freq(irg);
+       int               allocatable_regs = be_get_n_allocatable_regs(irg, chordal_env->cls);
 
        /* some special classes contain only ignore regs, no work to be done */
        if (allocatable_regs > 0) {
@@ -381,7 +380,7 @@ static void post_spill(post_spill_env_t *pse, int iteration)
 
        /* free some always allocated data structures */
        pmap_destroy(chordal_env->border_heads);
-       bitset_free(chordal_env->ignore_colors);
+       bitset_free(chordal_env->allocatable_regs);
 }
 
 /**
@@ -405,12 +404,12 @@ static void be_ra_chordal_main(ir_graph *irg)
 
        be_assure_liveness(irg);
 
-       chordal_env.obst          = &obst;
-       chordal_env.opts          = &options;
-       chordal_env.irg           = irg;
-       chordal_env.border_heads  = NULL;
-       chordal_env.ifg           = NULL;
-       chordal_env.ignore_colors = NULL;
+       chordal_env.obst             = &obst;
+       chordal_env.opts             = &options;
+       chordal_env.irg              = irg;
+       chordal_env.border_heads     = NULL;
+       chordal_env.ifg              = NULL;
+       chordal_env.allocatable_regs = NULL;
 
        obstack_init(&obst);
 
@@ -420,69 +419,44 @@ static void be_ra_chordal_main(ir_graph *irg)
                be_collect_node_stats(&last_node_stats, irg);
        }
 
-       if (! arch_code_generator_has_spiller(be_get_irg_cg(irg))) {
-               /* use one of the generic spiller */
+       /* use one of the generic spiller */
 
-               /* Perform the following for each register class. */
-               for (j = 0, m = arch_env_get_n_reg_class(arch_env); j < m; ++j) {
-                       post_spill_env_t pse;
-                       const arch_register_class_t *cls
-                               = arch_env_get_reg_class(arch_env, j);
+       /* Perform the following for each register class. */
+       for (j = 0, m = arch_env->n_register_classes; j < m; ++j) {
+               post_spill_env_t pse;
+               const arch_register_class_t *cls = &arch_env->register_classes[j];
 
-                       if (arch_register_class_flags(cls) & arch_register_class_flag_manual_ra)
-                               continue;
+               if (arch_register_class_flags(cls) & arch_register_class_flag_manual_ra)
+                       continue;
 
 
-                       stat_ev_ctx_push_str("bechordal_cls", cls->name);
-
-                       stat_ev_if {
-                               be_do_stat_reg_pressure(irg, cls);
-                       }
-
-                       memcpy(&pse.cenv, &chordal_env, sizeof(chordal_env));
-                       pse.irg = irg;
-                       pre_spill(&pse, cls);
+               stat_ev_ctx_push_str("bechordal_cls", cls->name);
 
-                       be_timer_push(T_RA_SPILL);
-                       be_do_spill(irg, cls);
-                       be_timer_pop(T_RA_SPILL);
-
-                       dump(BE_CH_DUMP_SPILL, irg, pse.cls, "spill");
-
-                       post_spill(&pse, 0);
-
-                       stat_ev_if {
-                               be_node_stats_t node_stats;
+               stat_ev_if {
+                       be_do_stat_reg_pressure(irg, cls);
+               }
 
-                               be_collect_node_stats(&node_stats, irg);
-                               be_subtract_node_stats(&node_stats, &last_node_stats);
-                               be_emit_node_stats(&node_stats, "bechordal_");
+               memcpy(&pse.cenv, &chordal_env, sizeof(chordal_env));
+               pse.irg = irg;
+               pre_spill(&pse, cls);
 
-                               be_copy_node_stats(&last_node_stats, &node_stats);
-                               stat_ev_ctx_pop("bechordal_cls");
-                       }
-               }
-       } else {
-               post_spill_env_t *pse;
+               be_timer_push(T_RA_SPILL);
+               be_do_spill(irg, cls);
+               be_timer_pop(T_RA_SPILL);
 
-               /* the backend has its own spiller */
-               m = arch_env_get_n_reg_class(arch_env);
+               dump(BE_CH_DUMP_SPILL, irg, pse.cls, "spill");
 
-               pse = ALLOCAN(post_spill_env_t, m);
+               post_spill(&pse, 0);
 
-               for (j = 0; j < m; ++j) {
-                       memcpy(&pse[j].cenv, &chordal_env, sizeof(chordal_env));
-                       pse[j].irg = irg;
-                       pre_spill(&pse[j], pse[j].cls);
-               }
+               stat_ev_if {
+                       be_node_stats_t node_stats;
 
-               be_timer_push(T_RA_SPILL);
-               arch_code_generator_spill(be_get_irg_cg(irg), irg);
-               be_timer_pop(T_RA_SPILL);
-               dump(BE_CH_DUMP_SPILL, irg, NULL, "spill");
+                       be_collect_node_stats(&node_stats, irg);
+                       be_subtract_node_stats(&node_stats, &last_node_stats);
+                       be_emit_node_stats(&node_stats, "bechordal_");
 
-               for (j = 0; j < m; ++j) {
-                       post_spill(&pse[j], j);
+                       be_copy_node_stats(&last_node_stats, &node_stats);
+                       stat_ev_ctx_pop("bechordal_cls");
                }
        }