backend: put ignore regs into beirg
[libfirm] / ir / ir / iredges.c
index a95942f..583169b 100644 (file)
 #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
@@ -115,7 +118,7 @@ static const ir_edge_kind_info_t edge_kind_info[EDGE_KIND_LAST] = {
        { "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)
 
@@ -210,7 +213,7 @@ void edges_init_graph_kind(ir_graph *irg, ir_edge_kind_t kind)
                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);
@@ -253,7 +256,7 @@ const ir_edge_t *get_irn_edge_kind(ir_graph *irg, const ir_node *src, int pos, i
 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);
 }
@@ -270,6 +273,7 @@ static inline void edge_change_cnt(ir_node *tgt, ir_edge_kind_t kind, int ofs)
        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 */
@@ -278,12 +282,12 @@ static inline void edge_change_cnt(ir_node *tgt, ir_edge_kind_t kind, int ofs)
                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);
 
                }
        }
@@ -294,7 +298,7 @@ static inline void edge_change_cnt(ir_node *tgt, ir_edge_kind_t kind, int ofs)
  * 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;
@@ -324,11 +328,6 @@ static inline void vrfy_list_head(ir_node *irn, ir_edge_kind_t kind)
        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;
@@ -345,7 +344,6 @@ void edges_dump_kind(ir_graph *irg, ir_edge_kind_t kind)
                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,
@@ -458,9 +456,9 @@ void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt,
        /* 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
 
@@ -474,17 +472,13 @@ void edges_notify_edge(ir_node *src, int pos, ir_node *tgt, ir_node *old_tgt, ir
        }
 
        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);
        }
 }
 
@@ -624,6 +618,9 @@ static void visitor(ir_node *irn, void *data)
 {
        visitor_info_t *info = data;
 
+       if (is_Deleted(irn))
+               return;
+
        if (!irn_visited_else_mark(irn)) {
                info->visit(irn, info->data);
        }
@@ -708,7 +705,7 @@ void edges_reroute_kind(ir_node *from, ir_node *to, ir_edge_kind_t kind, ir_grap
 {
        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));
@@ -734,7 +731,7 @@ static void verify_set_presence(ir_node *irn, void *data)
                templ.pos = i;
 
                e = ir_edgeset_find(edges, &templ);
-               if(e != NULL) {
+               if (e != NULL) {
                        e->present = 1;
                } else {
                        w->problem_found = 1;
@@ -754,7 +751,7 @@ static void verify_list_presence(ir_node *irn, void *data)
        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;
@@ -1077,22 +1074,47 @@ int (get_irn_n_edges_kind)(const ir_node *irn, ir_edge_kind_t kind)
        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);
 }
 
-static void irg_block_edges_walk2(ir_node *bl,
-                                irg_walk_func *pre, irg_walk_func *post,
-                                void *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)
+{
        const ir_edge_t *edge, *next;
 
        if (!Block_block_visited(bl)) {
@@ -1112,17 +1134,18 @@ static void irg_block_edges_walk2(ir_node *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);
 }