X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgwalk.c;h=56a53c56b138351bb4832501ffea38db1ea2e5ed;hb=0952881a2714f8ec2e87a6f4829bd55f41a0c68d;hp=35abd5b48fc4facd1b4d354219141dc038db3ccd;hpb=559372dcf2e6712ce1b8a26d64c308f15b7491de;p=libfirm

diff --git a/ir/ir/irgwalk.c b/ir/ir/irgwalk.c
index 35abd5b48..56a53c56b 100644
--- a/ir/ir/irgwalk.c
+++ b/ir/ir/irgwalk.c
@@ -3,10 +3,10 @@
  * File name:   ir/ir/irgwalk.c
  * Purpose:
  * Author:      Boris Boesler
- * Modified by: Goetz Lindenmaier
+ * Modified by: Goetz Lindenmaier, Michael Beck
  * Created:
  * CVS-ID:      $Id$
- * Copyright:   (c) 1999-2003 Universität Karlsruhe
+ * Copyright:   (c) 1999-20036Universität Karlsruhe
  * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
  */
 
@@ -119,7 +119,7 @@ static void collect_irgs(ir_node * node, eset * irg_set) {
   if (is_Call(node)) {
     int i;
     for (i = get_Call_n_callees(node) - 1; i >= 0; --i) {
-      entity * ent = get_Call_callee(node, i);
+      ir_entity * ent = get_Call_callee(node, i);
       ir_graph * irg = get_entity_irg(ent);
       if (irg && !eset_contains(irg_set, irg)) {
         eset_insert(irg_set, irg);
@@ -138,19 +138,20 @@ static unsigned
 irg_walk_2_pre(ir_node *node, irg_walk_func *pre, void * env) {
   int i;
   unsigned cnt = 1;
+  ir_graph *irg = current_ir_graph;
 
-  set_irn_visited(node, current_ir_graph->visited);
+  set_irn_visited(node, irg->visited);
 
   pre(node, env);
 
   if (node->op != op_Block) {
     ir_node *pred = get_irn_n(node, -1);
-    if (pred->visited < current_ir_graph->visited)
+    if (pred->visited < irg->visited)
       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)
+    if (pred->visited < irg->visited)
       cnt += irg_walk_2_pre(pred, pre, env);
   }
   return cnt;
@@ -165,17 +166,18 @@ static unsigned
 irg_walk_2_post(ir_node *node, irg_walk_func *post, void * env) {
   int i;
   unsigned cnt = 1;
+  ir_graph *irg = current_ir_graph;
 
-  set_irn_visited(node, current_ir_graph->visited);
+  set_irn_visited(node, irg->visited);
 
   if (node->op != op_Block) {
     ir_node *pred = get_irn_n(node, -1);
-    if (pred->visited < current_ir_graph->visited)
+    if (pred->visited < irg->visited)
       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)
+    if (pred->visited < irg->visited)
       cnt += irg_walk_2_post(pred, post, env);
   }
 
@@ -193,19 +195,20 @@ static unsigned
 irg_walk_2_both(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * env) {
   int i;
   unsigned cnt = 1;
+  ir_graph *irg = current_ir_graph;
 
-  set_irn_visited(node, current_ir_graph->visited);
+  set_irn_visited(node, irg->visited);
 
   pre(node, env);
 
   if (node->op != op_Block) {
     ir_node *pred = get_irn_n(node, -1);
-    if (pred->visited < current_ir_graph->visited)
+    if (pred->visited < irg->visited)
       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)
+    if (pred->visited < irg->visited)
       cnt += irg_walk_2_both(pred, pre, post, env);
   }
 
@@ -257,8 +260,11 @@ void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
     irg_walk_cg(node, visited, irg_set, pre, post, env);
     eset_destroy(irg_set);
   } else {
+    assert(! inside_irg_walk(current_ir_graph)); /* we must not already be inside an irg walk */
+    set_inside_irg_walk(current_ir_graph);
     inc_irg_visited(current_ir_graph);
     nodes_touched = irg_walk_2(node, pre, post, env);
+    clear_inside_irg_walk(current_ir_graph);
   }
   return;
 }
@@ -295,6 +301,144 @@ void all_irg_walk(irg_walk_func *pre, irg_walk_func *post, void *env) {
 
 /***************************************************************************/
 
+/**
+ * specialized version of irg_walk_in_or_dep_2, called if only pre callback exists
+ *
+ * @return number of visited nodes
+ */
+static unsigned
+irg_walk_in_or_dep_2_pre(ir_node *node, irg_walk_func *pre, void *env) {
+  int i;
+  unsigned cnt = 1;
+  ir_graph *irg = current_ir_graph;
+
+  set_irn_visited(node, irg->visited);
+
+  pre(node, env);
+
+  if (node->op != op_Block) {
+    ir_node *pred = get_irn_n(node, -1);
+    if (pred->visited < irg->visited)
+      cnt += irg_walk_in_or_dep_2_pre(pred, pre, env);
+  }
+  for (i = get_irn_ins_or_deps(node) - 1; i >= 0; --i) {
+    ir_node *pred = get_irn_in_or_dep(node, i);
+    if (pred->visited < irg->visited)
+      cnt += irg_walk_in_or_dep_2_pre(pred, pre, env);
+  }
+  return cnt;
+}
+
+/**
+ * specialized version of irg_walk_in_or_dep_2, called if only post callback exists
+ *
+ * @return number of visited nodes
+ */
+static unsigned
+irg_walk_in_or_dep_2_post(ir_node *node, irg_walk_func *post, void *env) {
+  int i;
+  unsigned cnt = 1;
+  ir_graph *irg = current_ir_graph;
+
+  set_irn_visited(node, irg->visited);
+
+  if (node->op != op_Block) {
+    ir_node *pred = get_irn_n(node, -1);
+    if (pred->visited < irg->visited)
+      cnt += irg_walk_in_or_dep_2_post(pred, post, env);
+  }
+  for (i = get_irn_ins_or_deps(node) - 1; i >= 0; --i) {
+    ir_node *pred = get_irn_in_or_dep(node, i);
+    if (pred->visited < irg->visited)
+      cnt += irg_walk_in_or_dep_2_post(pred, post, env);
+  }
+
+  post(node, env);
+
+  return cnt;
+}
+
+/**
+ * specialized version of irg_walk_in_or_dep_2, called if pre and post callbacks exist
+ *
+ * @return number of visited nodes
+ */
+static unsigned
+irg_walk_in_or_dep_2_both(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env) {
+  int i;
+  unsigned cnt = 1;
+  ir_graph *irg = current_ir_graph;
+
+  set_irn_visited(node, irg->visited);
+
+  pre(node, env);
+
+  if (node->op != op_Block) {
+    ir_node *pred = get_irn_n(node, -1);
+    if (pred->visited < irg->visited)
+      cnt += irg_walk_in_or_dep_2_both(pred, pre, post, env);
+  }
+  for (i = get_irn_ins_or_deps(node) - 1; i >= 0; --i) {
+    ir_node *pred = get_irn_in_or_dep(node, i);
+    if (pred->visited < irg->visited)
+      cnt += irg_walk_in_or_dep_2_both(pred, pre, post, env);
+  }
+
+  post(node, env);
+
+  return cnt;
+}
+
+/**
+ * Intraprozedural graph walker. Follows dependency edges as well.
+ *
+ * @return number of visited nodes
+ */
+static unsigned
+irg_walk_in_or_dep_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
+{
+  if (node->visited < current_ir_graph->visited) {
+    if      (! post) return irg_walk_in_or_dep_2_pre (node, pre, env);
+    else if (! pre)  return irg_walk_in_or_dep_2_post(node, post, env);
+    else             return irg_walk_in_or_dep_2_both(node, pre, post, env);
+  }
+  return 0;
+}
+
+/*
+ * Generic graph walker. Follows dependency edges as well.
+ */
+void irg_walk_in_or_dep(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
+{
+  assert(is_ir_node(node));
+
+  if (get_interprocedural_view()) {
+	assert(0 && "This is not yet implemented.");
+  } else {
+    assert(! inside_irg_walk(current_ir_graph)); /* we must not already be inside an irg walk */
+    set_inside_irg_walk(current_ir_graph);
+    inc_irg_visited(current_ir_graph);
+    nodes_touched = irg_walk_in_or_dep_2(node, pre, post, env);
+    clear_inside_irg_walk(current_ir_graph);
+  }
+  return;
+}
+
+/*
+ * Walk over a graph. Follow all edges (including dependencies)
+ */
+void irg_walk_in_or_dep_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env) {
+  ir_graph * rem = current_ir_graph;
+
+  hook_irg_walk(irg, (generic_func *)pre, (generic_func *)post);
+  current_ir_graph = irg;
+  irg_walk_in_or_dep(get_irg_end(irg), pre, post, env);
+  irg->estimated_node_count = nodes_touched;
+  current_ir_graph = rem;
+}
+
+/***************************************************************************/
+
 /**
  * Returns current_ir_graph and sets it to the irg of predecessor index
  * of node n.
@@ -414,8 +558,7 @@ static ir_node *get_cf_op(ir_node *n) {
   n = skip_Id(n);
   n = skip_Tuple(n);
   pred = skip_Proj(n);
-  if (!(is_cfop(pred) || is_fragile_op(pred) ||
-    (get_irn_op(pred) == op_Bad)))
+  if (!(is_cfop(pred) || is_fragile_op(pred) || is_Bad(pred)))
     n = get_cf_op(n);
 
   return skip_Proj(n);
@@ -461,8 +604,10 @@ void irg_block_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void
   assert(node);
   assert(!get_interprocedural_view());   /* interprocedural_view not implemented, because it
                     * interleaves with irg_walk */
+  assert(! inside_irg_walk(current_ir_graph)); /* we must not already be in a block walk */
   inc_irg_block_visited(current_ir_graph);
-  if (is_no_Block(node)) block = get_nodes_block(node); else block = node;
+  set_inside_block_walk(current_ir_graph);
+  block = is_Block(node) ? node : get_nodes_block(node);
   assert(get_irn_op(block) == op_Block);
   irg_block_walk_2(block, pre, post, env);
 
@@ -487,6 +632,7 @@ void irg_block_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void
     }
   }
 
+  clear_inside_block_walk(current_ir_graph);
   return;
 }
 
@@ -528,7 +674,7 @@ typedef struct walk_env {
 /**
  * Walk to all constant expressions in this entity.
  */
-static void walk_entity(entity *ent, void *env)
+static void walk_entity(ir_entity *ent, void *env)
 {
   walk_env *my_env = (walk_env *)env;