X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgwalk.c;h=ceba7511fadc357a8cba191b7e7759e6837b16a1;hb=2faf4b048db1a02ec8ef0775fb42b6e5ae233bc4;hp=eebda3f511a444e7b56ff65625cdb6646cd3d88a;hpb=a4e95b7b4327362aa1b8ca699e181e26cb0c6b3e;p=libfirm

diff --git a/ir/ir/irgwalk.c b/ir/ir/irgwalk.c
index eebda3f51..ceba7511f 100644
--- a/ir/ir/irgwalk.c
+++ b/ir/ir/irgwalk.c
@@ -32,7 +32,7 @@
 #include "irprog.h"
 #include "irgwalk.h"
 #include "typewalk.h"
-#include "firmstat.h"
+#include "irhooks.h"
 #include "ircgcons.h"
 
 #include "eset.h"
@@ -116,7 +116,7 @@ static void irg_walk_cg(ir_node * node, unsigned long visited, eset * irg_set,
  * Insert all ir_graphs in irg_set, that are (transitive) reachable.
  */
 static void collect_irgs(ir_node * node, eset * irg_set) {
-  if (get_irn_op(node) == op_Call) {
+  if (is_Call(node)) {
     int i;
     for (i = get_Call_n_callees(node) - 1; i >= 0; --i) {
       entity * ent = get_Call_callee(node, i);
@@ -131,10 +131,14 @@ static void collect_irgs(ir_node * node, eset * irg_set) {
 
 /**
  * specialized version of irg_walk_2, called if only pre callback exists
+ *
+ * @return number of visited nodes
  */
-static void
+static unsigned
 irg_walk_2_pre(ir_node *node, irg_walk_func *pre, void * env) {
   int i;
+  unsigned cnt = 1;
+
   set_irn_visited(node, current_ir_graph->visited);
 
   pre(node, env);
@@ -142,43 +146,54 @@ irg_walk_2_pre(ir_node *node, irg_walk_func *pre, void * env) {
   if (node->op != op_Block) {
     ir_node *pred = get_irn_n(node, -1);
     if (pred->visited < current_ir_graph->visited)
-      irg_walk_2_pre(pred, pre, env);
+      cnt += irg_walk_2_pre(pred, pre, env);
   }
   for (i = get_irn_arity(node) - 1; i >= 0; --i) {
     ir_node *pred = get_irn_n(node, i);
     if (pred->visited < current_ir_graph->visited)
-      irg_walk_2_pre(pred, pre, env);
+      cnt += irg_walk_2_pre(pred, pre, env);
   }
+  return cnt;
 }
 
 /**
  * specialized version of irg_walk_2, called if only post callback exists
+ *
+ * @return number of visited nodes
  */
-static void
+static unsigned
 irg_walk_2_post(ir_node *node, irg_walk_func *post, void * env) {
   int i;
+  unsigned cnt = 1;
+
   set_irn_visited(node, current_ir_graph->visited);
 
   if (node->op != op_Block) {
     ir_node *pred = get_irn_n(node, -1);
     if (pred->visited < current_ir_graph->visited)
-      irg_walk_2_post(pred, post, env);
+      cnt += irg_walk_2_post(pred, post, env);
   }
   for (i = get_irn_arity(node) - 1; i >= 0; --i) {
     ir_node *pred = get_irn_n(node, i);
     if (pred->visited < current_ir_graph->visited)
-      irg_walk_2_post(pred, post, env);
+      cnt += irg_walk_2_post(pred, post, env);
   }
 
   post(node, env);
+
+  return cnt;
 }
 
 /**
  * specialized version of irg_walk_2, called if pre and post callbacks exist
+ *
+ * @return number of visited nodes
  */
-static void
+static unsigned
 irg_walk_2_both(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * env) {
   int i;
+  unsigned cnt = 1;
+
   set_irn_visited(node, current_ir_graph->visited);
 
   pre(node, env);
@@ -186,36 +201,44 @@ irg_walk_2_both(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * e
   if (node->op != op_Block) {
     ir_node *pred = get_irn_n(node, -1);
     if (pred->visited < current_ir_graph->visited)
-      irg_walk_2_both(pred, pre, post, env);
+      cnt += irg_walk_2_both(pred, pre, post, env);
   }
   for (i = get_irn_arity(node) - 1; i >= 0; --i) {
     ir_node *pred = get_irn_n(node, i);
     if (pred->visited < current_ir_graph->visited)
-      irg_walk_2_both(pred, pre, post, env);
+      cnt += irg_walk_2_both(pred, pre, post, env);
   }
 
   post(node, env);
+
+  return cnt;
 }
 
 /**
  * Intraprozedural graph walker.
+ *
+ * @return number of visited nodes
  */
-static void
+static unsigned
 irg_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * env)
 {
   if (node->visited < current_ir_graph->visited) {
-    if      (!post) irg_walk_2_pre (node, pre, env);
-    else if (!pre)  irg_walk_2_post(node, post, env);
-    else            irg_walk_2_both(node, pre, post, env);
+    if      (!post) return irg_walk_2_pre (node, pre, env);
+    else if (!pre)  return irg_walk_2_post(node, post, env);
+    else            return irg_walk_2_both(node, pre, post, env);
   }
+  return 0;
 }
 
+/* a counter */
+static unsigned nodes_touched = 0;
+
 /*
  * generic graph walker
  */
 void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
 {
-  assert(node  && node->kind==k_ir_node);
+  assert(is_ir_node(node));
 
   if (get_interprocedural_view()) {
     eset * irg_set = eset_create();
@@ -223,10 +246,10 @@ void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
     ir_graph * irg;
     assert(get_irp_ip_view_state() == ip_view_valid);
 
-    set_interprocedural_view(false);
+    set_interprocedural_view(0);
     eset_insert(irg_set, current_ir_graph);
     irg_walk(node, (irg_walk_func *) collect_irgs, NULL, irg_set);
-    set_interprocedural_view(true);
+    set_interprocedural_view(1);
     visited = get_max_irg_visited() + 1;
     for (irg = eset_first(irg_set); irg; irg = eset_next(irg_set)) {
       set_irg_visited(irg, visited);
@@ -235,7 +258,7 @@ void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
     eset_destroy(irg_set);
   } else {
     inc_irg_visited(current_ir_graph);
-    irg_walk_2(node, pre, post, env);
+    nodes_touched = irg_walk_2(node, pre, post, env);
   }
   return;
 }
@@ -246,9 +269,10 @@ void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
 void irg_walk_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env) {
   ir_graph * rem = current_ir_graph;
 
-  stat_irg_walk(irg, (void *)pre, (void *)post);
+  hook_irg_walk(irg, (generic_func *)pre, (generic_func *)post);
   current_ir_graph = irg;
   irg_walk(get_irg_end(irg), pre, post, env);
+  irg->estimated_node_count = nodes_touched;
   current_ir_graph = rem;
 }
 
@@ -271,8 +295,10 @@ void all_irg_walk(irg_walk_func *pre, irg_walk_func *post, void *env) {
 
 /***************************************************************************/
 
-/* Returns current_ir_graph and sets it to the irg of predecessor index
-   of node n. */
+/**
+ * Returns current_ir_graph and sets it to the irg of predecessor index
+ * of node n.
+ */
 static INLINE ir_graph *
 switch_irg (ir_node *n, int index) {
   ir_graph *old_current = current_ir_graph;
@@ -325,7 +351,7 @@ void cg_walk(irg_walk_func *pre, irg_walk_func *post, void *env) {
   ir_graph *rem = current_ir_graph;
   int rem_view = get_interprocedural_view();
 
-  set_interprocedural_view(true);
+  set_interprocedural_view(1);
 
   inc_max_irg_visited();
   /* Fix all irg_visited flags */
@@ -399,8 +425,8 @@ static void irg_block_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *p
 {
   int i;
 
-  if(get_Block_block_visited(node) < get_irg_block_visited(current_ir_graph)) {
-    set_Block_block_visited(node, get_irg_block_visited(current_ir_graph));
+  if (Block_not_block_visited(node)) {
+    mark_Block_block_visited(node);
 
     if(pre) pre(node, env);
 
@@ -430,14 +456,14 @@ void irg_block_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void
   ir_node *block, *pred;
   int i;
 
-  stat_irg_block_walk(current_ir_graph, node, (void *)pre, (void *)post);
+  hook_irg_block_walk(current_ir_graph, node, (generic_func *)pre, (generic_func *)post);
 
   assert(node);
   assert(!get_interprocedural_view());   /* interprocedural_view not implemented, because it
                     * interleaves with irg_walk */
   inc_irg_block_visited(current_ir_graph);
   if (is_no_Block(node)) block = get_nodes_block(node); else block = node;
-  assert(get_irn_opcode(block)  == iro_Block);
+  assert(get_irn_op(block) == op_Block);
   irg_block_walk_2(block, pre, post, env);
 
   /* keepalive: the endless loops ... */
@@ -453,9 +479,9 @@ void irg_block_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void
     for (i = 0; i < arity; i++) {
       pred = get_irn_n(node, i);
       if (get_irn_op(pred) == op_Phi) {
-	ir_node *block = get_nodes_block(pred);
+        ir_node *block = get_nodes_block(pred);
 
-	if (! is_Bad(block))
+        if (! is_Bad(block))
           irg_block_walk_2(block, pre, post, env);
       }
     }
@@ -525,8 +551,8 @@ void walk_const_code(irg_walk_func *pre, irg_walk_func *post, void *env) {
 
   /* Walk constant array bounds. */
   for (i = 0; i < get_irp_n_types(); i++) {
-    type *tp = get_irp_type(i);
-    if (is_array_type(tp)) {
+    ir_type *tp = get_irp_type(i);
+    if (is_Array_type(tp)) {
       for (j = 0; j < get_array_n_dimensions(tp); j++) {
         ir_node *n = get_array_lower_bound(tp, j);
         if (n) irg_walk(n, pre, post, env);