changed code placement so it can work in more environments:

[libfirm] / ir / ana / irouts.c

diff --git a/ir/ana/irouts.c b/ir/ana/irouts.c
index 3ebce10..0b166e7 100644 (file)
--- a/ir/ana/irouts.c
+++ b/ir/ana/irouts.c
@@ -81,35 +81,34 @@ void set_irn_out      (ir_node *node, int pos, ir_node *out) {
 }
 
 
-int get_Block_n_cfg_outs (ir_node *bl) {
+int get_Block_n_cfg_outs(ir_node *bl) {
   int i, n_cfg_outs = 0;
-  assert(bl && (get_irn_op(bl) == op_Block));
+  assert(bl && is_Block(bl));
 #ifdef DEBUG_libfirm
   assert (bl->out_valid);
 #endif /* defined DEBUG_libfirm */
-  for (i = 0; i < (int)bl->out[0]; i++)
-    if ((get_irn_mode(bl->out[i+1]) == mode_X) &&
-        (get_irn_op(bl->out[i+1]) != op_End))
+  for (i = 1; i <= (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++;
   return n_cfg_outs;
 }
 
 
-ir_node *get_Block_cfg_out  (ir_node *bl, int pos) {
+ir_node *get_Block_cfg_out(ir_node *bl, int pos) {
   int i, out_pos = 0;
   assert(bl && (get_irn_op(bl) == op_Block));
 #ifdef DEBUG_libfirm
   assert (bl->out_valid);
 #endif /* defined DEBUG_libfirm */
-  for (i = 0; i < (int)bl->out[0]; i++)
-    if ((get_irn_mode(bl->out[i+1]) == mode_X)  &&
-        (get_irn_op(bl->out[i+1]) != op_End)) {
+  for (i = 1; i <= (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+1];
-        return cfop->out[0+1];
-      } else {
+        ir_node *cfop = bl->out[i];
+        return cfop->out[1];
+      } else
         out_pos++;
-      }
     }
   return NULL;
 }
@@ -211,7 +210,7 @@ void irg_out_block_walk(ir_node *node,
 
 
 /** Returns the amount of out edges for not yet visited successors. */
-static int count_outs(ir_node *n) {
+static int _count_outs(ir_node *n) {
   int start, i, res, irn_arity;
 
   set_irn_visited(n, get_irg_visited(current_ir_graph));
@@ -223,16 +222,37 @@ static int count_outs(ir_node *n) {
 
   for (i = start; i < irn_arity; i++) {
     /* Optimize Tuples.  They annoy if walking the cfg. */
-    ir_node *succ = skip_Tuple(get_irn_n(n, i));
-    set_irn_n(n, i, succ);
+    ir_node *pred = skip_Tuple(get_irn_n(n, i));
+    set_irn_n(n, i, pred);
 
     /* count outs for successors */
-    if (get_irn_visited(succ) < get_irg_visited(current_ir_graph)) {
-      res += count_outs(succ);
+    if (get_irn_visited(pred) < get_irg_visited(current_ir_graph)) {
+      res += _count_outs(pred);
     }
     /* Count my outs */
-    succ->out = (ir_node **)( (int)succ->out + 1);
+    pred->out = (ir_node **)( (int)pred->out + 1);
+  }
+  return res;
+}
+
+
+/** Returns the amount of out edges for not yet visited successors.
+ *  This version handles some special nodes like irg_frame etc.
+ */
+static int count_outs(ir_graph *irg) {
+  ir_node *n;
+  int res;
+
+  inc_irg_visited(irg);
+  res = _count_outs(get_irg_end(irg));
+
+  /* now handle special nodes */
+  n = get_irg_frame(irg);
+  if (get_irn_visited(n) < get_irg_visited(current_ir_graph)) {
+    n->out = (ir_node **)1;
+    ++res;
   }
+
   return res;
 }
 
@@ -244,9 +264,9 @@ static int count_outs(ir_node *n) {
  *
  * @return The next free address
  */
-static ir_node **set_out_edges(ir_node *n, ir_node **free) {
+static ir_node **_set_out_edges(ir_node *n, ir_node **free) {
   int n_outs, start, i, irn_arity;
-  ir_node *succ;
+  ir_node *pred;
 
   set_irn_visited(n, get_irg_visited(current_ir_graph));
 
@@ -266,17 +286,46 @@ static ir_node **set_out_edges(ir_node *n, ir_node **free) {
   irn_arity = get_irn_arity(n);
 
   for (i = start; i < irn_arity; i++) {
-    succ = get_irn_n(n, i);
+    pred = get_irn_n(n, i);
     /* Recursion */
-    if (get_irn_visited(succ) < get_irg_visited(current_ir_graph))
-      free = set_out_edges(succ, free);
+    if (get_irn_visited(pred) < get_irg_visited(current_ir_graph))
+      free = _set_out_edges(pred, free);
     /* Remember our back edge */
-    succ->out[get_irn_n_outs(succ)+1] = n;
-    succ->out[0] = (ir_node *) (get_irn_n_outs(succ) + 1);
+    pred->out[get_irn_n_outs(pred)+1] = n;
+    pred->out[0] = (ir_node *) (get_irn_n_outs(pred) + 1);
   }
   return free;
 }
 
+/**
+ * Enter memory for the outs to a node. Handles special nodes
+ *
+ * @param irg    the graph
+ * @param free   current free address in the chunk allocated for the outs
+ *
+ * @return The next free address
+ */
+static ir_node **set_out_edges(ir_graph *irg, ir_node **free) {
+  ir_node *n;
+  int n_outs;
+
+  inc_irg_visited(irg);
+  free = _set_out_edges(get_irg_end(irg), free);
+
+  n = get_irg_frame(irg);
+  if (get_irn_visited(n) < get_irg_visited(current_ir_graph)) {
+    n_outs = (int)n->out;
+    n->out = free;
+#ifdef DEBUG_libfirm
+    n->out_valid = 1;
+#endif /* defined DEBUG_libfirm */
+    free += n_outs;
+  }
+
+  return 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
    the out block walker. */
@@ -317,8 +366,7 @@ void compute_outs(ir_graph *irg) {
 
   /* This first iteration counts the overall number of out edges and the
      number of out edges for each node. */
-  inc_irg_visited(irg);
-  n_out_edges = count_outs(get_irg_end(irg));
+  n_out_edges = count_outs(irg);
 
   /* allocate memory for all out edges. */
   irg->outs = xcalloc(n_out_edges, sizeof(irg->outs[0]));
@@ -328,8 +376,7 @@ void compute_outs(ir_graph *irg) {
 
   /* The second iteration splits the irg->outs array into smaller arrays
      for each node and writes the back edges into this array. */
-  inc_irg_visited(irg);
-  end = set_out_edges(get_irg_end(irg), irg->outs);
+  end = set_out_edges(irg, irg->outs);
 
   /* Check how much memory we have used */
   assert (end == (irg->outs + n_out_edges));