Changed comments,

[libfirm] / ir / ana / irouts.c

diff --git a/ir/ana/irouts.c b/ir/ana/irouts.c
index 6db0333..1c7df89 100644 (file)
--- a/ir/ana/irouts.c
+++ b/ir/ana/irouts.c
@@ -54,7 +54,7 @@ static void reset_outs (ir_node *node, void *unused)
 }
 
 /* returns the number of successors of the node: */
-INLINE int get_irn_n_outs    (ir_node *node) {
+int get_irn_n_outs    (ir_node *node) {
   assert(node && node->kind == k_ir_node);
 #ifdef DEBUG_libfirm
   /* assert (node->out_valid); */
@@ -63,7 +63,7 @@ INLINE int get_irn_n_outs    (ir_node *node) {
 }
 
 /* Access successor n */
-INLINE ir_node *get_irn_out      (ir_node *node, int pos) {
+ir_node *get_irn_out      (ir_node *node, int pos) {
   assert(pos >= 0 && pos < get_irn_n_outs(node));
 #ifdef DEBUG_libfirm
   /* assert (node->out_valid); */
@@ -71,7 +71,7 @@ INLINE ir_node *get_irn_out      (ir_node *node, int pos) {
   return node->out[pos+1];
 }
 
-INLINE void set_irn_out      (ir_node *node, int pos, ir_node *out) {
+void set_irn_out      (ir_node *node, int pos, ir_node *out) {
   assert(node && out);
   assert(pos >= 0 && pos < get_irn_n_outs(node));
 #ifdef DEBUG_libfirm
@@ -81,7 +81,7 @@ INLINE void set_irn_out      (ir_node *node, int pos, ir_node *out) {
 }
 
 
-INLINE 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));
 #ifdef DEBUG_libfirm
@@ -95,7 +95,7 @@ INLINE int get_Block_n_cfg_outs (ir_node *bl) {
 }
 
 
-INLINE 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
@@ -211,7 +211,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));
@@ -228,7 +228,7 @@ static int count_outs(ir_node *n) {
 
     /* count outs for successors */
     if (get_irn_visited(succ) < get_irg_visited(current_ir_graph)) {
-      res += count_outs(succ);
+      res += _count_outs(succ);
     }
     /* Count my outs */
     succ->out = (ir_node **)( (int)succ->out + 1);
@@ -236,6 +236,27 @@ static int count_outs(ir_node *n) {
   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;
+}
+
 /**
  * Enter memory for the outs to a node.
  *
@@ -244,7 +265,7 @@ 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;
 
@@ -269,7 +290,7 @@ static ir_node **set_out_edges(ir_node *n, ir_node **free) {
     succ = get_irn_n(n, i);
     /* Recursion */
     if (get_irn_visited(succ) < get_irg_visited(current_ir_graph))
-      free = set_out_edges(succ, free);
+      free = _set_out_edges(succ, 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);
@@ -277,6 +298,35 @@ static ir_node **set_out_edges(ir_node *n, ir_node **free) {
   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,19 +367,17 @@ 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 = (ir_node **) xmalloc (n_out_edges * sizeof(ir_node *));
+  irg->outs = xcalloc(n_out_edges, sizeof(irg->outs[0]));
 #ifdef DEBUG_libfirm
   irg->n_outs = n_out_edges;
 #endif /* defined DEBUG_libfirm */
 
   /* 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));
@@ -470,7 +518,7 @@ void compute_ip_outs(void) {
   }
 
   global_count = n_out_edges = count_ip_outs();
-  out_edges = (ir_node **) xmalloc (n_out_edges * sizeof(ir_node *));
+  out_edges = xcalloc(n_out_edges, sizeof(out_edges[0]));
   set_irp_ip_outedges(out_edges);
   set_ip_outs();
 }