X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firouts.c;h=00d1f0c5992802fab3ced33359756d46b5d49641;hb=ecce3ab433f303a5f6883d204f9e9150e603a18d;hp=092963ae44a692ccb4334ead2bd8be1c0d554d2f;hpb=dc3b229f63a53f48c2ad14809e065a3d67314541;p=libfirm

diff --git a/ir/ana/irouts.c b/ir/ana/irouts.c
index 092963ae4..00d1f0c59 100644
--- 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,104 +33,63 @@
 #include "irgraph_t.h"
 #include "irprog_t.h"
 #include "irgwalk.h"
-#include "irtools.h"
+#include "util.h"
 #include "irprintf.h"
 #include "error.h"
+#include "ircons.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 */
-
-/*--------------------------------------------------------------------*/
-/** Accessing the out datastructures                                 **/
-/*--------------------------------------------------------------------*/
-
-#ifdef DEBUG_libfirm
-/** Clear the outs of a node */
-static void reset_outs(ir_node *node, void *unused)
-{
-	(void) unused;
-	node->out       = NULL;
-	node->out_valid = 0;
-}
-#endif
-
-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);
-#ifdef DEBUG_libfirm
+	assert(node->kind == k_ir_node);
 	assert(node->out_valid);
-#endif /* defined DEBUG_libfirm */
 	/* we misuse the first for the size info of the out array */
 	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));
-#ifdef DEBUG_libfirm
 	assert(def->out_valid);
-#endif /* defined DEBUG_libfirm */
 	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));
-#ifdef DEBUG_libfirm
 	assert(def->out_valid);
-#endif /* defined DEBUG_libfirm */
 	*in_pos = def->out[pos+1].pos;
 	return def->out[pos+1].use;
 }
 
 void set_irn_out(ir_node *def, int pos, ir_node *use, int in_pos)
 {
-	assert(def && use);
+	assert(use);
 	assert(pos >= 0 && pos < get_irn_n_outs(def));
-#ifdef DEBUG_libfirm
 	assert(def->out_valid);
-#endif /* defined DEBUG_libfirm */
 	def->out[pos+1].use = use;
 	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;
-	assert(bl && is_Block(bl));
-#ifdef DEBUG_libfirm
+	assert(is_Block(bl));
 	assert(bl->out_valid);
-#endif /* defined DEBUG_libfirm */
-	for (i = 1; i <= bl->out[0].pos; ++i) {
-		ir_node *succ = bl->out[i].use;
+	int n_cfg_outs = 0;
+	for (int i = 1; i <= bl->out[0].pos; ++i) {
+		const ir_node *succ = bl->out[i].use;
 		if (get_irn_mode(succ) == mode_X && !is_End(succ) && !is_Bad(succ))
 			n_cfg_outs += succ->out[0].pos;
 	}
 	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;
-	assert(bl && is_Block(bl));
-#ifdef DEBUG_libfirm
+	assert(is_Block(bl));
 	assert(bl->out_valid);
-#endif /* defined DEBUG_libfirm */
-	for (i = 1; i <= bl->out[0].pos; ++i) {
-		ir_node *succ = bl->out[i].use;
+	int n_cfg_outs = 0;
+	for (int i = 1; i <= bl->out[0].pos; ++i) {
+		const ir_node *succ = bl->out[i].use;
 		if (get_irn_mode(succ) == mode_X) {
 			if (is_Bad(succ))
 				continue;
@@ -148,16 +106,12 @@ 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;
-	assert(bl && is_Block(bl));
-#ifdef DEBUG_libfirm
+	assert(is_Block(bl));
 	assert(bl->out_valid);
-#endif /* defined DEBUG_libfirm */
-	for (i = 1; i <= bl->out[0].pos; ++i) {
-		ir_node *succ = bl->out[i].use;
+	for (int i = 1; i <= bl->out[0].pos; ++i) {
+		const ir_node *succ = bl->out[i].use;
 		if (get_irn_mode(succ) == mode_X && !is_End(succ) && !is_Bad(succ)) {
 			int n_outs = succ->out[0].pos;
 			if (pos < n_outs)
@@ -169,16 +123,12 @@ 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;
-	assert(bl && is_Block(bl));
-#ifdef DEBUG_libfirm
-	assert (bl->out_valid);
-#endif /* defined DEBUG_libfirm */
-	for (i = 1; i <= bl->out[0].pos; ++i) {
-		ir_node *succ = bl->out[i].use;
+	assert(is_Block(bl));
+	assert(bl->out_valid);
+	for (int i = 1; i <= bl->out[0].pos; ++i) {
+		const ir_node *succ = bl->out[i].use;
 		if (get_irn_mode(succ) == mode_X) {
 			if (is_Bad(succ))
 				continue;
@@ -194,7 +144,7 @@ ir_node *get_Block_cfg_out_ka(const ir_node *bl, int pos)
 				} else
 					--pos;
 			} else {
-				n_outs = succ->out[0].pos;
+				int n_outs = succ->out[0].pos;
 				if (pos < n_outs)
 					return succ->out[pos + 1].use;
 				else
@@ -208,18 +158,15 @@ ir_node *get_Block_cfg_out_ka(const ir_node *bl, int pos)
 static void irg_out_walk_2(ir_node *node, irg_walk_func *pre,
                            irg_walk_func *post, void *env)
 {
-	int     i, n;
-	ir_node *succ;
-
-	assert(node);
 	assert(get_irn_visited(node) < get_irg_visited(current_ir_graph));
 
 	set_irn_visited(node, get_irg_visited(current_ir_graph));
 
 	if (pre) pre(node, env);
 
-	for (i = 0, n = get_irn_n_outs(node); i < n; ++i) {
-		succ = get_irn_out(node, i);
+	int n = get_irn_n_outs(node);
+	for (int i = 0; i < n; ++i) {
+		ir_node *succ = get_irn_out(node, i);
 		if (get_irn_visited(succ) < get_irg_visited(current_ir_graph))
 			irg_out_walk_2(succ, pre, post, env);
 	}
@@ -232,8 +179,8 @@ void irg_out_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
 {
 	assert(node);
 	ir_graph *irg = get_irn_irg(node);
-	if (is_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_OUTS)) {
-		inc_irg_visited (irg);
+	if (irg_has_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_OUTS)) {
+		inc_irg_visited(irg);
 		irg_out_walk_2(node, pre, post, env);
 	}
 }
@@ -241,47 +188,48 @@ void irg_out_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
 static void irg_out_block_walk2(ir_node *bl, irg_walk_func *pre,
                                 irg_walk_func *post, void *env)
 {
-	int i, n;
+	if (Block_block_visited(bl))
+		return;
 
-	if (!Block_block_visited(bl)) {
-		mark_Block_block_visited(bl);
+	mark_Block_block_visited(bl);
 
-		if (pre)
-			pre(bl, env);
-
-		for (i = 0, n =  get_Block_n_cfg_outs(bl); i < n; ++i) {
-			/* find the corresponding predecessor block. */
-			ir_node *pred = get_Block_cfg_out(bl, i);
-			/* recursion */
-			irg_out_block_walk2(pred, pre, post, env);
-		}
+	if (pre)
+		pre(bl, env);
 
-		if (post)
-			post(bl, env);
+	int n = get_Block_n_cfg_outs(bl);
+	for (int i = 0; i < n; ++i) {
+		/* find the corresponding predecessor block. */
+		ir_node *pred = get_Block_cfg_out(bl, i);
+		/* recursion */
+		irg_out_block_walk2(pred, pre, post, env);
 	}
+
+	if (post)
+		post(bl, env);
 }
 
-/* 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)
 {
-
+	ir_graph *irg = get_irn_irg(node);
 	assert(is_Block(node) || (get_irn_mode(node) == mode_X));
 
-	inc_irg_block_visited(current_ir_graph);
+	ir_graph *rem = current_ir_graph;
+	current_ir_graph = irg;
 
-	if (get_irn_mode(node) == mode_X) {
-		int i, n;
+	inc_irg_block_visited(irg);
 
-		for (i = 0, n = get_irn_n_outs(node); i < n; ++i) {
+	if (get_irn_mode(node) == mode_X) {
+		int n = get_irn_n_outs(node);
+		for (int i = 0; i < n; ++i) {
 			ir_node *succ = get_irn_out(node, i);
 			irg_out_block_walk2(succ, pre, post, env);
 		}
-	}
-	else {
+	} else {
 		irg_out_block_walk2(node, pre, post, env);
 	}
+
+	current_ir_graph = rem;
 }
 
 /*--------------------------------------------------------------------*/
@@ -307,16 +255,14 @@ void irg_out_block_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
 /** Returns the amount of out edges for not yet visited successors. */
 static int _count_outs(ir_node *n)
 {
-	int start, i, res, irn_arity;
-
 	mark_irn_visited(n);
 	n->out = (ir_def_use_edge*) INT_TO_PTR(1);     /* Space for array size. */
 
-	start = is_Block(n) ? 0 : -1;
-	irn_arity = get_irn_arity(n);
-	res = irn_arity - start + 1;  /* --1 or --0; 1 for array size. */
+	int start     = is_Block(n) ? 0 : -1;
+	int irn_arity = get_irn_arity(n);
+	int res       = irn_arity - start + 1;  /* --1 or --0; 1 for array size. */
 
-	for (i = start; i < irn_arity; ++i) {
+	for (int i = start; i < irn_arity; ++i) {
 		/* Optimize Tuples.  They annoy if walking the cfg. */
 		ir_node *pred         = get_irn_n(n, i);
 		ir_node *skipped_pred = skip_Tuple(pred);
@@ -341,16 +287,13 @@ static int _count_outs(ir_node *n)
  */
 static int count_outs(ir_graph *irg)
 {
-	ir_node *n;
-	int     i, res;
-
 	inc_irg_visited(irg);
-	res = _count_outs(get_irg_end(irg));
+	int res = _count_outs(get_irg_end(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) {
-		n = get_irg_anchor(irg, i);
+	for (int i = anchor_last; i >= anchor_first; --i) {
+		ir_node *n = get_irg_anchor(irg, i);
 		if (!irn_visited_else_mark(n)) {
 			n->out = (ir_def_use_edge*) INT_TO_PTR(1);
 			++res;
@@ -369,13 +312,10 @@ static int count_outs(ir_graph *irg)
  */
 static ir_def_use_edge *_set_out_edges(ir_node *use, ir_def_use_edge *free)
 {
-	int    start, i, irn_arity, pos;
-	size_t n_outs;
-
 	mark_irn_visited(use);
 
 	/* Allocate my array */
-	n_outs = PTR_TO_INT(use->out);
+	size_t n_outs = PTR_TO_INT(use->out);
 	use->out = free;
 #ifdef DEBUG_libfirm
 	use->out_valid = 1;
@@ -386,10 +326,10 @@ static ir_def_use_edge *_set_out_edges(ir_node *use, ir_def_use_edge *free)
 	   edge. */
 	use->out[0].pos = 0;
 
-	start = is_Block(use) ? 0 : -1;
-	irn_arity = get_irn_arity(use);
+	int start     = is_Block(use) ? 0 : -1;
+	int irn_arity = get_irn_arity(use);
 
-	for (i = start; i < irn_arity; ++i) {
+	for (int i = start; i < irn_arity; ++i) {
 		ir_node *def = get_irn_n(use, i);
 
 		/* Recursion */
@@ -397,7 +337,7 @@ static ir_def_use_edge *_set_out_edges(ir_node *use, ir_def_use_edge *free)
 			free = _set_out_edges(def, free);
 
 		/* Remember this Def-Use edge */
-		pos = def->out[0].pos + 1;
+		int pos = def->out[0].pos + 1;
 		def->out[pos].use = use;
 		def->out[pos].pos = i;
 
@@ -417,21 +357,18 @@ static ir_def_use_edge *_set_out_edges(ir_node *use, ir_def_use_edge *free)
  */
 static ir_def_use_edge *set_out_edges(ir_graph *irg, ir_def_use_edge *free)
 {
-	ir_node *n;
-	int     i;
-
 	inc_irg_visited(irg);
 	free = _set_out_edges(get_irg_end(irg), free);
 
 	/* handle anchored nodes */
-	for (i = anchor_last - 1; i >= 0; --i) {
-		n = get_irg_anchor(irg, i);
+	for (int i = anchor_last; i >= anchor_first; --i) {
+		ir_node *n = get_irg_anchor(irg, i);
 		if (!irn_visited_else_mark(n)) {
 			size_t n_outs = PTR_TO_INT(n->out);
 			n->out = free;
 #ifdef DEBUG_libfirm
 			n->out_valid = 1;
-#endif /* defined DEBUG_libfirm */
+#endif
 			free += n_outs;
 		}
 	}
@@ -439,19 +376,15 @@ 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;
 	int             n_out_edges = 0;
 	ir_def_use_edge *end = NULL;         /* Only for debugging */
 
-	current_ir_graph = irg;
-
 	/* Update graph state */
-	assert(get_irg_phase_state(current_ir_graph) != phase_building);
+	assert(get_irg_phase_state(irg) != phase_building);
 
-	free_irg_outs(current_ir_graph);
+	free_irg_outs(irg);
 
 	/* This first iteration counts the overall number of out edges and the
 	   number of out edges for each node. */
@@ -461,7 +394,7 @@ void compute_irg_outs(ir_graph *irg)
 	irg->outs = XMALLOCNZ(ir_def_use_edge, n_out_edges);
 #ifdef DEBUG_libfirm
 	irg->n_outs = n_out_edges;
-#endif /* defined DEBUG_libfirm */
+#endif
 
 	/* The second iteration splits the irg->outs array into smaller arrays
 	   for each node and writes the back edges into this array. */
@@ -470,48 +403,39 @@ void compute_irg_outs(ir_graph *irg)
 	/* Check how much memory we have used */
 	assert (end == (irg->outs + n_out_edges));
 
-	set_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_OUTS);
-	current_ir_graph = rem;
+	add_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_OUTS);
 }
 
 void assure_irg_outs(ir_graph *irg)
 {
-	if (! is_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_OUTS))
+	if (! irg_has_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_OUTS))
 		compute_irg_outs(irg);
 }
 
-void compute_irp_outs(void)
-{
-	size_t i, n;
-	for (i = 0, n = get_irp_n_irgs(); i < n; ++i)
-		compute_irg_outs(get_irp_irg(i));
-}
-
-void free_irp_outs(void)
+#ifdef DEBUG_libfirm
+/** Clear the outs of a node */
+static void reset_outs(ir_node *node, void *unused)
 {
-	size_t i, n;
-	for (i = 0, n = get_irp_n_irgs(); i < n; ++i)
-		free_irg_outs(get_irp_irg(i));
+	(void) unused;
+	node->out       = NULL;
+	node->out_valid = 0;
 }
+#endif
 
 void free_irg_outs(ir_graph *irg)
 {
-	/*   current_ir_graph->outs_state = outs_none; */
-
-	if (irg->outs) {
+	if (irg->outs != NULL) {
 #ifdef DEBUG_libfirm
 		memset(irg->outs, 0, irg->n_outs);
-#endif /* defined DEBUG_libfirm */
+		irg->n_outs = 0;
+#endif
 		free(irg->outs);
 		irg->outs = NULL;
-#ifdef DEBUG_libfirm
-		irg->n_outs = 0;
-#endif /* defined DEBUG_libfirm */
 	}
 
 #ifdef DEBUG_libfirm
 	/* when debugging, *always* reset all nodes' outs!  irg->outs might
 	   have been lying to us */
 	irg_walk_graph (irg, reset_outs, NULL, NULL);
-#endif /* defined DEBUG_libfirm */
+#endif
 }