copy result mode on final transformations (lea->add and sub->neg-add)

[libfirm] / ir / be / bespillbelady.c

diff --git a/ir/be/bespillbelady.c b/ir/be/bespillbelady.c
index 3a9e68c..23b971e 100644 (file)
--- a/ir/be/bespillbelady.c
+++ b/ir/be/bespillbelady.c
@@ -49,8 +49,6 @@
 #define DEBUG_LVL 0 //(DBG_START | DBG_DECIDE | DBG_WSETS | DBG_FIX | DBG_SPILL)
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
-#define MIN(a,b) (((a)<(b))?(a):(b))
-
 typedef struct _workset_t workset_t;
 
 typedef struct _belady_env_t {
@@ -299,7 +297,6 @@ static void displace(belady_env_t *bel, workset_t *new_vals, int is_usage) {
        }
        DBG((dbg, DBG_DECIDE, "    demand = %d\n", demand));
 
-
        /*
         * 2. Make room for at least 'demand' slots
         */
@@ -319,6 +316,7 @@ static void displace(belady_env_t *bel, workset_t *new_vals, int is_usage) {
                   before its first usage, remove it from start workset */
                for (i=max_allowed; i<ws->len; ++i) {
                        ir_node *irn = ws->vals[i].irn;
+
                        if (!pset_find_ptr(bel->used, irn)) {
                                ir_node *curr_bb = get_nodes_block(bel->instr);
                                workset_t *ws_start = get_block_info(curr_bb)->ws_start;
@@ -597,7 +595,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);
        }
 }
@@ -645,7 +643,7 @@ void be_spill_belady(const be_chordal_env_t *chordal_env) {
        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(bel.senv->dbg = dbg;)
+       DEBUG_ONLY(be_set_spill_env_dbg_module(bel.senv, dbg);)
        bel.reloads   = pset_new_ptr_default();
        bel.copies    = pset_new_ptr_default();