X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgwalk.c;h=c5e94a892fa77a8799bea3e4303b0eaa63faa93d;hb=e570f00fb465d212dde403160e97ab45d36d1d7e;hp=fe3685c2e820fd8a4dee3469a7b90857b712a583;hpb=2f01596b117f89869d3cbb611f972ee1ddba4fa5;p=libfirm

diff --git a/ir/ir/irgwalk.c b/ir/ir/irgwalk.c
index fe3685c2e..c5e94a892 100644
--- a/ir/ir/irgwalk.c
+++ b/ir/ir/irgwalk.c
@@ -24,7 +24,7 @@
 # include <stdlib.h>
 
 # include "irnode_t.h"
-# include "irgraph.h" /* visited flag */
+# include "irgraph_t.h" /* visited flag */
 # include "irprog.h"
 # include "irgwalk.h"
 # include "typewalk.h"
@@ -39,7 +39,7 @@ static void irg_walk_cg(ir_node * node, int visited, eset * irg_set,
   ir_graph * rem = current_ir_graph;
   ir_node * pred;
 
-  assert(node && node->kind==k_ir_node);
+  assert(node && node->kind == k_ir_node);
   if (get_irn_visited(node) >= visited) return;
 
   set_irn_visited(node, visited);
@@ -117,7 +117,7 @@ irg_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * env)
 {
   int i;
   assert(node && node->kind==k_ir_node);
-
+#if 0 /* safe */
   if (get_irn_visited(node) < get_irg_visited(current_ir_graph)) {
     set_irn_visited(node, get_irg_visited(current_ir_graph));
 
@@ -130,7 +130,20 @@ irg_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * env)
 
     if (post) post(node, env);
   }
-  return;
+#else /* faster */
+  if (node->visited < current_ir_graph->visited) {
+    set_irn_visited(node, current_ir_graph->visited);
+
+    if (pre) pre(node, env);
+
+    if (node->op != op_Block)
+      irg_walk_2(get_irn_n(node, -1), pre, post, env);
+    for (i = get_irn_arity(node) - 1; i >= 0; --i)
+      irg_walk_2(get_irn_n(node, i), pre, post, env);
+
+    if (post) post(node, env);
+  }
+#endif
 }
 
 
@@ -146,10 +159,10 @@ void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
     irg_walk(node, (irg_walk_func *) collect_irgs, NULL, irg_set);
     interprocedural_view = true;
     visited = get_max_irg_visited() + 1;
-    irg_walk_cg(node, visited, irg_set, pre, post, env);
     for (irg = eset_first(irg_set); irg; irg = eset_next(irg_set)) {
       set_irg_visited(irg, visited);
     }
+    irg_walk_cg(node, visited, irg_set, pre, post, env);
     eset_destroy(irg_set);
   } else {
     inc_irg_visited(current_ir_graph);
@@ -221,7 +234,8 @@ cg_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * env)
     if (is_no_Block(node))
       cg_walk_2(get_nodes_block(node), pre, post, env);
     for (i = get_irn_arity(node) - 1; i >= 0; --i) {
-      rem = switch_irg(node, i);
+      rem = switch_irg(node, i);  /* @@@ AS: Is this wrong? We do have to
+                                             switch to the irg of the predecessor, don't we? */
       cg_walk_2(get_irn_n(node, i), pre, post, env);
       current_ir_graph = rem;
     }
@@ -245,18 +259,48 @@ void cg_walk(irg_walk_func *pre, irg_walk_func *post, void *env) {
   for (i = 0; i < get_irp_n_irgs(); i++)
     set_irg_visited(get_irp_irg(i), get_max_irg_visited());
 
-  /* Walk starting at unreachable procedures. */
+  /* Walk starting at unreachable procedures. Only these
+   * have End blocks visible in interprocedural view. */
   for (i = 0; i < get_irp_n_irgs(); i++) {
     ir_node *sb;
     current_ir_graph = get_irp_irg(i);
 
     sb = get_irg_start_block(current_ir_graph);
+
     if ((get_Block_n_cfgpreds(sb) > 1) ||
 	(get_nodes_block(get_Block_cfgpred(sb, 0)) != sb)) continue;
 
     cg_walk_2(get_irg_end(current_ir_graph), pre, post, env);
   }
 
+  /* Check whether we walked all procedures: there could be procedures
+     with cyclic calls but no call from the outside. */
+  for (i = 0; i < get_irp_n_irgs(); i++) {
+    ir_node *sb;
+    current_ir_graph = get_irp_irg(i);
+
+    /* Test start block: if inner procedure end and end block are not
+     * visible and therefore not marked. */
+    sb = get_irg_start_block(current_ir_graph);
+    if (get_irn_visited(sb) < get_irg_visited(current_ir_graph)) {
+      cg_walk_2(sb, pre, post, env);
+    }
+  }
+
+  /* Walk all endless loops in inner procedures.
+   * We recognize an inner procedure if the End node is not visited. */
+  for (i = 0; i < get_irp_n_irgs(); i++) {
+    ir_node *e;
+    current_ir_graph = get_irp_irg(i);
+    e = get_irg_end(current_ir_graph);
+    if (get_irn_visited(e) < get_irg_visited(current_ir_graph)) {
+      int j;
+      /* Don't visit the End node. */
+      for (j = 0; j < get_End_n_keepalives(e); j++)
+	cg_walk_2(get_End_keepalive(e, j), pre, post, env);
+    }
+  }
+
   interprocedural_view = rem_view;
   current_ir_graph = rem;
 }
@@ -322,12 +366,14 @@ void irg_block_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void
   assert(get_irn_opcode(block)  == iro_Block);
   irg_block_walk_2(block, pre, post, env);
   /* keepalive: the endless loops ... */
-  if (get_irn_op(node) == op_End)
-    for (i = 0; i < get_irn_arity(node); i++) {
+  if (get_irn_op(node) == op_End) {
+    int arity = get_irn_arity(node);
+    for (i = 0; i < arity; i++) {
       pred = get_irn_n(node, i);
       if (get_irn_op(pred) == op_Block)
 	irg_block_walk_2(pred, pre, post, env);
     }
+  }
 
   return;
 }