- removed Psi nodes, Mux nodes are used again ...

[libfirm] / ir / ir / irgwalk_blk.c

diff --git a/ir/ir/irgwalk_blk.c b/ir/ir/irgwalk_blk.c
index 0a9f10f..8d01ad3 100644 (file)
--- a/ir/ir/irgwalk_blk.c
+++ b/ir/ir/irgwalk_blk.c
@@ -1,13 +1,27 @@
 /*
- * Project:     libFIRM
- * File name:   ir/ir/irgwalk_blk.c
- * Purpose:
- * Author:      Michael Beck
- * Modified by:
- * Created:
- * CVS-ID:      $Id$
- * Copyright:   (c) 1999-2004 Universität Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
+/**
+ * @file
+ * @brief   Blockwise walker implementation
+ * @author  Michael Beck
+ * @version $Id$
  */
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -21,13 +35,19 @@
 #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;
 
 /**
@@ -203,8 +223,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)) {
@@ -234,8 +254,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);
@@ -275,8 +295,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)) {
@@ -332,22 +352,26 @@ 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);
   blk_collect_data_t blks;
-  int old_view       = get_interprocedural_view();
   block_entry_t      *entry;
 
+#ifdef INTERPROCEDURAL_VIEW
   /* switch off interprocedural view */
+  int old_view       = get_interprocedural_view();
   set_interprocedural_view(0);
+#endif
 
   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 */
+  set_using_irn_visited(irg);
   inc_irg_visited(irg);
   collect_walk(end_node, &blks);
 
@@ -367,7 +391,10 @@ do_irg_walk_blk(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *en
   del_pset(blks.blk_map);
   obstack_free(&blks.obst, NULL);
 
+#ifdef INTERPROCEDURAL_VIEW
   set_interprocedural_view(old_view);
+#endif
+  clear_using_irn_visited(irg);
 }
 
 void irg_walk_blkwise_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env)
@@ -376,6 +403,17 @@ void irg_walk_blkwise_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *po
 
   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, 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, 1);
   current_ir_graph = rem;
 }