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

[libfirm] / ir / ir / irgwalk.c

diff --git a/ir/ir/irgwalk.c b/ir/ir/irgwalk.c
index af8f223..237c07c 100644 (file)
--- a/ir/ir/irgwalk.c
+++ b/ir/ir/irgwalk.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -36,12 +36,14 @@
 #endif
 
 #include "irnode_t.h"
-#include "irgraph_t.h" /* visited flag */
+#include "irgraph_t.h"
 #include "irprog.h"
 #include "irgwalk.h"
 #include "irhooks.h"
 #include "ircgcons.h"
+#include "entity_t.h"
 
+#include "error.h"
 #include "pset_new.h"
 #include "array.h"
 
@@ -153,7 +155,7 @@ irg_walk_2_pre(ir_node *node, irg_walk_func *pre, void * env) {
        pre(node, env);
 
        if (node->op != op_Block) {
-               ir_node *pred = get_nodes_block(node);
+               ir_node *pred = get_irn_n(node, -1);
                if (pred->visited < irg->visited)
                        cnt += irg_walk_2_pre(pred, pre, env);
        }
@@ -179,7 +181,7 @@ irg_walk_2_post(ir_node *node, irg_walk_func *post, void * env) {
        set_irn_visited(node, irg->visited);
 
        if (node->op != op_Block) {
-               ir_node *pred = get_nodes_block(node);
+               ir_node *pred = get_irn_n(node, -1);
                if (pred->visited < irg->visited)
                        cnt += irg_walk_2_post(pred, post, env);
        }
@@ -210,7 +212,7 @@ irg_walk_2_both(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * e
        pre(node, env);
 
        if (node->op != op_Block) {
-               ir_node *pred = get_nodes_block(node);
+               ir_node *pred = get_irn_n(node, -1);
                if (pred->visited < irg->visited)
                        cnt += irg_walk_2_both(pred, pre, post, env);
        }
@@ -251,6 +253,7 @@ void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
 {
        assert(is_ir_node(node));
 
+#ifdef INTERPROCEDURAL_VIEW
        if (get_interprocedural_view()) {
                pset_new_t           irg_set;
                pset_new_iterator_t  iter;
@@ -271,12 +274,14 @@ 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);
                pset_new_destroy(&irg_set);
        } else {
-               set_using_visited(current_ir_graph);
+#endif
+               set_using_irn_visited(current_ir_graph);
                inc_irg_visited(current_ir_graph);
                nodes_touched = irg_walk_2(node, pre, post, env);
-               clear_using_visited(current_ir_graph);
+               clear_using_irn_visited(current_ir_graph);
+#ifdef INTERPROCEDURAL_VIEW
        }
-       return;
+#endif
 }
 
 /*
@@ -323,7 +328,7 @@ irg_walk_in_or_dep_2_pre(ir_node *node, irg_walk_func *pre, void *env) {
        pre(node, env);
 
        if (node->op != op_Block) {
-               ir_node *pred = get_nodes_block(node);
+               ir_node *pred = get_irn_n(node, -1);
                if (pred->visited < irg->visited)
                        cnt += irg_walk_in_or_dep_2_pre(pred, pre, env);
        }
@@ -349,7 +354,7 @@ irg_walk_in_or_dep_2_post(ir_node *node, irg_walk_func *post, void *env) {
        set_irn_visited(node, irg->visited);
 
        if (node->op != op_Block) {
-               ir_node *pred = get_nodes_block(node);
+               ir_node *pred = get_irn_n(node, -1);
                if (pred->visited < irg->visited)
                        cnt += irg_walk_in_or_dep_2_post(pred, post, env);
        }
@@ -380,7 +385,7 @@ irg_walk_in_or_dep_2_both(ir_node *node, irg_walk_func *pre, irg_walk_func *post
        pre(node, env);
 
        if (node->op != op_Block) {
-               ir_node *pred = get_nodes_block(node);
+               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);
        }
@@ -421,12 +426,11 @@ void irg_walk_in_or_dep(ir_node *node, irg_walk_func *pre, irg_walk_func *post,
        if (get_interprocedural_view()) {
                assert(0 && "This is not yet implemented.");
        } else {
-               set_using_visited(current_ir_graph);
+               set_using_irn_visited(current_ir_graph);
                inc_irg_visited(current_ir_graph);
                nodes_touched = irg_walk_in_or_dep_2(node, pre, post, env);
-               clear_using_visited(current_ir_graph);
+               clear_using_irn_visited(current_ir_graph);
        }
-       return;
 }
 
 /*
@@ -490,10 +494,9 @@ cg_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * env)
 
                if (post) post(node, env);
        }
-       return;
 }
 
-
+#ifdef INTERPROCEDURAL_VIEW
 /* Walks all irgs in interprocedural view.  Visits each node only once. */
 void cg_walk(irg_walk_func *pre, irg_walk_func *post, void *env) {
        int i;
@@ -552,21 +555,19 @@ void cg_walk(irg_walk_func *pre, irg_walk_func *post, void *env) {
        set_interprocedural_view(rem_view);
        current_ir_graph = rem;
 }
+#endif
 
 
 /***************************************************************************/
 
 /* Walks back from n until it finds a real cf op. */
 static ir_node *get_cf_op(ir_node *n) {
-       ir_node *pred;
-
-       n = skip_Id(n);
-       n = skip_Tuple(n);
-       pred = skip_Proj(n);
-       if (!(is_cfop(pred) || is_fragile_op(pred) || is_Bad(pred)))
-               n = get_cf_op(n);
-
-       return skip_Proj(n);
+       while (!is_cfop(n) && !is_fragile_op(n) && !is_Bad(n)) {
+               n = skip_Id(n);
+               n = skip_Tuple(n);
+               n = skip_Proj(n);
+       }
+       return n;
 }
 
 static void irg_block_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
@@ -670,6 +671,29 @@ typedef struct walk_env {
        void *env;
 } walk_env;
 
+static void walk_initializer(ir_initializer_t *initializer, walk_env *env)
+{
+       switch(initializer->kind) {
+    case IR_INITIALIZER_CONST:
+       irg_walk(initializer->consti.value, env->pre, env->post, env->env);
+        return;
+    case IR_INITIALIZER_TARVAL:
+    case IR_INITIALIZER_NULL:
+        return;
+
+    case IR_INITIALIZER_COMPOUND: {
+        size_t i;
+        for(i = 0; i < initializer->compound.n_initializers; ++i) {
+            ir_initializer_t *subinitializer
+                = initializer->compound.initializers[i];
+            walk_initializer(subinitializer, env);
+        }
+        return;
+    }
+       }
+       panic("invalid initializer found");
+}
+
 /**
  * Walk to all constant expressions in this entity.
  */
@@ -678,7 +702,9 @@ static void walk_entity(ir_entity *ent, void *env)
        walk_env *my_env = (walk_env *)env;
 
        if (get_entity_variability(ent) != variability_uninitialized) {
-               if (is_atomic_entity(ent)) {
+               if (ent->has_initializer) {
+                       walk_initializer(ent->attr.initializer, my_env);
+               } else if (is_atomic_entity(ent)) {
                        irg_walk(get_atomic_ent_value(ent), my_env->pre, my_env->post, my_env->env);
                } else {
                        int i, n_vals = get_compound_ent_n_values(ent);