X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firouts.c;h=f2884476343439f5caee9427bbb037163843f7cd;hb=c6e8578501b64a525e98b222894918e7a4512708;hp=2f1d43ec27e6515121e0c55e275dbe4748b2cdfa;hpb=0e6672f3b3690b7fc85aa904423292502a9dac2e;p=libfirm

diff --git a/ir/ana/irouts.c b/ir/ana/irouts.c
index 2f1d43ec2..f28844763 100644
--- a/ir/ana/irouts.c
+++ b/ir/ana/irouts.c
@@ -39,6 +39,8 @@
 #include "irprog_t.h"
 #include "irgwalk.h"
 #include "irtools.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 */
@@ -65,7 +67,7 @@ int get_irn_outs_computed(const ir_node *node)
 }
 
 /* returns the number of successors of the node: */
-int get_irn_n_outs(ir_node *node) {
+int get_irn_n_outs(const ir_node *node) {
 	assert(node && node->kind == k_ir_node);
 #ifdef DEBUG_libfirm
 	/* assert(node->out_valid); */
@@ -75,7 +77,7 @@ int get_irn_n_outs(ir_node *node) {
 }
 
 /* Access successor n */
-ir_node *get_irn_out(ir_node *def, int pos) {
+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); */
@@ -84,7 +86,7 @@ ir_node *get_irn_out(ir_node *def, int pos) {
 }
 
 /* Access successor n */
-ir_node *get_irn_out_ex(ir_node *def, int pos, int *in_pos) {
+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); */
@@ -104,7 +106,7 @@ void set_irn_out(ir_node *def, int pos, ir_node *use, int in_pos) {
 }
 
 /* Return the number of control flow successors, ignore keep-alives. */
-int get_Block_n_cfg_outs(ir_node *bl) {
+int get_Block_n_cfg_outs(const ir_node *bl) {
 	int i, n_cfg_outs = 0;
 	assert(bl && is_Block(bl));
 #ifdef DEBUG_libfirm
@@ -119,7 +121,7 @@ int get_Block_n_cfg_outs(ir_node *bl) {
 }
 
 /* Return the number of control flow successors, honor keep-alives. */
-int get_Block_n_cfg_outs_ka(ir_node *bl) {
+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
@@ -143,7 +145,7 @@ int get_Block_n_cfg_outs_ka(ir_node *bl) {
 }
 
 /* Access predecessor n, ignore keep-alives. */
-ir_node *get_Block_cfg_out(ir_node *bl, int pos) {
+ir_node *get_Block_cfg_out(const ir_node *bl, int pos) {
 	int i;
 	assert(bl && is_Block(bl));
 #ifdef DEBUG_libfirm
@@ -163,7 +165,7 @@ ir_node *get_Block_cfg_out(ir_node *bl, int pos) {
 }
 
 /* Access predecessor n, honor keep-alives. */
-ir_node *get_Block_cfg_out_ka(ir_node *bl, int pos) {
+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
@@ -214,8 +216,6 @@ static void irg_out_walk_2(ir_node *node, irg_walk_func *pre,
 	}
 
 	if (post) post(node, env);
-
-	return;
 }
 
 void irg_out_walk(ir_node *node,
@@ -226,7 +226,6 @@ void irg_out_walk(ir_node *node,
 		inc_irg_visited (current_ir_graph);
 		irg_out_walk_2(node, pre, post, env);
 	}
-	return;
 }
 
 static void irg_out_block_walk2(ir_node *bl,
@@ -234,7 +233,7 @@ static void irg_out_block_walk2(ir_node *bl,
                                 void *env) {
 	int i, n;
 
-	if (Block_not_block_visited(bl)) {
+	if (!Block_block_visited(bl)) {
 		mark_Block_block_visited(bl);
 
 		if (pre)
@@ -433,27 +432,25 @@ static ir_def_use_edge *set_out_edges(ir_graph *irg, ir_def_use_edge *free) {
 
 /**
  * We want that the out of ProjX from Start contains the next block at
- * position 1, the Start block at position 2.  This is necessary for
+ * position 0, the Start block at position 1.  This is necessary for
  * the out block walker.
  */
 static INLINE void fix_start_proj(ir_graph *irg) {
-	ir_node *proj    = NULL;
-	ir_node *irn;
 	ir_node *startbl = get_irg_start_block(irg);
-	int     i, block_pos, other_pos;
 
 	if (get_Block_n_cfg_outs(startbl)) {
-		for (i = get_irn_n_outs(startbl) - 1; i >= 0; --i)
-			if (get_irn_mode(get_irn_out(startbl, i)) == mode_X) {
-				proj = get_irn_out(startbl, i);
-				break;
+		ir_node *proj = get_irg_initial_exec(irg);
+		ir_node *irn;
+		int     block_pos, other_pos;
+
+		if (get_irn_n_outs(proj) == 2) {
+			if (get_irn_out_ex(proj, 0, &block_pos) == startbl) {
+				irn = get_irn_out_ex(proj, 1, &other_pos);
+				set_irn_out(proj, 0, irn, other_pos);
+				set_irn_out(proj, 1, startbl, block_pos);
 			}
-
-		if (get_irn_out_ex(proj, 0, &block_pos) == startbl) {
-			assert(get_irn_n_outs(proj) == 2);
-			irn = get_irn_out_ex(proj, 1, &other_pos);
-			set_irn_out(proj, 0, irn, other_pos);
-			set_irn_out(proj, 1, startbl, block_pos);
+		} else {
+			assert(get_irg_phase_state(irg) == phase_backend);
 		}
 	}
 }
@@ -477,7 +474,7 @@ void compute_irg_outs(ir_graph *irg) {
 	n_out_edges = count_outs(irg);
 
 	/* allocate memory for all out edges. */
-	irg->outs = xcalloc(n_out_edges, sizeof(irg->outs[0]));
+	irg->outs = XMALLOCNZ(ir_def_use_edge, n_out_edges);
 #ifdef DEBUG_libfirm
 	irg->n_outs = n_out_edges;
 #endif /* defined DEBUG_libfirm */
@@ -490,8 +487,8 @@ void compute_irg_outs(ir_graph *irg) {
 	assert (end == (irg->outs + n_out_edges));
 
 	/* We want that the out of ProjX from Start contains the next block at
-	   position 1, the Start block at position 2.  This is necessary for
-	   the out block walker. */
+	   position 0, the Start block at position 1.  This is necessary for
+	   code placement (place_early() ONLY if started GCSE on graphs with dead blocks) */
 	fix_start_proj(irg);
 
 	current_ir_graph->outs_state = outs_consistent;
@@ -638,7 +635,7 @@ void compute_ip_outs(void) {
 	}
 
 	global_count = n_out_edges = count_ip_outs();
-	out_edges = xcalloc(n_out_edges, sizeof(out_edges[0]));
+	out_edges    = XMALLOCNZ(ir_node*, n_out_edges);
 	set_irp_ip_outedges(out_edges);
 	set_ip_outs();
 }
@@ -675,3 +672,46 @@ void free_irg_outs(ir_graph *irg) {
 	irg_walk_graph (irg, reset_outs, NULL, NULL);
 #endif /* defined DEBUG_libfirm */
 }
+
+static void check_out_edges(ir_node *irn, void *env) {
+	int i, j, pos;
+	int *pError = env;
+	int error = *pError;
+	int last = is_Block(irn) ? 0 : -1;
+
+	/* check forward: every input must have an out edge */
+	for (i = get_irn_arity(irn) - 1; i >= last; --i) {
+		ir_node *pred = get_irn_n(irn, i);
+
+		for (j = get_irn_n_outs(pred) - 1; j >= 0; --j) {
+			ir_node *user = get_irn_out_ex(pred, j, &pos);
+
+			if (user == irn && pos == i) {
+				break;
+			}
+		}
+		if (j < 0) {
+			ir_fprintf(stderr, "Missing out edge from %+F input %d to %+F", irn, i, pred);
+			++error;
+		}
+	}
+
+	/* checking backward */
+	for (i = get_irn_n_outs(irn) - 1; i >= 0; --i) {
+		ir_node *user = get_irn_out_ex(irn, i, &pos);
+
+		if (get_irn_n(user, pos) != irn) {
+			ir_fprintf(stderr, "Spurious out edge from %+F output %d to %+F", irn, i, user);
+			++error;
+		}
+	}
+	*pError = error;
+}
+
+/* verify outs edges. */
+void verify_outs(ir_graph *irg) {
+	int errors = 0;
+	irg_walk_graph(irg, NULL, check_out_edges, &errors);
+	if (errors > 0)
+		panic("Out edges are corrupt");
+}