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

diff --git a/ir/ana/irouts.c b/ir/ana/irouts.c
index e0b6eed8a..f28844763 100644
--- a/ir/ana/irouts.c
+++ b/ir/ana/irouts.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (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.
  *
@@ -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 */
@@ -59,85 +61,102 @@ static void reset_outs(ir_node *node, void *unused) {
 }
 #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(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); */
 #endif /* defined DEBUG_libfirm */
-	return PTR_TO_INT(node->out[0]);
+	/* 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(ir_node *node, int pos) {
-	assert(pos >= 0 && pos < get_irn_n_outs(node));
+ir_node *get_irn_out(const ir_node *def, int pos) {
+	assert(pos >= 0 && pos < get_irn_n_outs(def));
 #ifdef DEBUG_libfirm
-	/* assert(node->out_valid); */
+	/* 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 */
-return node->out[pos+1];
+	*in_pos = def->out[pos+1].pos;
+	return def->out[pos+1].use;
 }
 
-void set_irn_out(ir_node *node, int pos, ir_node *out) {
-	assert(node && out);
-	assert(pos >= 0 && pos < get_irn_n_outs(node));
+void set_irn_out(ir_node *def, int pos, ir_node *use, int in_pos) {
+	assert(def && use);
+	assert(pos >= 0 && pos < get_irn_n_outs(def));
 #ifdef DEBUG_libfirm
-	node->out_valid = 1;          /* assume that this function is used correctly */
+	def->out_valid = 1;          /* assume that this function is used correctly */
 #endif /* defined DEBUG_libfirm */
-	node->out[pos+1] = out;
+	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(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
 	assert(bl->out_valid);
 #endif /* defined DEBUG_libfirm */
-	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]);
+	for (i = 1; i <= bl->out[0].pos; ++i) {
+		ir_node *succ = bl->out[i].use;
+		if (get_irn_mode(succ) == mode_X && !is_End(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(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
 	assert(bl->out_valid);
 #endif /* defined DEBUG_libfirm */
-	for (i = 1; i <= PTR_TO_INT(bl->out[0]); ++i) {
-		ir_node *succ = bl->out[i];
+	for (i = 1; i <= bl->out[0].pos; ++i) {
+		ir_node *succ = bl->out[i].use;
 		if (get_irn_mode(succ) == mode_X) {
 
-			if (get_irn_op(succ) == op_End) {
+			if (is_End(succ)) {
 				/* ignore End if we are in the Endblock */
-				if (get_irn_n(succ, -1) == bl)
+				if (get_nodes_block(succ) == bl)
 					continue;
 				else /* count Keep-alive as one */
 					n_cfg_outs += 1;
 			} else
-				n_cfg_outs += PTR_TO_INT(succ->out[0]);
+				n_cfg_outs += succ->out[0].pos;
 		}
 	}
 	return n_cfg_outs;
 }
 
 /* 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
-	assert (bl->out_valid);
+	assert(bl->out_valid);
 #endif /* defined DEBUG_libfirm */
-	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]);
+	for (i = 1; i <= bl->out[0].pos; ++i) {
+		ir_node *succ = bl->out[i].use;
+		if (get_irn_mode(succ) == mode_X && !is_End(succ)) {
+			int n_outs = succ->out[0].pos;
 			if (pos < n_outs)
-				return succ->out[pos + 1];
+				return succ->out[pos + 1].use;
 			else
 				pos -= n_outs;
 		}
@@ -146,29 +165,30 @@ 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
 	assert (bl->out_valid);
 #endif /* defined DEBUG_libfirm */
-	for (i = 1; i <= PTR_TO_INT(bl->out[0]); ++i) {
-		ir_node *succ = bl->out[i];
+	for (i = 1; i <= bl->out[0].pos; ++i) {
+		ir_node *succ = bl->out[i].use;
 		if (get_irn_mode(succ) == mode_X) {
-			if (get_irn_op(succ) == op_End) {
-				if (get_irn_n(succ, -1) == bl) {
+			if (is_End(succ)) {
+				ir_node *end_bl = get_nodes_block(succ);
+				if (end_bl == 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);
+					return end_bl;
 				} else
 					--pos;
 			} else {
-				n_outs = PTR_TO_INT(succ->out[0]);
+				n_outs = succ->out[0].pos;
 				if (pos < n_outs)
-					return succ->out[pos + 1];
+					return succ->out[pos + 1].use;
 				else
 					pos -= n_outs;
 			}
@@ -196,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,
@@ -208,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,
@@ -216,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)
@@ -283,7 +300,7 @@ static int _count_outs(ir_node *n) {
 	int start, i, res, irn_arity;
 
 	mark_irn_visited(n);
-	n->out = (ir_node **) 1;     /* Space for array size. */
+	n->out = INT_TO_PTR(1);     /* Space for array size. */
 
 	start = is_Block(n) ? 0 : -1;
 	irn_arity = get_irn_arity(n);
@@ -291,15 +308,19 @@ static int _count_outs(ir_node *n) {
 
 	for (i = start; i < irn_arity; ++i) {
 		/* Optimize Tuples.  They annoy if walking the cfg. */
-		ir_node *pred = skip_Tuple(get_irn_n(n, i));
-		set_irn_n(n, i, pred);
+		ir_node *pred         = get_irn_n(n, i);
+		ir_node *skipped_pred = skip_Tuple(pred);
 
-		/* count outs for successors */
-		if (irn_not_visited(pred))
-			res += _count_outs(pred);
+		if (skipped_pred != pred) {
+			set_irn_n(n, i, skipped_pred);
+		}
 
-		/* Count my outs */
-		pred->out = (ir_node **)INT_TO_PTR(PTR_TO_INT(pred->out) + 1);
+		/* count Def-Use edges for predecessors */
+		if (irn_not_visited(skipped_pred))
+			res += _count_outs(skipped_pred);
+
+		/*count my Def-Use edges */
+		skipped_pred->out = INT_TO_PTR(PTR_TO_INT(skipped_pred->out) + 1);
 	}
 	return res;
 }
@@ -310,64 +331,67 @@ static int _count_outs(ir_node *n) {
  */
 static int count_outs(ir_graph *irg) {
 	ir_node *n;
-	int res;
+	int     i, res;
 
 	inc_irg_visited(irg);
 	res = _count_outs(get_irg_end(irg));
 
-	/* now handle special nodes */
-	n = get_irg_frame(irg);
-	if (irn_not_visited(n)) {
-		n->out = (ir_node **)1;
-		++res;
-	}
+	/* 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);
+		if (irn_not_visited(n)) {
+			mark_irn_visited(n);
 
-	n = get_irg_args(irg);
-	if (irn_not_visited(n)) {
-		n->out = (ir_node **)1;
-		++res;
+			n->out = INT_TO_PTR(1);
+			++res;
+		}
 	}
-
 	return res;
 }
 
 /**
  * Enter memory for the outs to a node.
  *
- * @param n      current node
+ * @param use    current node
  * @param free   current free address in the chunk allocated for the outs
  *
  * @return The next free address
  */
-static ir_node **_set_out_edges(ir_node *n, ir_node **free) {
-	int n_outs, start, i, irn_arity;
-	ir_node *pred;
+static ir_def_use_edge *_set_out_edges(ir_node *use, ir_def_use_edge *free) {
+	int     n_outs, start, i, irn_arity, pos;
 
-	set_irn_visited(n, get_irg_visited(current_ir_graph));
+	mark_irn_visited(use);
 
 	/* Allocate my array */
-	n_outs = PTR_TO_INT(n->out);
-	n->out = free;
+	n_outs = PTR_TO_INT(use->out);
+	use->out = free;
 #ifdef DEBUG_libfirm
-	n->out_valid = 1;
+	use->out_valid = 1;
 #endif /* defined DEBUG_libfirm */
 	free += n_outs;
 	/* We count the successors again, the space will be sufficient.
 	   We use this counter to remember the position for the next back
 	   edge. */
-	n->out[0] = (ir_node *)0;
+	use->out[0].pos = 0;
 
-	start = is_Block(n) ? 0 : -1;
-	irn_arity = get_irn_arity(n);
+	start = is_Block(use) ? 0 : -1;
+	irn_arity = get_irn_arity(use);
 
 	for (i = start; i < irn_arity; ++i) {
-		pred = get_irn_n(n, i);
+		ir_node *def = get_irn_n(use, i);
+
 		/* Recursion */
-		if (get_irn_visited(pred) < get_irg_visited(current_ir_graph))
-			free = _set_out_edges(pred, free);
-		/* Remember our back edge */
-		pred->out[get_irn_n_outs(pred)+1] = n;
-		pred->out[0] = INT_TO_PTR(get_irn_n_outs(pred) + 1);
+		if (irn_not_visited(def))
+			free = _set_out_edges(def, free);
+
+		/* Remember this Def-Use edge */
+		pos = def->out[0].pos + 1;
+		def->out[pos].use = use;
+		def->out[pos].pos = i;
+
+		/* increase the number of Def-Use edges so far */
+		def->out[0].pos = pos;
 	}
 	return free;
 }
@@ -380,21 +404,19 @@ 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];
-	int i, n_outs;
+static ir_def_use_edge *set_out_edges(ir_graph *irg, ir_def_use_edge *free) {
+	ir_node *n;
+	int     i, n_outs;
 
 	inc_irg_visited(irg);
 	free = _set_out_edges(get_irg_end(irg), free);
 
-	/* handle special nodes */
-	special[0] = get_irg_frame(irg);
-	special[1] = get_irg_args(irg);
+	/* handle anchored nodes */
+	for (i = anchor_last - 1; i >= 0; --i) {
+		n = get_irg_anchor(irg, i);
+		if (irn_not_visited(n)) {
+			mark_irn_visited(n);
 
-	for (i = 1; i >= 0; --i) {
-		n = special[i];
-
-		if (get_irn_visited(n) < get_irg_visited(current_ir_graph)) {
 			n_outs = PTR_TO_INT(n->out);
 			n->out = free;
 #ifdef DEBUG_libfirm
@@ -410,34 +432,34 @@ static ir_node **set_out_edges(ir_graph *irg, ir_node **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 *startbl = get_irg_start_block(irg);
-	int i;
 
 	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(proj, 0) == startbl) {
-			assert(get_irn_n_outs(proj) == 2);
-			set_irn_out(proj, 0, get_irn_out(proj, 1));
-			set_irn_out(proj, 1, startbl);
+		} else {
+			assert(get_irg_phase_state(irg) == phase_backend);
 		}
 	}
 }
 
 /* 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_node **end = NULL;         /* Only for debugging */
+	ir_graph        *rem = current_ir_graph;
+	int             n_out_edges = 0;
+	ir_def_use_edge *end = NULL;         /* Only for debugging */
 
 	current_ir_graph = irg;
 
@@ -452,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 */
@@ -465,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;
@@ -500,6 +522,7 @@ void free_irp_outs(void) {
  *------------------------------------------------------------*/
 
 
+#ifdef INTERPROCEDURAL_VIEW
 /**
  * Inits the number of outedges for each node
  * before counting.
@@ -531,7 +554,6 @@ static void node_arity_count(ir_node * node, void * env) {
 	}
 }
 
-
 /*
  * Inits all nodes for setting the outedges
  * Returns the overall count of edges
@@ -613,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();
 }
@@ -626,6 +648,7 @@ void free_ip_outs(void) {
 	}
 	irp->outs_state = outs_none;
 }
+#endif
 
 
 void free_irg_outs(ir_graph *irg) {
@@ -649,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");
+}