X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgwalk_blk.c;h=c5b022f0bb21f62dcf5dedfe3b182b3614073dfd;hb=bb5c6d5ce2e35c4074900017f8c8e1a4935054d0;hp=0de8e96136327b5fcf0d867334cb7ff5879ab72c;hpb=e66f1a09b0571c6982fb221ee13cf2417e00e874;p=libfirm

diff --git a/ir/ir/irgwalk_blk.c b/ir/ir/irgwalk_blk.c
index 0de8e9613..c5b022f0b 100644
--- 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"
@@ -213,7 +227,7 @@ static void collect_walk(ir_node *node, blk_collect_data_t *env)
       ir_node *pred = _get_walk_irn_n(env, node, i);
       ir_node *blk  = get_nodes_block(pred);
 
-      if (irn_not_visited(pred)) {
+      if (!irn_visited(pred)) {
         collect_walk(pred, env);
 
         /* control flow predecessors are always block inputs */
@@ -236,14 +250,14 @@ static void collect_walk(ir_node *node, blk_collect_data_t *env)
   else {
     block = get_nodes_block(node);
 
-    if (irn_not_visited(block))
+    if (!irn_visited(block))
       collect_walk(block, env);
 
     is_phi = is_Phi(node);
     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)) {
+      if (!irn_visited(pred)) {
         collect_walk(pred, env);
 
       /* BEWARE: predecessors of End nodes might be blocks */
@@ -288,7 +302,7 @@ static void collect_blks_lists(ir_node *node, ir_node *block,
       if (is_no_Block(pred)) {
         ir_node *blk  = get_nodes_block(pred);
 
-        if (irn_not_visited(pred)) {
+        if (!irn_visited(pred)) {
           if (block != blk)
             continue;
           collect_blks_lists(pred, block, entry, env);
@@ -343,14 +357,13 @@ do_irg_walk_blk(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *en
   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;
 
-  assert(! inside_irg_walk(irg)); /* we must not already be inside an irg walk */
-  set_inside_irg_walk(irg);
-
+#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);
@@ -358,6 +371,7 @@ do_irg_walk_blk(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *en
   blks.follow_deps = follow_deps != 0;
 
   /* first step: traverse the graph and fill the lists */
+  ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
   inc_irg_visited(irg);
   collect_walk(end_node, &blks);
 
@@ -377,8 +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);
-  clear_inside_irg_walk(irg);
+#endif
+  ir_free_resources(irg, IR_RESOURCE_IRN_VISITED);
 }
 
 void irg_walk_blkwise_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env)