adapted cost function signature

[libfirm] / ir / be / beirgmod.c

diff --git a/ir/be/beirgmod.c b/ir/be/beirgmod.c
index f0e64f3..8f693d0 100644 (file)
--- a/ir/be/beirgmod.c
+++ b/ir/be/beirgmod.c
@@ -173,7 +173,6 @@ static void determine_phi_blocks(pset *copies, pset *copy_blocks, pset *phi_bloc
 
                                if(!pset_find_ptr(copy_blocks, y))
                                        pdeq_putr(worklist, y);
-
                        }
                }
        }
@@ -225,9 +224,9 @@ static ir_node *search_def(ir_node *usage, int pos, pset *copies, pset *copy_blo
 
        DBG((dbg, LEVEL_1, "Searching valid def for use %+F at pos %d\n", usage, pos));
        /*
-       * If the usage is in a phi node, search the copy in the
-       * predecessor denoted by pos.
-       */
+        * If the usage is in a phi node, search the copy in the
+        * predecessor denoted by pos.
+        */
        if(is_Phi(usage)) {
                curr_bl = get_Block_cfgpred_block(curr_bl, pos);
                start_irn = sched_last(curr_bl);
@@ -297,7 +296,7 @@ static ir_node *search_def(ir_node *usage, int pos, pset *copies, pset *copy_blo
        return NULL;
 }
 
-static void fix_usages(pset *copies, pset *copy_blocks, pset *phi_blocks, pset *phis, pset *ignore_uses, pset *uses)
+static void fix_usages(pset *copies, pset *copy_blocks, pset *phi_blocks, pset *phis, pset *ignore_uses)
 {
        int n_outs = 0;
        struct obstack obst;
@@ -320,14 +319,12 @@ static void fix_usages(pset *copies, pset *copy_blocks, pset *phi_blocks, pset *
        for (irn = pset_first(copies); irn; irn = pset_next(copies)) {
                const ir_edge_t *edge;
                foreach_out_edge(irn, edge) {
-                       if(!uses || pset_find_ptr(uses, get_edge_src_irn(edge))) {
-                               if (!pset_find_ptr(ignore_uses, get_edge_src_irn(edge)) ) {
-                                       struct out tmp;
-                                       tmp.irn = get_edge_src_irn(edge);
-                                       tmp.pos = get_edge_src_pos(edge);
-                                       obstack_grow(&obst, &tmp, sizeof(tmp));
-                                       n_outs++;
-                               }
+                       if (!pset_find_ptr(ignore_uses, get_edge_src_irn(edge))) {
+                               struct out tmp;
+                               tmp.irn = get_edge_src_irn(edge);
+                               tmp.pos = get_edge_src_pos(edge);
+                               obstack_grow(&obst, &tmp, sizeof(tmp));
+                               n_outs++;
                        }
                }
        }
@@ -386,20 +383,20 @@ static void remove_odd_phis(pset *copies, pset *unused_copies)
        }
 }
 
-void be_ssa_constr_phis_ignore(dom_front_info_t *info, int n, ir_node *nodes[], pset *phis, pset *ignore_uses, pset *uses)
+void be_ssa_constr_phis_ignore(dom_front_info_t *info, int n, ir_node *nodes[], pset *phis, pset *ignore_uses)
 {
        pset *irns = pset_new_ptr(n);
        int i;
 
        for(i = 0; i < n; ++i)
                pset_insert_ptr(irns, nodes[i]);
-       be_ssa_constr_set_phis_ignore(info, irns, phis, ignore_uses, uses);
+       be_ssa_constr_set_phis_ignore(info, irns, phis, ignore_uses);
        del_pset(irns);
 }
 
 void be_ssa_constr_ignore(dom_front_info_t *info, int n, ir_node *nodes[], pset *ignore_uses)
 {
-       be_ssa_constr_phis_ignore(info, n, nodes, NULL, ignore_uses, NULL);
+       be_ssa_constr_phis_ignore(info, n, nodes, NULL, ignore_uses);
 }
 
 void be_ssa_constr(dom_front_info_t *info, int n, ir_node *nodes[])
@@ -408,7 +405,7 @@ void be_ssa_constr(dom_front_info_t *info, int n, ir_node *nodes[])
        be_ssa_constr_ignore(info, n, nodes, empty_set);
 }
 
-void be_ssa_constr_set_phis_ignore(dom_front_info_t *df, pset *nodes, pset *phis, pset *ignore_uses, pset *uses)
+void be_ssa_constr_set_phis_ignore(dom_front_info_t *df, pset *nodes, pset *phis, pset *ignore_uses)
 {
        int n                  = pset_count(nodes);
        pset *blocks           = pset_new_ptr(n);
@@ -439,7 +436,7 @@ void be_ssa_constr_set_phis_ignore(dom_front_info_t *df, pset *nodes, pset *phis
         * Place the phi functions and reroute the usages.
         */
        determine_phi_blocks(nodes, blocks, phi_blocks, df);
-       fix_usages(nodes, blocks, phi_blocks, phis, ignore_uses, uses);
+       fix_usages(nodes, blocks, phi_blocks, phis, ignore_uses);
 
        /* reset the optimizations */
        set_optimize(save_optimize);
@@ -453,12 +450,12 @@ void be_ssa_constr_set_phis_ignore(dom_front_info_t *df, pset *nodes, pset *phis
 void be_ssa_constr_set_phis(dom_front_info_t *df, pset *nodes, pset *phis)
 {
        pset *empty_set = be_empty_set();
-       be_ssa_constr_set_phis_ignore(df, nodes, phis, empty_set, NULL);
+       be_ssa_constr_set_phis_ignore(df, nodes, phis, empty_set);
 }
 
 void be_ssa_constr_set_ignore(dom_front_info_t *df, pset *nodes, pset *ignore_uses)
 {
-       be_ssa_constr_set_phis_ignore(df, nodes, NULL, ignore_uses, NULL);
+       be_ssa_constr_set_phis_ignore(df, nodes, NULL, ignore_uses);
 }
 
 void be_ssa_constr_set(dom_front_info_t *info, pset *nodes)
@@ -467,12 +464,6 @@ void be_ssa_constr_set(dom_front_info_t *info, pset *nodes)
        be_ssa_constr_set_ignore(info, nodes, empty_set);
 }
 
-void be_ssa_constr_set_uses(dom_front_info_t *info, pset *nodes, pset *uses)
-{
-       pset *empty_set = be_empty_set();
-       be_ssa_constr_set_phis_ignore(info, nodes, NULL, empty_set, uses);
-}
-
 /*
   ___                     _     ____
  |_ _|_ __  ___  ___ _ __| |_  |  _ \ ___ _ __ _ __ ___
@@ -497,7 +488,7 @@ ir_node *insert_Perm_after(const arch_env_t *arch_env,
 
        DBG((dbg, LEVEL_1, "Insert Perm after: %+F\n", pos));
 
-       if(!be_liveness_nodes_live_at(arch_env, cls, pos, live));
+       be_liveness_nodes_live_at(arch_env, cls, pos, live);
 
        n = pset_count(live);