Typo fixed.

[libfirm] / ir / ir / irgwalk.c

diff --git a/ir/ir/irgwalk.c b/ir/ir/irgwalk.c
index 8ac1ba6..5b10162 100644 (file)
--- a/ir/ir/irgwalk.c
+++ b/ir/ir/irgwalk.c
@@ -1,11 +1,11 @@
 /* Copyright (C) 1998 - 2000 by Universitaet Karlsruhe
-** All rights reserved.
-**
-** Author: Boris Boesler
-**
-** traverse an ir graph
-** - execute the pre function before recursion
-** - execute the post function after recursion
+* All rights reserved.
+*
+* Author: Boris Boesler
+*
+* traverse an ir graph
+* - execute the pre function before recursion
+* - execute the post function after recursion
 */
 
 /* $Id$ */
@@ -16,10 +16,11 @@
 
 # include <stdlib.h>
 
-# include "irnode.h"
+# include "irnode_t.h"
 # include "irgraph.h" /* visited flag */
 # include "irprog.h"
 # include "irgwalk.h"
+# include "typewalk.h"
 
 # include "eset.h"
 # include "array.h"
@@ -31,7 +32,7 @@ static void irg_walk_cg(ir_node * node, int visited, eset * irg_set,
   ir_graph * rem = current_ir_graph;
   ir_node * pred;
 
-  assert(node);
+  assert(node && node->kind==k_ir_node);
   if (get_irn_visited(node) >= visited) return;
 
   set_irn_visited(node, visited);
@@ -104,10 +105,11 @@ static void collect_irgs(ir_node * node, eset * irg_set) {
   }
 }
 
-void irg_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * env)
+static void
+irg_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * env)
 {
   int i;
-  assert(node);
+  assert(node && node->kind==k_ir_node);
 
   if (get_irn_visited(node) < get_irg_visited(current_ir_graph)) {
     set_irn_visited(node, get_irg_visited(current_ir_graph));
@@ -127,7 +129,7 @@ void irg_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * e
 
 void irg_walk(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
 {
-  assert(node);
+  assert(node  && node->kind==k_ir_node);
   if (interprocedural_view) {
     eset * irg_set = eset_create();
     int visited;
@@ -197,7 +199,8 @@ switch_irg (ir_node *n, int index) {
   return old_current;
 }
 
-void cg_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * env)
+static void
+cg_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * env)
 {
   int i;
   ir_graph *rem = NULL;
@@ -255,7 +258,7 @@ void cg_walk(irg_walk_func *pre, irg_walk_func *post, void *env) {
 /***************************************************************************/
 
 /* Walks back from n until it finds a real cf op. */
-ir_node *get_cf_op(ir_node *n) {
+static ir_node *get_cf_op(ir_node *n) {
   ir_node *pred;
 
   n = skip_nop(n);
@@ -268,7 +271,7 @@ ir_node *get_cf_op(ir_node *n) {
   return skip_Proj(n);
 }
 
-void irg_block_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
+static void irg_block_walk_2(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void *env)
 {
   int i;
   assert(get_irn_opcode(node) == iro_Block);
@@ -334,13 +337,13 @@ void irg_block_walk_graph(ir_graph *irg, irg_walk_func *pre,
 /********************************************************************/
 
 typedef struct walk_env {
-  void *pre;
-  void *post;
+  irg_walk_func *pre;
+  irg_walk_func *post;
   void *env;
 } walk_env;
 
 /* Walk to all constant expressions in this entity. */
-void walk_entity(entity *ent, void *env) {
+static void walk_entity(entity *ent, void *env) {
   walk_env *my_env = (walk_env *)env;
   if (get_entity_variability(ent) != uninitialized) {
     if (is_atomic_entity(ent)) {
@@ -422,11 +425,6 @@ void walk_const_code(irg_walk_func *pre, irg_walk_func *post, void *env) {
 /** }                                                              **/
 /********************************************************************/
 
-/* Allocates some necessary datastructures. */
-void init_ip_walk ();
-/* Frees some necessary datastructures. */
-void finish_ip_walk();
-
 /* Call for i in {0|-1 ... get_irn_arity(n)}.
    If n is a conventional node returns the same node as get_irn_n(n, i).
    If the predecessors of n are in the callee of the procedure n belongs
@@ -513,13 +511,13 @@ ir_node * pop_callsite(ir_graph *callee) {
 
 /* Initialization routines ******************************************/
 
-void init_ip_walk () {
+void init_ip_walk (void) {
   int i;
   for (i = 0; i < get_irp_n_irgs(); i++)
     new_callsite_stack(get_irp_irg(i));
 }
 
-void finish_ip_walk() {
+void finish_ip_walk(void) {
   int i;
   for (i = 0; i < get_irp_n_irgs(); i++)
     free_callsite_stack(get_irp_irg(i));