Add the * for the type in foreach_set() automatically.

[libfirm] / ir / ana / irouts.c

diff --git a/ir/ana/irouts.c b/ir/ana/irouts.c
index d2ff583..c95fd43 100644 (file)
--- a/ir/ana/irouts.c
+++ b/ir/ana/irouts.c
@@ -22,7 +22,6 @@
  * @brief    Compute and access out edges (also called def-use edges).
  * @author   Goetz Lindenmaier, Michael Beck
  * @date     1.2002
- * @version  $Id$
  */
 #include "config.h"
 
@@ -34,15 +33,10 @@
 #include "irgraph_t.h"
 #include "irprog_t.h"
 #include "irgwalk.h"
-#include "irtools.h"
+#include "util.h"
 #include "irprintf.h"
 #include "error.h"
-
-#ifdef DEBUG_libfirm
-/* Note:  ir_node.out_valid and ir_graph.n_outs are only present when DEBUG_libfirm is defined */
-/* Accesses to out_valid and n_outs are fenced out to avoid breakage
-   when compiling with neither DEBUG_libfirm or NDEBUG defined */
-#endif /* defined DEBUG_libfirm */
+#include "ircons.h"
 
 /*--------------------------------------------------------------------*/
 /** Accessing the out datastructures                                 **/
@@ -63,7 +57,6 @@ int get_irn_outs_computed(const ir_node *node)
        return node->out != NULL;
 }
 
-/* returns the number of successors of the node: */
 int get_irn_n_outs(const ir_node *node)
 {
        assert(node && node->kind == k_ir_node);
@@ -74,7 +67,6 @@ int get_irn_n_outs(const ir_node *node)
        return node->out[0].pos;
 }
 
-/* Access successor n */
 ir_node *get_irn_out(const ir_node *def, int pos)
 {
        assert(pos >= 0 && pos < get_irn_n_outs(def));
@@ -84,7 +76,6 @@ ir_node *get_irn_out(const ir_node *def, int pos)
        return def->out[pos+1].use;
 }
 
-/* Access successor n */
 ir_node *get_irn_out_ex(const ir_node *def, int pos, int *in_pos)
 {
        assert(pos >= 0 && pos < get_irn_n_outs(def));
@@ -106,7 +97,6 @@ void set_irn_out(ir_node *def, int pos, ir_node *use, int in_pos)
        def->out[pos+1].pos = in_pos;
 }
 
-/* Return the number of control flow successors, ignore keep-alives. */
 int get_Block_n_cfg_outs(const ir_node *bl)
 {
        int i, n_cfg_outs = 0;
@@ -122,7 +112,6 @@ int get_Block_n_cfg_outs(const ir_node *bl)
        return n_cfg_outs;
 }
 
-/* Return the number of control flow successors, honor keep-alives. */
 int get_Block_n_cfg_outs_ka(const ir_node *bl)
 {
        int i, n_cfg_outs = 0;
@@ -148,7 +137,6 @@ int get_Block_n_cfg_outs_ka(const ir_node *bl)
        return n_cfg_outs;
 }
 
-/* Access predecessor n, ignore keep-alives. */
 ir_node *get_Block_cfg_out(const ir_node *bl, int pos)
 {
        int i;
@@ -169,7 +157,6 @@ ir_node *get_Block_cfg_out(const ir_node *bl, int pos)
        return NULL;
 }
 
-/* Access predecessor n, honor keep-alives. */
 ir_node *get_Block_cfg_out_ka(const ir_node *bl, int pos)
 {
        int i, n_outs;
@@ -231,8 +218,9 @@ void irg_out_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
                   void *env)
 {
        assert(node);
-       if (get_irg_outs_state(current_ir_graph) != outs_none) {
-               inc_irg_visited (current_ir_graph);
+       ir_graph *irg = get_irn_irg(node);
+       if (irg_has_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_OUTS)) {
+               inc_irg_visited (irg);
                irg_out_walk_2(node, pre, post, env);
        }
 }
@@ -260,8 +248,6 @@ static void irg_out_block_walk2(ir_node *bl, irg_walk_func *pre,
        }
 }
 
-/* Walks only over Block nodes in the graph.  Has its own visited
-   flag, so that it can be interleaved with the other walker.         */
 void irg_out_block_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
                         void *env)
 {
@@ -348,7 +334,7 @@ static int count_outs(ir_graph *irg)
 
        /* Now handle anchored nodes. We need the out count of those
           even if they are not visible. */
-       for (i = anchor_last - 1; i >= 0; --i) {
+       for (i = anchor_last; i >= anchor_first; --i) {
                n = get_irg_anchor(irg, i);
                if (!irn_visited_else_mark(n)) {
                        n->out = (ir_def_use_edge*) INT_TO_PTR(1);
@@ -423,7 +409,7 @@ static ir_def_use_edge *set_out_edges(ir_graph *irg, ir_def_use_edge *free)
        free = _set_out_edges(get_irg_end(irg), free);
 
        /* handle anchored nodes */
-       for (i = anchor_last - 1; i >= 0; --i) {
+       for (i = anchor_last; i >= anchor_first; --i) {
                n = get_irg_anchor(irg, i);
                if (!irn_visited_else_mark(n)) {
                        size_t n_outs = PTR_TO_INT(n->out);
@@ -438,7 +424,6 @@ static ir_def_use_edge *set_out_edges(ir_graph *irg, ir_def_use_edge *free)
        return free;
 }
 
-/* compute the outs for a given graph */
 void compute_irg_outs(ir_graph *irg)
 {
        ir_graph        *rem = current_ir_graph;
@@ -450,8 +435,7 @@ void compute_irg_outs(ir_graph *irg)
        /* Update graph state */
        assert(get_irg_phase_state(current_ir_graph) != phase_building);
 
-       if (current_ir_graph->outs_state != outs_none)
-               free_irg_outs(current_ir_graph);
+       free_irg_outs(current_ir_graph);
 
        /* This first iteration counts the overall number of out edges and the
           number of out edges for each node. */
@@ -470,13 +454,13 @@ void compute_irg_outs(ir_graph *irg)
        /* Check how much memory we have used */
        assert (end == (irg->outs + n_out_edges));
 
-       current_ir_graph->outs_state = outs_consistent;
+       add_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_OUTS);
        current_ir_graph = rem;
 }
 
 void assure_irg_outs(ir_graph *irg)
 {
-       if (get_irg_outs_state(irg) != outs_consistent)
+       if (! irg_has_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_OUTS))
                compute_irg_outs(irg);
 }
 
@@ -497,7 +481,6 @@ void free_irp_outs(void)
 void free_irg_outs(ir_graph *irg)
 {
        /*   current_ir_graph->outs_state = outs_none; */
-       irg->outs_state = outs_none;
 
        if (irg->outs) {
 #ifdef DEBUG_libfirm