Add some Processor specific instruction selections

[libfirm] / ir / be / bespillbelady.c

diff --git a/ir/be/bespillbelady.c b/ir/be/bespillbelady.c
index 08b9c64..dc8532a 100644 (file)
--- a/ir/be/bespillbelady.c
+++ b/ir/be/bespillbelady.c
@@ -47,7 +47,7 @@
 #define DBG_SLOTS  32
 #define DBG_TRACE  64
 #define DEBUG_LVL 0 //(DBG_START | DBG_DECIDE | DBG_WSETS | DBG_FIX | DBG_SPILL)
-static firm_dbg_module_t *dbg = NULL;
+DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
 #define MIN(a,b) (((a)<(b))?(a):(b))
 
@@ -597,7 +597,7 @@ static void remove_copies(belady_env_t *bel) {
 
                user = get_irn_edge(get_irn_irg(irn), irn, 0)->src;
 
-               src = get_irn_n(irn, be_pos_Copy_orig);
+               src = be_get_Copy_op(irn);
                set_irn_n(user, 0, src);
        }
 }
@@ -614,17 +614,20 @@ static void remove_unused_reloads(ir_graph *irg, belady_env_t *bel) {
                ir_node *spill;
                DBG((dbg, DBG_SPILL, "Removing %+F before %+F in %+F\n", irn, sched_next(irn), get_nodes_block(irn)));
 
-               spill = get_irn_n(irn, be_pos_Reload_mem);
+               if (be_is_Reload(irn))
+                       spill = get_irn_n(irn, be_pos_Reload_mem);
 
                /* remove reload */
                set_irn_n(irn, 0, new_Bad());
                sched_remove(irn);
 
-               /* if spill not used anymore, remove it too
-                * test of regclass is necessary since spill may be a phi-M */
-               if (get_irn_n_edges(spill) == 0 && bel->cls == arch_get_irn_reg_class(bel->arch, spill, -1)) {
-                       set_irn_n(spill, 0, new_Bad());
-                       sched_remove(spill);
+               if (be_is_Reload(irn)) {
+                       /* if spill not used anymore, remove it too
+                        * test of regclass is necessary since spill may be a phi-M */
+                       if (get_irn_n_edges(spill) == 0 && bel->cls == arch_get_irn_reg_class(bel->arch, spill, -1)) {
+                               set_irn_n(spill, 0, new_Bad());
+                               sched_remove(spill);
+                       }
                }
        }
 }
@@ -632,18 +635,19 @@ static void remove_unused_reloads(ir_graph *irg, belady_env_t *bel) {
 void be_spill_belady(const be_chordal_env_t *chordal_env) {
        belady_env_t bel;
 
-       dbg = firm_dbg_register("ir.be.spillbelady");
+       FIRM_DBG_REGISTER(dbg, "ir.be.spillbelady");
 
        /* init belady env */
        obstack_init(&bel.ob);
-       bel.arch    = chordal_env->birg->main_env->arch_env;
-       bel.cls     = chordal_env->cls;
-       bel.n_regs  = arch_register_class_n_regs(bel.cls);
-       bel.ws      = new_workset(&bel.ob, &bel);
-       bel.uses    = be_begin_uses(chordal_env->irg, chordal_env->birg->main_env->arch_env, bel.cls);
-       bel.senv    = be_new_spill_env(dbg, chordal_env, is_mem_phi, NULL);
-       bel.reloads = pset_new_ptr_default();
-       bel.copies  = pset_new_ptr_default();
+       bel.arch      = chordal_env->birg->main_env->arch_env;
+       bel.cls       = chordal_env->cls;
+       bel.n_regs    = arch_register_class_n_regs(bel.cls);
+       bel.ws        = new_workset(&bel.ob, &bel);
+       bel.uses      = be_begin_uses(chordal_env->irg, chordal_env->birg->main_env->arch_env, bel.cls);
+       bel.senv      = be_new_spill_env(chordal_env, is_mem_phi, NULL);
+       DEBUG_ONLY(be_set_spill_env_dbg_module(bel.senv, dbg);)
+       bel.reloads   = pset_new_ptr_default();
+       bel.copies    = pset_new_ptr_default();
 
        DBG((dbg, LEVEL_1, "running on register class: %s\n", bel.cls->name));