X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firouts.c;h=e0b6eed8a60ea4885a009db3049529e86cbfeab9;hb=ee219efe0bdf11f6a392436a2444fc48895a227b;hp=fb5f029dfbe3a460736e05a7a6b000d64f8978f1;hpb=1b57293234c2f0c753f48c94e0ca0f127b15a27b;p=libfirm

diff --git a/ir/ana/irouts.c b/ir/ana/irouts.c
index fb5f029df..e0b6eed8a 100644
--- a/ir/ana/irouts.c
+++ b/ir/ana/irouts.c
@@ -93,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;
 }
 
@@ -107,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;
 }
 
@@ -230,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   **/