remove irsimpletype stuff (unused/broken)

[libfirm] / ir / be / bechordal_main.c

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index 9c76d5d..ba6d9ff 100644 (file)
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.c
@@ -71,6 +71,7 @@
 #include "bera.h"
 #include "beirg.h"
 #include "bedump_minir.h"
+#include "bestack.h"
 
 #include "bespillslots.h"
 #include "bespill.h"
@@ -92,7 +93,7 @@ static be_ra_chordal_opts_t options = {
        ""
 };
 
-typedef struct _post_spill_env_t {
+typedef struct post_spill_env_t {
        be_chordal_env_t            cenv;
        ir_graph                    *irg;
        const arch_register_class_t *cls;
@@ -222,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));
        }
 }
 
@@ -273,11 +275,11 @@ 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
+       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);
 
        /* some special classes contain only ignore regs, no work to be done */
@@ -292,7 +294,7 @@ static void post_spill(post_spill_env_t *pse, int iteration)
                be_timer_push(T_RA_SPILL_APPLY);
                check_for_memory_operands(irg);
                if (iteration == 0) {
-                       be_abi_fix_stack_nodes(be_get_irg_abi(irg));
+                       be_abi_fix_stack_nodes(irg);
                }
                be_timer_pop(T_RA_SPILL_APPLY);
 
@@ -419,69 +421,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");
                }
        }