X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgwalk_blk.c;h=0de8e96136327b5fcf0d867334cb7ff5879ab72c;hb=68cc2e78ca8ad2e8ab0d473ac7cebdad14f64bd1;hp=868c533a57502615363be03453d7a5e794cbb89f;hpb=23f114e0cd091c2cc346b127abc189723ae19f48;p=libfirm

diff --git a/ir/ir/irgwalk_blk.c b/ir/ir/irgwalk_blk.c
index 868c533a5..0de8e9613 100644
--- a/ir/ir/irgwalk_blk.c
+++ b/ir/ir/irgwalk_blk.c
@@ -19,14 +19,21 @@
 #include "pset.h"
 #include "irhooks.h"
 #include "array.h"
+#include "hashptr.h"
+
+#define _get_walk_arity(env, node) \
+	((env)->follow_deps ? get_irn_ins_or_deps((node)) : get_irn_arity((node)))
+#define _get_walk_irn_n(env, node, pos) \
+	((env)->follow_deps ? get_irn_in_or_dep((node), (pos)) : get_irn_n((node), (pos)))
 
 /**
  * Metadata for block walker
  */
 typedef struct _blk_collect_data_t {
-  struct obstack obst;        /**< obstack to allocate objects on */
-  pset           *blk_map;    /**< Hash map: Block -> List */
-  ir_node        **blk_list;  /**< the Block list */
+  struct obstack obst;            /**< obstack to allocate objects on */
+  pset           *blk_map;        /**< Hash map: Block -> List */
+  ir_node        **blk_list;      /**< the Block list */
+  unsigned       follow_deps : 1; /**< follow dependency edges */
 } blk_collect_data_t;
 
 /**
@@ -50,14 +57,6 @@ static int addr_cmp(const void *elt, const void *key) {
   return e1->block != e2->block;
 }
 
-/**
- * calculates a hash value for an block address
- * Addresses are typically aligned at 32bit, so we ignore the lowest bits
- */
-static INLINE unsigned block_hash(const ir_node *node) {
-  return (unsigned)node >> 3;
-}
-
 /**
  * Returns the associates block_entry_t for an block
  */
@@ -67,7 +66,7 @@ static block_entry_t *block_find_entry(ir_node *block, blk_collect_data_t *ctx)
   block_entry_t *elem;
 
   key.block = block;
-  elem = pset_find(ctx->blk_map, &key, block_hash(block));
+  elem = pset_find(ctx->blk_map, &key, HASH_PTR(block));
   if (elem)
     return elem;
 
@@ -79,7 +78,7 @@ static block_entry_t *block_find_entry(ir_node *block, blk_collect_data_t *ctx)
   elem->cf_list    = NEW_ARR_F(ir_node *, 0);
   elem->entry_list = NEW_ARR_F(ir_node *, 0);
 
-  return pset_insert(ctx->blk_map, elem, block_hash(block));
+  return pset_insert(ctx->blk_map, elem, HASH_PTR(block));
 }
 
 /**
@@ -210,8 +209,8 @@ static void collect_walk(ir_node *node, blk_collect_data_t *env)
 
   if (node->op == op_Block) {
     /* predecessors of a block are control flow nodes */
-    for (i = get_irn_arity(node) - 1; i >= 0; --i) {
-      ir_node *pred = get_irn_n(node, i);
+    for (i = _get_walk_arity(env, node) - 1; i >= 0; --i) {
+      ir_node *pred = _get_walk_irn_n(env, node, i);
       ir_node *blk  = get_nodes_block(pred);
 
       if (irn_not_visited(pred)) {
@@ -241,8 +240,8 @@ static void collect_walk(ir_node *node, blk_collect_data_t *env)
       collect_walk(block, env);
 
     is_phi = is_Phi(node);
-    for (i = get_irn_arity(node) - 1; i >= 0; --i) {
-      ir_node *pred = get_irn_n(node, i);
+    for (i = _get_walk_arity(env, node) - 1; i >= 0; --i) {
+      ir_node *pred = _get_walk_irn_n(env, node, i);
 
       if (irn_not_visited(pred)) {
         collect_walk(pred, env);
@@ -282,8 +281,8 @@ static void collect_blks_lists(ir_node *node, ir_node *block,
    * "outside".
    */
   if (! is_Phi(node)) {
-    for (i = get_irn_arity(node) - 1; i >= 0; --i) {
-      ir_node *pred = get_irn_n(node, i);
+    for (i = _get_walk_arity(env, node) - 1; i >= 0; --i) {
+      ir_node *pred = _get_walk_irn_n(env, node, i);
 
       /* BEWARE: predecessors of End nodes might be blocks */
       if (is_no_Block(pred)) {
@@ -339,7 +338,7 @@ static void collect_lists(blk_collect_data_t *env)
  * Intraprozedural graph walker over blocks.
  */
 static void
-do_irg_walk_blk(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env)
+do_irg_walk_blk(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env, unsigned follow_deps)
 {
   ir_node            *end_node = get_irg_end(irg);
   ir_node            *end_blk = get_irg_end_block(irg);
@@ -347,12 +346,16 @@ do_irg_walk_blk(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *en
   int old_view       = get_interprocedural_view();
   block_entry_t      *entry;
 
+  assert(! inside_irg_walk(irg)); /* we must not already be inside an irg walk */
+  set_inside_irg_walk(irg);
+
   /* switch off interprocedural view */
-  set_interprocedural_view(false);
+  set_interprocedural_view(0);
 
   obstack_init(&blks.obst);
-  blks.blk_map  = new_pset(addr_cmp, 1);
-  blks.blk_list = NEW_ARR_F(ir_node *, 0);
+  blks.blk_map     = new_pset(addr_cmp, 1);
+  blks.blk_list    = NEW_ARR_F(ir_node *, 0);
+  blks.follow_deps = follow_deps != 0;
 
   /* first step: traverse the graph and fill the lists */
   inc_irg_visited(irg);
@@ -375,14 +378,26 @@ do_irg_walk_blk(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *en
   obstack_free(&blks.obst, NULL);
 
   set_interprocedural_view(old_view);
+  clear_inside_irg_walk(irg);
 }
 
 void irg_walk_blkwise_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env)
 {
   ir_graph * rem = current_ir_graph;
 
-  hook_irg_walk_blkwise(irg, (void *)pre, (void *)post);
+  hook_irg_walk_blkwise(irg, (generic_func *)pre, (generic_func *)post);
+  current_ir_graph = irg;
+  do_irg_walk_blk(irg, pre, post, env, 0);
+  current_ir_graph = rem;
+}
+
+
+void irg_walk_in_or_dep_blkwise_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env)
+{
+  ir_graph * rem = current_ir_graph;
+
+  hook_irg_walk_blkwise(irg, (generic_func *)pre, (generic_func *)post);
   current_ir_graph = irg;
-  do_irg_walk_blk(irg, pre, post, env);
+  do_irg_walk_blk(irg, pre, post, env, 1);
   current_ir_graph = rem;
 }