X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Ftypewalk.c;h=4dcae5ac653d2f6dabe0e1187dbdbc44618ce32c;hb=ec68b2aaadb9504d101e6cbc4a58c69f3897f489;hp=9d5fb488521d3c6cf3ccddca52b50dd02e9c4624;hpb=5cd2746d8231f2855cf5844810eb85f5f86dbb5e;p=libfirm

diff --git a/ir/tr/typewalk.c b/ir/tr/typewalk.c
index 9d5fb4885..4dcae5ac6 100644
--- a/ir/tr/typewalk.c
+++ b/ir/tr/typewalk.c
@@ -19,22 +19,25 @@
 
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
+#endif
+
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
 #endif
 
-#include <stdlib.h>
 #include <stdio.h>
-#include "irgwalk.h"
-#include "irgraph_t.h"
-#include "irnode.h"
-#include "irprog.h"
-#include "type_or_entity.h"
-#include "typegmod.h"
-#include "typewalk.h"
 
-/* Make types visible to allow most efficient access */
+#include "typewalk.h"
 #include "entity_t.h"
 #include "type_t.h"
+#include "type_or_entity.h"
+#include "typegmod.h"
+
+#include "irprog_t.h"
+#include "irgraph_t.h"
+#include "irnode_t.h"
+#include "irgwalk.h"
 
 typedef struct type_walk_env {
   type_walk_func *pre;
@@ -44,9 +47,9 @@ typedef struct type_walk_env {
 
 
 static void type_walk_2(type_or_ent *tore,
-	       void (*pre)(type_or_ent*, void*),
-	       void (*post)(type_or_ent*, void*),
-	       void *env)
+			void (*pre) (type_or_ent*, void*),
+			void (*post)(type_or_ent*, void*),
+			void *env)
 {
   int i;
 
@@ -131,10 +134,12 @@ static void type_walk_2(type_or_ent *tore,
 	break;
       case tpo_primitive:
       case tpo_id:
+      case tpo_none:
+      case tpo_unknown:
 	/* a leave. */
 	break;
       default:
-	printf(" *** Faulty type! \n");
+	assert(0 && "Faulty type");
 	break;
       }
     } break; /* end case k_type */
@@ -165,8 +170,8 @@ static void start_type_walk(ir_node *node, void *env) {
 
   switch (get_irn_opcode(node)) {  /* node label */
   case iro_SymConst:
-    if (   (get_SymConst_kind(node) == type_tag)
-	   || (get_SymConst_kind(node) == size))
+    if (   (get_SymConst_kind(node) ==symconst_type_tag)
+	   || (get_SymConst_kind(node) ==symconst_size))
       type_walk_2((type_or_ent *)get_SymConst_type(node), pre, post, envi);
     break;
   case iro_Sel:
@@ -189,14 +194,11 @@ static void start_type_walk(ir_node *node, void *env) {
   }
 }
 
-void type_walk(type_walk_func *pre,
-	       type_walk_func *post,
-	       void *env) {
-  int i;
+void type_walk(type_walk_func *pre, type_walk_func *post, void *env) {
+  int i, n_types = get_irp_n_types();
+
   ++type_visited;
-  /*type_walk_2((type_or_ent *)get_glob_type(), pre, post, env);
-   global type is on the list visited below, too. */
-  for (i = 0; i < get_irp_n_types(); i++) {
+  for (i = 0; i < n_types; i++) {
     type_walk_2((type_or_ent *)get_irp_type(i), pre, post, env);
   }
   type_walk_2((type_or_ent *)get_glob_type(), pre, post, env);
@@ -230,7 +232,7 @@ void type_walk_irg (ir_graph *irg,
   ++type_visited;
   irg_walk(get_irg_end(irg), start_type_walk, NULL, &type_env);
 
-  type_walk_2((type_or_ent *)get_irg_ent(irg), pre, post, env);
+  type_walk_2((type_or_ent *)get_irg_entity(irg), pre, post, env);
 
   type_walk_2((type_or_ent *)get_irg_frame_type(irg), pre, post, env);
 
@@ -319,11 +321,11 @@ void type_walk_super2sub(
 		  void (*post)(type_or_ent*, void*),
 		  void *env)
 {
-  int i;
+  int i, n_types = get_irp_n_types();
   type *tp;
   ++type_visited;
   type_walk_s2s_2((type_or_ent *)get_glob_type(), pre, post, env);
-  for (i = 0; i < get_irp_n_types(); i++) {
+  for (i = 0; i < n_types; i++) {
     tp = get_irp_type(i);
     type_walk_s2s_2((type_or_ent *)tp, pre, post, env);
   }
@@ -408,11 +410,11 @@ void type_walk_super(
 		  void (*pre)(type_or_ent*, void*),
 		  void (*post)(type_or_ent*, void*),
 		  void *env) {
-  int i;
+  int i, n_types = get_irp_n_types();
   type *tp;
   ++type_visited;
   type_walk_super_2((type_or_ent *)get_glob_type(), pre, post, env);
-  for (i = 0; i < get_irp_n_types(); i++) {
+  for (i = 0; i < n_types; i++) {
     tp = get_irp_type(i);
     type_walk_super_2((type_or_ent *)tp, pre, post, env);
   }
@@ -456,38 +458,16 @@ class_walk_s2s_2(type *tp,
   return;
 }
 
-#if 0
 void class_walk_super2sub(
 		  void (*pre)(type*, void*),
 		  void (*post)(type*, void*),
 		  void *env)
 {
-  int i;
-  type *tp;
-
-  ++type_visited;
-  for (i = 0; i < get_irp_n_types(); i++) {
-    tp = get_irp_type(i);
-    if (is_class_type(tp) &&
-	(get_class_n_supertypes(tp) == 0) &&
-	(tp->visit < type_visited) &&
-	(!is_frame_type(tp)) &&
-	(tp != get_glob_type())) {
-      class_walk_s2s_2(tp, pre, post, env);
-    }
-  }
-}
-#endif
-void class_walk_super2sub(
-		  void (*pre)(type*, void*),
-		  void (*post)(type*, void*),
-		  void *env)
-{
-  int i;
+  int i, n_types = get_irp_n_types();
   type *tp;
 
   ++type_visited;
-  for (i = 0; i < get_irp_n_types(); i++) {
+  for (i = 0; i < n_types; i++) {
     tp = get_irp_type(i);
     if (is_class_type(tp) &&
 	(get_class_n_supertypes(tp) == 0) &&