fixed typedef

[libfirm] / ir / be / bespillbelady.c

diff --git a/ir/be/bespillbelady.c b/ir/be/bespillbelady.c
index 7fde78b..4afa7bd 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;
@@ -589,7 +587,7 @@ static void rescue_used_reloads(ir_node *irn, void *env) {
 static void remove_copies(belady_env_t *bel) {
        ir_node *irn;
 
-       for (irn = pset_first(bel->copies); irn; irn = pset_next(bel->copies)) {
+       foreach_pset(bel->copies, irn) {
                ir_node *src, *user;
 
                assert(be_is_Copy(irn));
@@ -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);
        }
 }
@@ -610,7 +608,7 @@ static void remove_unused_reloads(ir_graph *irg, belady_env_t *bel) {
        ir_node *irn;
 
        irg_walk_graph(irg, rescue_used_reloads, NULL, bel->reloads);
-       for(irn = pset_first(bel->reloads); irn; irn = pset_next(bel->reloads)) {
+       foreach_pset(bel->reloads, irn) {
                ir_node *spill;
                DBG((dbg, DBG_SPILL, "Removing %+F before %+F in %+F\n", irn, sched_next(irn), get_nodes_block(irn)));