removed unitialized used vartiable

[libfirm] / ir / be / beifg_std.c

diff --git a/ir/be/beifg_std.c b/ir/be/beifg_std.c
index 8a219c5..a9dd0cd 100644 (file)
--- a/ir/be/beifg_std.c
+++ b/ir/be/beifg_std.c
@@ -16,6 +16,7 @@
 #include "list.h"
 
 #include "irnode_t.h"
+#include "irnodeset.h"
 #include "irgraph_t.h"
 #include "irgwalk.h"
 
@@ -41,7 +42,9 @@ static void ifg_std_free(void *self)
 
 static int ifg_std_connected(const void *self, const ir_node *a, const ir_node *b)
 {
-       return values_interfere(a, b);
+       const ifg_std_t *ifg = self;
+       be_lv_t *lv = ifg->env->birg->lv;
+       return values_interfere(lv, a, b);
 }
 
 typedef struct _nodes_iter_t {
@@ -77,6 +80,7 @@ static void find_nodes(const void *self, void *iter) {
        it->env   = ifg->env;
 
        irg_block_walk_graph(ifg->env->irg, nodes_walker, NULL, iter);
+       obstack_ptr_grow(&it->obst, NULL);
        it->nodes = obstack_finish(&it->obst);
 }
 
@@ -119,9 +123,10 @@ static void ifg_std_nodes_break(const void *self, void *iter)
 
 typedef struct _adj_iter_t {
        const be_chordal_env_t *env;
-       const ir_node *irn;
-       int reached_end;
-       pset *neighbours;
+       const ir_node        *irn;
+       int                   valid;
+       ir_nodeset_t          neighbours;
+       ir_nodeset_iterator_t iter;
 } adj_iter_t;
 
 static void find_neighbour_walker(ir_node *block, void *data)
@@ -132,7 +137,7 @@ static void find_neighbour_walker(ir_node *block, void *data)
        border_t *b;
        int has_started = 0;
 
-       if(!is_live_in(block, it->irn) && block != get_nodes_block(it->irn))
+       if(!be_is_live_in(it->env->birg->lv, block, it->irn) && block != get_nodes_block(it->irn))
                return;
 
        foreach_border_head(head, b) {
@@ -146,11 +151,11 @@ static void find_neighbour_walker(ir_node *block, void *data)
                }
                else if(b->is_def) {
                        /* if any other node than the one in question starts living, add it to the set */
-                       pset_insert_ptr(it->neighbours, irn);
+                       ir_nodeset_insert(&it->neighbours, irn);
                }
                else if(!has_started) {
                        /* we only delete, if the live range in question has not yet started */
-                       pset_remove_ptr(it->neighbours, irn);
+                       ir_nodeset_remove(&it->neighbours, irn);
                }
 
        }
@@ -160,25 +165,23 @@ static void find_neighbours(const ifg_std_t *ifg, adj_iter_t *it, const ir_node
 {
        it->env         = ifg->env;
        it->irn         = irn;
-       it->neighbours  = pset_new_ptr(16);
-       it->reached_end = 0;
+       it->valid       = 1;
+       ir_nodeset_init(&it->neighbours);
 
        dom_tree_walk(get_nodes_block(irn), find_neighbour_walker, NULL, it);
+
+       ir_nodeset_iterator_init(&it->iter, &it->neighbours);
 }
 
 static INLINE void neighbours_break(adj_iter_t *it, int force)
 {
-       if((it->reached_end || force) && it->neighbours) {
-               del_pset(it->neighbours);
-               it->neighbours = NULL;
-       }
+       assert(it->valid == 1);
+       ir_nodeset_destroy(&it->neighbours);
+       it->valid = 0;
 }
 
 static ir_node *get_next_neighbour(adj_iter_t *it) {
-       ir_node *res = pset_next(it->neighbours);
-
-       it->reached_end = res == NULL;
-       neighbours_break(it, 0);
+       ir_node *res = ir_nodeset_iterator_next(&it->iter);
 
        return res;
 }
@@ -187,7 +190,7 @@ static ir_node *ifg_std_neighbours_begin(const void *self, void *iter, const ir_
 {
        adj_iter_t *it = iter;
        find_neighbours(self, iter, irn);
-       return pset_first(it->neighbours);
+       return ir_nodeset_iterator_next(&it->iter);
 }
 
 static ir_node *ifg_std_neighbours_next(const void *self, void *iter)
@@ -316,7 +319,7 @@ static int ifg_std_degree(const void *self, const ir_node *irn)
        adj_iter_t it;
        int degree;
        find_neighbours(self, &it, irn);
-       degree = pset_count(it.neighbours);
+       degree = ir_nodeset_size(&it.neighbours);
        neighbours_break(&it, 1);
        return degree;
 }