#include "list.h"
#include "irnode_t.h"
+#include "irnodeset.h"
#include "irgraph_t.h"
#include "irgwalk.h"
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 {
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);
}
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)
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) {
}
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);
}
}
{
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;
}
{
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)
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;
}
be_ifg_t *be_ifg_std_new(const be_chordal_env_t *env)
{
- ifg_std_t *ifg = malloc(sizeof(*ifg));
+ ifg_std_t *ifg = xmalloc(sizeof(*ifg));
ifg->impl = &ifg_std_impl;
ifg->env = env;