X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firouts.c;h=a037db1642284a9486bd6b9b9010f3eb9cd482e1;hb=1f36a30739aba543da2a02c726bc1ccd21510239;hp=6db03333e9535c0c8270402b3f056fa3c1bc8fa6;hpb=6c165ecbc0725a21b7f68a31f8624c218e7d1288;p=libfirm

diff --git a/ir/ana/irouts.c b/ir/ana/irouts.c
index 6db03333e..a037db164 100644
--- a/ir/ana/irouts.c
+++ b/ir/ana/irouts.c
@@ -33,6 +33,7 @@
 #include "irgraph_t.h"
 #include "irprog_t.h"
 #include "irgwalk.h"
+#include "irtools.h"
 
 #ifdef DEBUG_libfirm
 /* Note:  ir_node.out_valid and ir_graph.n_outs are only present when DEBUG_libfirm is defined */
@@ -54,16 +55,16 @@ 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); */
 #endif /* defined DEBUG_libfirm */
-  return (int)(node->out[0]);
+  return PTR_TO_INT(node->out[0]);
 }
 
 /* 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 +72,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,35 +82,34 @@ 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));
+  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 <= 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++;
   return n_cfg_outs;
 }
 
 
-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
   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 <= 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+1];
-        return cfop->out[0+1];
-      } else {
+        ir_node *cfop = bl->out[i];
+        return cfop->out[1];
+      } else
         out_pos++;
-      }
     }
   return NULL;
 }
@@ -211,31 +211,58 @@ 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));
+  mark_irn_visited(n);
   n->out = (ir_node **) 1;     /* Space for array size. */
 
   start = is_Block(n) ? 0 : -1;
   irn_arity = get_irn_arity(n);
   res = irn_arity - start + 1;  /* --1 or --0; 1 for array size. */
 
-  for (i = start; i < irn_arity; i++) {
+  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 (irn_not_visited(pred))
+      res += _count_outs(pred);
+
     /* Count my outs */
-    succ->out = (ir_node **)( (int)succ->out + 1);
+    pred->out = (ir_node **)INT_TO_PTR(PTR_TO_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, irg_args 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 (irn_not_visited(n)) {
+    n->out = (ir_node **)1;
+    ++res;
+  }
+
+  n = get_irg_args(irg);
+  if (irn_not_visited(n)) {
+    n->out = (ir_node **)1;
+    ++res;
+  }
+
+  return res;
+}
+
 /**
  * Enter memory for the outs to a node.
  *
@@ -244,14 +271,14 @@ 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));
 
   /* Allocate my array */
-  n_outs = (int) n->out;
+  n_outs = PTR_TO_INT(n->out);
   n->out = free;
 #ifdef DEBUG_libfirm
   n->out_valid = 1;
@@ -266,17 +293,53 @@ 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] = INT_TO_PTR(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, *special[2];
+  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);
+
+  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
+      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. */
@@ -301,7 +364,7 @@ static INLINE void fix_start_proj(ir_graph *irg) {
 }
 
 /* compute the outs for a given graph */
-void compute_outs(ir_graph *irg) {
+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 */
@@ -312,24 +375,22 @@ void compute_outs(ir_graph *irg) {
   assert(get_irg_phase_state(current_ir_graph) != phase_building);
 
   if (current_ir_graph->outs_state != outs_none)
-    free_outs(current_ir_graph);
+    free_irg_outs(current_ir_graph);
   current_ir_graph->outs_state = outs_consistent;
 
   /* 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));
@@ -342,7 +403,16 @@ void compute_outs(ir_graph *irg) {
   current_ir_graph = rem;
 }
 
-
+void compute_irp_outs(void) {
+  int i, n_irgs = get_irp_n_irgs();
+  for (i = 0; i < n_irgs; ++i)
+    compute_irg_outs(get_irp_irg(i));
+}
+void free_irp_outs(void) {
+  int i, n_irgs = get_irp_n_irgs();
+  for (i = 0; i < n_irgs; ++i)
+    free_irg_outs(get_irp_irg(i));
+}
 
 
 /*------------------------------------------------------------*
@@ -381,7 +451,7 @@ static void node_arity_count(ir_node * node, void * env)
 
   for(i = start; i < arity; i++) {
     succ = get_irn_n(node, i);
-    succ->out = (ir_node **)((int)succ->out + 1);
+    succ->out = (ir_node **)INT_TO_PTR(PTR_TO_INT(succ->out) + 1);
   }
 }
 
@@ -412,7 +482,7 @@ static void set_array_pointer(ir_node *node, void *env) {
   ir_node ***free = (ir_node ***) env;
 
   /* Allocate my array */
-  n_outs = (int) node -> out;  /* We wrote the count here in count_ip_outs */
+  n_outs = PTR_TO_INT(node->out);  /* We wrote the count here in count_ip_outs */
   dummy_count += n_outs;
   assert(dummy_count <= global_count && "More outedges than initially counted!");
   node -> out = *free;
@@ -433,10 +503,10 @@ static void set_out_pointer(ir_node * node, void * env) {
   ir_node *succ;
   int start = (!is_Block(node)) ? -1 : 0;
 
-  for(i = start; i < arity; i++) {
+  for (i = start; i < arity; i++) {
     succ = get_irn_n(node, i);
     succ->out[get_irn_n_outs(succ)+1] = node;
-    succ->out[0] = (ir_node *) (get_irn_n_outs(succ) + 1);
+    succ->out[0] = INT_TO_PTR(get_irn_n_outs(succ) + 1);
   }
 }
 
@@ -470,7 +540,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();
 }
@@ -486,7 +556,7 @@ void free_ip_outs(void)
 }
 
 
-void free_outs(ir_graph *irg) {
+void free_irg_outs(ir_graph *irg) {
 
   /*   current_ir_graph->outs_state = outs_none; */
   irg->outs_state = outs_none;