X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgwalk.c;h=e34402d587528d3da2551122512b4f3f9aa5e9b4;hb=346dfddce9be4420855b06ea40d2bf21dad9bc88;hp=058b1c6f246d3fcd1fcc7392036e41297136ced8;hpb=01301d705420c1c44e5b2a833b6bf665bb7fc723;p=libfirm

diff --git a/ir/ir/irgwalk.c b/ir/ir/irgwalk.c
index 058b1c6f2..e34402d58 100644
--- a/ir/ir/irgwalk.c
+++ b/ir/ir/irgwalk.c
@@ -34,7 +34,10 @@
 #include "eset.h"
 #include "array.h"
 
-/* walk over an interprocedural graph (callgraph). Visits only graphs in irg_set. */
+/**
+ * Walk over an interprocedural graph (callgraph).
+ * Visits only graphs in irg_set.
+ */
 static void irg_walk_cg(ir_node * node, int visited, eset * irg_set,
                         irg_walk_func *pre, irg_walk_func *post, void * env) {
   int i;
@@ -105,13 +108,15 @@ static void irg_walk_cg(ir_node * node, int visited, eset * irg_set,
 }
 
 
-/* Insert all ir_graphs in irg_set, that are (transitive) reachable. */
+/**
+ * Insert all ir_graphs in irg_set, that are (transitive) reachable.
+ */
 static void collect_irgs(ir_node * node, eset * irg_set) {
   if (get_irn_op(node) == op_Call) {
     int i;
     for (i = get_Call_n_callees(node) - 1; i >= 0; --i) {
       entity * ent = get_Call_callee(node, i);
-      ir_graph * irg = ent ? get_entity_irg(ent) : NULL;
+      ir_graph * irg = get_entity_irg(ent);
       if (irg && !eset_contains(irg_set, irg)) {
         eset_insert(irg_set, irg);
         irg_walk_graph(irg, (irg_walk_func *) collect_irgs, NULL, irg_set);
@@ -208,16 +213,16 @@ void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
 {
   assert(node  && node->kind==k_ir_node);
 
-  if (interprocedural_view) {
+  if (get_interprocedural_view()) {
     eset * irg_set = eset_create();
     int visited;
     ir_graph * irg;
     assert(get_irp_ip_view_state() == ip_view_valid);
 
-    interprocedural_view = false;
+    set_interprocedural_view(false);
     eset_insert(irg_set, current_ir_graph);
     irg_walk(node, (irg_walk_func *) collect_irgs, NULL, irg_set);
-    interprocedural_view = true;
+    set_interprocedural_view(true);
     visited = get_max_irg_visited() + 1;
     for (irg = eset_first(irg_set); irg; irg = eset_next(irg_set)) {
       set_irg_visited(irg, visited);
@@ -231,7 +236,9 @@ void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
   return;
 }
 
-
+/*
+ * 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;
 
@@ -266,14 +273,14 @@ static INLINE ir_graph *
 switch_irg (ir_node *n, int index) {
   ir_graph *old_current = current_ir_graph;
 
-  if (interprocedural_view) {
+  if (get_interprocedural_view()) {
     /* Only Filter and Block nodes can have predecessors in other graphs. */
     if (get_irn_op(n) == op_Filter)
       n = get_nodes_block(n);
     if (get_irn_op(n) == op_Block) {
       ir_node *cfop = skip_Proj(get_Block_cfgpred(n, index));
       if (is_ip_cfop(cfop)) {
-    current_ir_graph = get_irn_irg(cfop);
+        current_ir_graph = get_irn_irg(cfop);
       }
     }
   }
@@ -312,9 +319,9 @@ cg_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * env)
 void cg_walk(irg_walk_func *pre, irg_walk_func *post, void *env) {
   int i;
   ir_graph *rem = current_ir_graph;
-  int rem_view = interprocedural_view;
+  int rem_view = get_interprocedural_view();
 
-  interprocedural_view = true;
+  set_interprocedural_view(true);
 
   inc_max_irg_visited();
   /* Fix all irg_visited flags */
@@ -363,7 +370,7 @@ void cg_walk(irg_walk_func *pre, irg_walk_func *post, void *env) {
     }
   }
 
-  interprocedural_view = rem_view;
+  set_interprocedural_view(rem_view);
   current_ir_graph = rem;
 }
 
@@ -422,7 +429,7 @@ void irg_block_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void
   stat_irg_block_walk(current_ir_graph, node, (void *)pre, (void *)post);
 
   assert(node);
-  assert(!interprocedural_view);   /* interprocedural_view not implemented, because it
+  assert(!get_interprocedural_view());   /* interprocedural_view not implemented, because it
                     * interleaves with irg_walk */
   inc_irg_block_visited(current_ir_graph);
   if (is_no_Block(node)) block = get_nodes_block(node); else block = node;
@@ -453,7 +460,9 @@ void irg_block_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void
   return;
 }
 
-
+/*
+ * walk over a graph block wise
+ */
 void irg_block_walk_graph(ir_graph *irg, irg_walk_func *pre,
               irg_walk_func *post, void *env) {
   ir_graph * rem = current_ir_graph;
@@ -470,7 +479,9 @@ typedef struct walk_env {
   void *env;
 } walk_env;
 
-/* Walk to all constant expressions in this entity. */
+/**
+ * Walk to all constant expressions in this entity.
+ */
 static void walk_entity(entity *ent, void *env)
 {
   walk_env *my_env = (walk_env *)env;
@@ -480,9 +491,9 @@ static void walk_entity(entity *ent, void *env)
       irg_walk(get_atomic_ent_value(ent), my_env->pre, my_env->post, my_env->env);
     }
     else {
-      int i, n = get_compound_ent_n_values(ent);
+      int i, n_vals = get_compound_ent_n_values(ent);
 
-      for (i = 0; i < n; i++)
+      for (i = 0; i < n_vals; i++)
         irg_walk(get_compound_ent_value(ent, i), my_env->pre, my_env->post, my_env->env);
     }
   }
@@ -513,11 +524,10 @@ void walk_const_code(irg_walk_func *pre, irg_walk_func *post, void *env) {
     type *tp = get_irp_type(i);
     if (is_array_type(tp)) {
       for (j = 0; j < get_array_n_dimensions(tp); j++) {
-    ir_node *n;
-    n = get_array_lower_bound(tp, j);
-    if (n) irg_walk(n, pre, post, env);
-    n = get_array_upper_bound(tp, j);
-    if (n) irg_walk(n, pre, post, env);
+        ir_node *n = get_array_lower_bound(tp, j);
+        if (n) irg_walk(n, pre, post, env);
+        n = get_array_upper_bound(tp, j);
+        if (n) irg_walk(n, pre, post, env);
       }
     }
   }