X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgwalk.c;h=376e2eae8b12fa4d3d5f5d80f9665f226e2665b6;hb=3d61544bd177bdb8c880ee87f5cdad2b7d1606e5;hp=df0af385d2a75bb7b58ea528cb61d157cfd17445;hpb=1e61d6d6eb14c93df7bd5449e33ccfd40ef92b8a;p=libfirm

diff --git a/ir/ir/irgwalk.c b/ir/ir/irgwalk.c
index df0af385d..376e2eae8 100644
--- a/ir/ir/irgwalk.c
+++ b/ir/ir/irgwalk.c
@@ -21,7 +21,6 @@
  * @file
  * @brief   Functions for traversing ir graphs
  * @author  Boris Boesler, Goetz Lindenmaier, Michael Beck
- * @version $Id$
  * @brief
  *  traverse an ir graph
  *  - execute the pre function before recursion
@@ -37,6 +36,7 @@
 #include "irgwalk.h"
 #include "irhooks.h"
 #include "entity_t.h"
+#include "ircons.h"
 
 #include "error.h"
 #include "pset_new.h"
@@ -131,11 +131,6 @@ static unsigned irg_walk_2_both(ir_node *node, irg_walk_func *pre,
 	return cnt;
 }
 
-/**
- * Intraprozedural graph walker.
- *
- * @return number of visited nodes
- */
 unsigned irg_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
                     void *env)
 {
@@ -171,9 +166,6 @@ void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
 	current_ir_graph = rem;
 }
 
-/*
- * walk over a graph
- */
 void irg_walk_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env)
 {
 	ir_graph * rem = current_ir_graph;
@@ -185,9 +177,6 @@ void irg_walk_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void
 	current_ir_graph = rem;
 }
 
-/* Executes irg_walk(end, pre, post, env) for all irgraphs in irprog.
-   Sets current_ir_graph properly for each walk.  Conserves current
-   current_ir_graph. */
 void all_irg_walk(irg_walk_func *pre, irg_walk_func *post, void *env)
 {
 	size_t i, n;
@@ -199,8 +188,6 @@ 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
  *
@@ -304,9 +291,6 @@ static unsigned irg_walk_in_or_dep_2(ir_node *node, irg_walk_func *pre, irg_walk
 	else             return irg_walk_in_or_dep_2_both(node, pre, post, env);
 }
 
-/*
- * 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));
@@ -317,9 +301,6 @@ void irg_walk_in_or_dep(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
 	ir_free_resources(current_ir_graph, IR_RESOURCE_IRN_VISITED);
 }
 
-/*
- * 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;
@@ -331,8 +312,6 @@ void irg_walk_in_or_dep_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *
 	current_ir_graph = rem;
 }
 
-/***************************************************************************/
-
 /* Walks back from n until it finds a real cf op. */
 static ir_node *get_cf_op(ir_node *n)
 {
@@ -372,9 +351,6 @@ static void irg_block_walk_2(ir_node *node, irg_walk_func *pre,
 		post(node, env);
 }
 
-
-/* walks only over Block nodes in the graph.  Has its own visited
-   flag, so that it can be interleaved with the other walker.         */
 void irg_block_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
                     void *env)
 {
@@ -393,12 +369,7 @@ void irg_block_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
 		int i;
 		for (i = 0; i < arity; i++) {
 			ir_node *pred = get_irn_n(node, i);
-			if (!is_Block(pred)) {
-				pred = get_nodes_block(pred);
-			}
-			/* this walker is also used during optimize_graph_df where we can
-			 * temporarily have Bad as block inputs */
-			if (is_Bad(pred))
+			if (!is_Block(pred))
 				continue;
 			irg_block_walk_2(pred, pre, post, env);
 		}
@@ -407,9 +378,6 @@ void irg_block_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
 	ir_free_resources(irg, IR_RESOURCE_BLOCK_VISITED);
 }
 
-/*
- * walk over a graph block wise
- */
 void irg_block_walk_graph(ir_graph *irg, irg_walk_func *pre,
                           irg_walk_func *post, void *env)
 {
@@ -419,22 +387,19 @@ void irg_block_walk_graph(ir_graph *irg, irg_walk_func *pre,
 	current_ir_graph = rem;
 }
 
-/*
- * Additionally walk over all anchors. Do NOT increase the visit flag.
- */
 void irg_walk_anchors(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env)
 {
 	ir_graph * rem = current_ir_graph;
 	current_ir_graph = irg;
 
+	ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
 	inc_irg_visited(irg);
 	irg_walk_2(irg->anchor, pre, post, env);
+	ir_free_resources(irg, IR_RESOURCE_IRN_VISITED);
 
 	current_ir_graph = rem;
 }
 
-/********************************************************************/
-
 typedef struct walk_env {
 	irg_walk_func *pre;
 	irg_walk_func *post;
@@ -473,15 +438,9 @@ static void walk_entity(ir_entity *ent, void *env)
 
 	if (ent->initializer != NULL) {
 		walk_initializer(ent->initializer, my_env);
-	} else if (entity_has_compound_ent_values(ent)) {
-		size_t i, n_vals = get_compound_ent_n_values(ent);
-
-		for (i = 0; i < n_vals; i++)
-			irg_walk(get_compound_ent_value(ent, i), my_env->pre, my_env->post, my_env->env);
 	}
 }
 
-/* Walks over all code in const_code_irg. */
 void walk_const_code(irg_walk_func *pre, irg_walk_func *post, void *env)
 {
 	walk_env my_env;