#define SetRangeEmpty(ptr,size) memset(ptr, 0, (size) * sizeof((ptr)[0]))
#define hashset_init ir_edgeset_init
+void ir_edgeset_init_size(ir_edgeset_t *self, size_t size);
#define hashset_init_size ir_edgeset_init_size
#define hashset_destroy ir_edgeset_destroy
#define hashset_insert ir_edgeset_insert
#define hashset_remove ir_edgeset_remove
+ir_edge_t *ir_edgeset_find(const ir_edgeset_t *self, const ir_edge_t*);
#define hashset_find ir_edgeset_find
+size_t ir_edgeset_size(const ir_edgeset_t *self);
#define hashset_size ir_edgeset_size
#define hashset_iterator_init ir_edgeset_iterator_init
#define hashset_iterator_next ir_edgeset_iterator_next
{ "dependency", set_irn_dep, 0, get_irn_deps, get_irn_dep }
};
-#define foreach_tgt(irn, i, n, kind) for(i = edge_kind_info[kind].first_idx, n = edge_kind_info[kind].get_arity(irn); i < n; ++i)
+#define foreach_tgt(irn, i, n, kind) for (i = edge_kind_info[kind].first_idx, n = edge_kind_info[kind].get_arity(irn); i < n; ++i)
#define get_n(irn, pos, kind) (edge_kind_info[kind].get_n(irn, pos))
#define get_kind_str(kind) (edge_kind_info[kind].name)
size_t amount = irg->estimated_node_count * 2;
edges_used = 1;
- if(info->allocated) {
+ if (info->allocated) {
amount = ir_edgeset_size(&info->edges);
ir_edgeset_destroy(&info->edges);
obstack_free(&info->edges_obst, NULL);
const ir_edge_t *get_irn_edge(ir_graph *irg, const ir_node *src, int pos)
{
const ir_edge_t *edge;
- if((edge = get_irn_edge_kind(irg, src, pos, EDGE_KIND_NORMAL)) == NULL)
+ if ((edge = get_irn_edge_kind(irg, src, pos, EDGE_KIND_NORMAL)) == NULL)
edge = get_irn_edge_kind(irg, src, pos, EDGE_KIND_BLOCK);
return(edge);
}
info->out_count += ofs;
#if 0
+ ir_graph *irg = get_irn_irg(tgt);
assert(info->out_count >= 0);
if (info->out_count == 0 && kind == EDGE_KIND_NORMAL) {
/* tgt lost it's last user */
for (i = get_irn_arity(tgt) - 1; i >= -1; --i) {
ir_node *prev = get_irn_n(tgt, i);
- edges_notify_edge(tgt, i, NULL, prev, current_ir_graph);
+ edges_notify_edge(tgt, i, NULL, prev, irg);
}
for (i = get_irn_deps(tgt) - 1; i >= 0; --i) {
ir_node *prev = get_irn_dep(tgt, i);
- edges_notify_edge_kind(tgt, i, NULL, prev, EDGE_KIND_DEP, current_ir_graph);
+ edges_notify_edge_kind(tgt, i, NULL, prev, EDGE_KIND_DEP, irg);
}
}
* Verify the edge list of a node, ie. ensure it's a loop:
* head -> e_1 -> ... -> e_n -> head
*/
-static inline void vrfy_list_head(ir_node *irn, ir_edge_kind_t kind)
+static inline void verify_list_head(ir_node *irn, ir_edge_kind_t kind)
{
int err = 0;
int num = 0;
assert(err == 0);
}
-#ifdef DEBUG_libfirm
-/**
- * Helper function to dump the edge set of a graph,
- * unused in normal code.
- */
void edges_dump_kind(ir_graph *irg, ir_edge_kind_t kind)
{
irg_edge_info_t *info;
ir_printf("%+F %d %d\n", e->src, e->pos, e->invalid);
}
}
-#endif
/* The edge from (src, pos) -> old_tgt is redirected to tgt */
void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt,
ir_edge_t *edge;
if (list_empty(&info->free_edges)) {
- edge = obstack_alloc(&info->edges_obst, EDGE_SIZE);
+ edge = (ir_edge_t*)obstack_alloc(&info->edges_obst, EDGE_SIZE);
} else {
edge = list_entry(info->free_edges.next, ir_edge_t, list);
list_del(&edge->list);
/* verify list heads */
if (edges_dbg) {
if (tgt)
- vrfy_list_head(tgt, kind);
+ verify_list_head(tgt, kind);
if (old_tgt)
- vrfy_list_head(old_tgt, kind);
+ verify_list_head(old_tgt, kind);
}
#endif
}
if (edges_activated_kind(irg, EDGE_KIND_BLOCK) && is_Block(src)) {
- if (pos == -1) {
- /* a MacroBlock edge: ignore it here */
- } else {
- ir_node *bl_old = old_tgt ? get_nodes_block(skip_Proj(old_tgt)) : NULL;
- ir_node *bl_tgt = NULL;
+ ir_node *bl_old = old_tgt ? get_nodes_block(skip_Proj(old_tgt)) : NULL;
+ ir_node *bl_tgt = NULL;
- if (tgt)
- bl_tgt = is_Bad(tgt) ? tgt : get_nodes_block(skip_Proj(tgt));
+ if (tgt)
+ bl_tgt = is_Bad(tgt) ? tgt : get_nodes_block(skip_Proj(tgt));
- edges_notify_edge_kind(src, pos, bl_tgt, bl_old, EDGE_KIND_BLOCK, irg);
- }
+ edges_notify_edge_kind(src, pos, bl_tgt, bl_old, EDGE_KIND_BLOCK, irg);
}
}
info->edges_built = 1;
}
-struct build_walker {
+typedef struct build_walker {
ir_graph *irg;
ir_edge_kind_t kind;
bitset_t *reachable;
unsigned problem_found;
-};
+} build_walker;
/**
* Post-Walker: notify all edges
*/
static void build_edges_walker(ir_node *irn, void *data)
{
- struct build_walker *w = data;
+ build_walker *w = (build_walker*)data;
int i, n;
ir_edge_kind_t kind = w->kind;
ir_graph *irg = w->irg;
*/
static void init_lh_walker(ir_node *irn, void *data)
{
- struct build_walker *w = data;
- ir_edge_kind_t kind = w->kind;
- list_head *head = _get_irn_outs_head(irn, kind);
+ build_walker *w = (build_walker*)data;
+ ir_edge_kind_t kind = w->kind;
+ list_head *head = _get_irn_outs_head(irn, kind);
INIT_LIST_HEAD(head);
_get_irn_edge_info(irn, kind)->edges_built = 0;
_get_irn_edge_info(irn, kind)->out_count = 0;
*/
static void init_lh_walker_dep(ir_node *irn, void *data)
{
- struct build_walker *w = data;
- ir_edge_kind_t kind = w->kind;
- list_head *head = _get_irn_outs_head(irn, kind);
- int i;
+ build_walker *w = (build_walker*)data;
+ ir_edge_kind_t kind = w->kind;
+ list_head *head = _get_irn_outs_head(irn, kind);
+ int i;
INIT_LIST_HEAD(head);
_get_irn_edge_info(irn, kind)->edges_built = 0;
*/
static void visitor(ir_node *irn, void *data)
{
- visitor_info_t *info = data;
+ visitor_info_t *info = (visitor_info_t*)data;
+
+ if (is_Deleted(irn))
+ return;
if (!irn_visited_else_mark(irn)) {
info->visit(irn, info->data);
{
set_edge_func_t *set_edge = edge_kind_info[kind].set_edge;
- if(set_edge && edges_activated_kind(irg, kind)) {
+ if (set_edge && edges_activated_kind(irg, kind)) {
struct list_head *head = _get_irn_outs_head(from, kind);
DBG((dbg, LEVEL_5, "reroute from %+F to %+F\n", from, to));
static void verify_set_presence(ir_node *irn, void *data)
{
- struct build_walker *w = data;
- ir_edgeset_t *edges = &_get_irg_edge_info(w->irg, w->kind)->edges;
+ build_walker *w = (build_walker*)data;
+ ir_edgeset_t *edges = &_get_irg_edge_info(w->irg, w->kind)->edges;
int i, n;
foreach_tgt(irn, i, n, w->kind) {
templ.pos = i;
e = ir_edgeset_find(edges, &templ);
- if(e != NULL) {
+ if (e != NULL) {
e->present = 1;
} else {
w->problem_found = 1;
static void verify_list_presence(ir_node *irn, void *data)
{
- struct build_walker *w = data;
- const ir_edge_t *e;
+ build_walker *w = (build_walker*)data;
+ const ir_edge_t *e;
bitset_set(w->reachable, get_irn_idx(irn));
/* check list heads */
- vrfy_list_head(irn, w->kind);
+ verify_list_head(irn, w->kind);
foreach_out_edge_kind(irn, e, w->kind) {
ir_node *tgt;
*/
static void clear_links(ir_node *irn, void *env)
{
- struct build_walker *w = env;
- bitset_t *bs;
+ build_walker *w = (build_walker*)env;
+ bitset_t *bs;
if (IGNORE_NODE(irn)) {
set_irn_link(irn, NULL);
first = -1;
for (i = get_irn_arity(irn) - 1; i >= first; --i) {
ir_node *op = get_irn_n(irn, i);
- bitset_t *bs = get_irn_link(op);
+ bitset_t *bs = (bitset_t*)get_irn_link(op);
if (bs)
bitset_set(bs, get_irn_idx(irn));
*/
static void verify_edge_counter(ir_node *irn, void *env)
{
- struct build_walker *w = env;
+ build_walker *w = (build_walker*)env;
bitset_t *bs;
int list_cnt;
int ref_cnt;
int edge_cnt;
- unsigned long idx;
+ size_t idx;
const struct list_head *head;
const struct list_head *pos;
if (IGNORE_NODE(irn))
return;
- bs = get_irn_link(irn);
+ bs = (bitset_t*)get_irn_link(irn);
list_cnt = 0;
ref_cnt = 0;
edge_cnt = _get_irn_edge_info(irn, EDGE_KIND_NORMAL)->out_count;
return problem_found ? 1 : w.problem_found;
}
-struct pass_t {
+typedef struct pass_t {
ir_graph_pass_t pass;
unsigned assert_on_problem;
-};
+} pass_t;
/**
* Wrapper to edges_verify to be run as an ir_graph pass.
*/
static int edges_verify_wrapper(ir_graph *irg, void *context)
{
- struct pass_t *pass = context;
- int problems_found = edges_verify(irg);
+ pass_t *pass = (pass_t*)context;
+ int problems_found = edges_verify(irg);
/* do NOT rerun the pass if verify is ok :-) */
assert(problems_found && pass->assert_on_problem);
return 0;
/* Creates an ir_graph pass for edges_verify(). */
ir_graph_pass_t *irg_verify_edges_pass(const char *name, unsigned assert_on_problem)
{
- struct pass_t *pass = XMALLOCZ(struct pass_t);
+ pass_t *pass = XMALLOCZ(pass_t);
def_graph_pass_constructor(
&pass->pass, name ? name : "edges_verify", edges_verify_wrapper);
void init_edges(void)
{
FIRM_DBG_REGISTER(dbg, DBG_EDGES);
- /* firm_dbg_set_mask(dbg, -1); */
}
void edges_init_dbg(int do_dbg)
return _get_irn_n_edges_kind(irn, kind);
}
-void dump_all_out_edges(ir_node *irn)
+static void irg_walk_edges2(ir_node *node, irg_walk_func *pre,
+ irg_walk_func *post, void *env)
{
- int i;
- for (i = 0; i < EDGE_KIND_LAST; ++i) {
- const ir_edge_t *edge;
+ const ir_edge_t *edge, *next;
- printf("kind \"%s\"\n", get_kind_str(i));
- foreach_out_edge_kind(irn, edge, i) {
- ir_printf("\t%+F(%d)\n", edge->src, edge->pos);
- }
+ if (irn_visited(node))
+ return;
+ mark_irn_visited(node);
+
+ if (pre != NULL)
+ pre(node, env);
+
+ foreach_out_edge_kind_safe(node, edge, next, EDGE_KIND_NORMAL) {
+ /* find the corresponding successor block. */
+ ir_node *pred = get_edge_src_irn(edge);
+ irg_walk_edges2(pred, pre, post, env);
}
+
+ if (post != NULL)
+ post(node, env);
+}
+
+void irg_walk_edges(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
+ void *env)
+{
+ ir_graph *irg = get_irn_irg(node);
+
+ assert(edges_activated(irg));
+ assert(is_Block(node));
+
+ ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
+
+ inc_irg_visited(irg);
+ irg_walk_edges2(node, pre, post, env);
+
+ ir_free_resources(irg, IR_RESOURCE_IRN_VISITED);
}
-static void irg_block_edges_walk2(ir_node *bl,
- irg_walk_func *pre, irg_walk_func *post,
- void *env) {
+static void irg_block_edges_walk2(ir_node *bl, irg_walk_func *pre,
+ irg_walk_func *post, void *env)
+{
const ir_edge_t *edge, *next;
if (!Block_block_visited(bl)) {
}
}
-void irg_block_edges_walk(ir_node *node,
- irg_walk_func *pre, irg_walk_func *post,
- void *env) {
+void irg_block_edges_walk(ir_node *node, irg_walk_func *pre,
+ irg_walk_func *post, void *env)
+{
+ ir_graph *irg = get_irn_irg(node);
- assert(edges_activated(current_ir_graph));
+ assert(edges_activated(irg));
assert(is_Block(node));
- ir_reserve_resources(current_ir_graph, IR_RESOURCE_BLOCK_VISITED);
+ ir_reserve_resources(irg, IR_RESOURCE_BLOCK_VISITED);
- inc_irg_block_visited(current_ir_graph);
+ inc_irg_block_visited(irg);
irg_block_edges_walk2(node, pre, post, env);
- ir_free_resources(current_ir_graph, IR_RESOURCE_BLOCK_VISITED);
+ ir_free_resources(irg, IR_RESOURCE_BLOCK_VISITED);
}
projects / libfirm / blobdiff