X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firouts.c;h=92a57553aef83b3308039a35af2f0eb384aaf944;hb=ab0e5a91b4acdb44ae152930042cbfa9e927bcdd;hp=cf20039e2cd65db2bde8b36ee078d59572419980;hpb=9b716841c3b0865b86af8d3890b3914060c37ed0;p=libfirm

diff --git a/ir/ana/irouts.c b/ir/ana/irouts.c
index cf20039e2..92a57553a 100644
--- a/ir/ana/irouts.c
+++ b/ir/ana/irouts.c
@@ -1,5 +1,5 @@
 /*
- * Copyrigth (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -53,6 +53,7 @@
 #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;
 }
@@ -92,10 +93,11 @@ int get_Block_n_cfg_outs(ir_node *bl) {
 #ifdef DEBUG_libfirm
 	assert(bl->out_valid);
 #endif /* defined DEBUG_libfirm */
-	for (i = 1; i <= PTR_TO_INT(bl->out[0]); ++i)
-		if ((get_irn_mode(bl->out[i]) == mode_X) &&
-		    (get_irn_op(bl->out[i]) != op_End))
-			++n_cfg_outs;
+	for (i = 1; i <= PTR_TO_INT(bl->out[0]); ++i) {
+		ir_node *succ = bl->out[i];
+		if (get_irn_mode(succ) == mode_X && get_irn_op(succ) != op_End)
+			n_cfg_outs += PTR_TO_INT(succ->out[0]);
+	}
 	return n_cfg_outs;
 }
 
@@ -106,59 +108,72 @@ int get_Block_n_cfg_outs_ka(ir_node *bl) {
 #ifdef DEBUG_libfirm
 	assert(bl->out_valid);
 #endif /* defined DEBUG_libfirm */
-	for (i = 1; i <= PTR_TO_INT(bl->out[0]); ++i)
-		if (get_irn_mode(bl->out[i]) == mode_X) {
-			/* ignore End if we are in the Endblock */
-			if (get_irn_op(bl->out[i]) == op_End &&
-			    get_irn_n(bl->out[i], -1) == bl)
-				continue;
-			else
-				++n_cfg_outs;
+	for (i = 1; i <= PTR_TO_INT(bl->out[0]); ++i) {
+		ir_node *succ = bl->out[i];
+		if (get_irn_mode(succ) == mode_X) {
+
+			if (get_irn_op(succ) == op_End) {
+				/* ignore End if we are in the Endblock */
+				if (get_irn_n(succ, -1) == bl)
+					continue;
+				else /* count Keep-alive as one */
+					n_cfg_outs += 1;
+			} else
+				n_cfg_outs += PTR_TO_INT(succ->out[0]);
 		}
+	}
 	return n_cfg_outs;
 }
 
 /* Access predecessor n, ignore keep-alives. */
 ir_node *get_Block_cfg_out(ir_node *bl, int pos) {
-	int i, out_pos = 0;
+	int i;
 	assert(bl && is_Block(bl));
 #ifdef DEBUG_libfirm
 	assert (bl->out_valid);
 #endif /* defined DEBUG_libfirm */
-	for (i = 1; i <= PTR_TO_INT(bl->out[0]); ++i)
-		if ((get_irn_mode(bl->out[i]) == mode_X)  &&
-			(get_irn_op(bl->out[i]) != op_End)) {
-			if (out_pos == pos) {
-				ir_node *cfop = bl->out[i];
-				return cfop->out[1];
-			} else
-				++out_pos;
+	for (i = 1; i <= PTR_TO_INT(bl->out[0]); ++i) {
+		ir_node *succ = bl->out[i];
+		if (get_irn_mode(succ) == mode_X && get_irn_op(succ) != op_End) {
+			int n_outs = PTR_TO_INT(succ->out[0]);
+			if (pos < n_outs)
+				return succ->out[pos + 1];
+			else
+				pos -= n_outs;
 		}
+	}
 	return NULL;
 }
 
 /* Access predecessor n, honor keep-alives. */
 ir_node *get_Block_cfg_out_ka(ir_node *bl, int pos) {
-	int i, out_pos = 0;
+	int i, n_outs;
 	assert(bl && is_Block(bl));
 #ifdef DEBUG_libfirm
 	assert (bl->out_valid);
 #endif /* defined DEBUG_libfirm */
-	for (i = 1; i <= PTR_TO_INT(bl->out[0]); ++i)
-		if (get_irn_mode(bl->out[i]) == mode_X) {
-			/* ignore End if we are in the Endblock */
-			if (get_irn_op(bl->out[i]) == op_End &&
-				get_irn_n(bl->out[i], -1) == bl)
-				continue;
-			if (out_pos == pos) {
-				ir_node *cfop = bl->out[i];
-				/* handle keep-alive here */
-				if (get_irn_op(cfop) == op_End)
-					return get_irn_n(cfop, -1);
-				return cfop->out[1];
-			} else
-				++out_pos;
+	for (i = 1; i <= PTR_TO_INT(bl->out[0]); ++i) {
+		ir_node *succ = bl->out[i];
+		if (get_irn_mode(succ) == mode_X) {
+			if (get_irn_op(succ) == op_End) {
+				if (get_irn_n(succ, -1) == bl) {
+					/* ignore End if we are in the Endblock */
+					continue;
+				}
+				if (pos == 0) {
+					/* handle keep-alive here: return the Endblock instead of the End node */
+					return get_irn_n(succ, -1);
+				} else
+					--pos;
+			} else {
+				n_outs = PTR_TO_INT(succ->out[0]);
+				if (pos < n_outs)
+					return succ->out[pos + 1];
+				else
+					pos -= n_outs;
+			}
 		}
+	}
 	return NULL;
 }
 
@@ -229,14 +244,22 @@ void irg_out_block_walk(ir_node *node,
 
 	inc_irg_block_visited(current_ir_graph);
 
-	if (get_irn_mode(node) == mode_X)
-		node = node->out[1];
+	if (get_irn_mode(node) == mode_X) {
+		int i, n;
 
-	irg_out_block_walk2(node, pre, post, env);
+		for (i = 0, n = get_irn_n_outs(node); 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);
+		}
+	}
+	else {
+		irg_out_block_walk2(node, pre, post, env);
+	}
 }
 
 /*--------------------------------------------------------------------*/
-/** Building and Removing the out datasturcture                      **/
+/** Building and Removing the out datastructure                      **/
 /**                                                                  **/
 /** The outs of a graph are allocated in a single, large array.      **/
 /** This allows to allocate and deallocate the memory for the outs   **/
@@ -292,15 +315,22 @@ static int count_outs(ir_graph *irg) {
 	inc_irg_visited(irg);
 	res = _count_outs(get_irg_end(irg));
 
-	/* now handle special nodes */
+	/* Now handle special nodes. We need the out count of those
+	   even if they are not visible. */
 	n = get_irg_frame(irg);
-	if (irn_not_visited(n)) {
+	if (! is_Bad(n) && irn_not_visited(n)) {
 		n->out = (ir_node **)1;
 		++res;
 	}
 
 	n = get_irg_args(irg);
-	if (irn_not_visited(n)) {
+	if (! is_Bad(n) && irn_not_visited(n)) {
+		n->out = (ir_node **)1;
+		++res;
+	}
+
+	n = get_irg_value_param_base(irg);
+	if (! is_Bad(n) && irn_not_visited(n)) {
 		n->out = (ir_node **)1;
 		++res;
 	}
@@ -358,7 +388,7 @@ static ir_node **_set_out_edges(ir_node *n, ir_node **free) {
  * @return The next free address
  */
 static ir_node **set_out_edges(ir_graph *irg, ir_node **free) {
-	ir_node *n, *special[2];
+	ir_node *n, *special[3];
 	int i, n_outs;
 
 	inc_irg_visited(irg);
@@ -367,9 +397,12 @@ static ir_node **set_out_edges(ir_graph *irg, ir_node **free) {
 	/* handle special nodes */
 	special[0] = get_irg_frame(irg);
 	special[1] = get_irg_args(irg);
+	special[2] = get_irg_value_param_base(irg);
 
-	for (i = 1; i >= 0; --i) {
+	for (i = 2; i >= 0; --i) {
 		n = special[i];
+		if (is_Bad(n))
+			continue;
 
 		if (get_irn_visited(n) < get_irg_visited(current_ir_graph)) {
 			n_outs = PTR_TO_INT(n->out);
@@ -477,11 +510,13 @@ void free_irp_outs(void) {
  *------------------------------------------------------------*/
 
 
+#ifdef INTERPROCEDURAL_VIEW
 /**
  * Inits the number of outedges for each node
  * before counting.
  */
 static void init_count(ir_node * node, void *env) {
+	(void) env;
 	node->out = (ir_node **) 1; /* 1 for the array size */
 }
 
@@ -507,7 +542,6 @@ static void node_arity_count(ir_node * node, void * env) {
 	}
 }
 
-
 /*
  * Inits all nodes for setting the outedges
  * Returns the overall count of edges
@@ -548,10 +582,11 @@ static void set_array_pointer(ir_node *node, void *env) {
  * Adds an outedge from the predecessor to the
  * current node.
  */
-static void set_out_pointer(ir_node * node, void * env) {
+static void set_out_pointer(ir_node * node, void *env) {
 	int i, arity = get_irn_arity(node);
 	ir_node *succ;
 	int start = (!is_Block(node)) ? -1 : 0;
+	(void) env;
 
 	for (i = start; i < arity; ++i) {
 		succ = get_irn_n(node, i);
@@ -601,6 +636,7 @@ void free_ip_outs(void) {
 	}
 	irp->outs_state = outs_none;
 }
+#endif
 
 
 void free_irg_outs(ir_graph *irg) {