Some access routines for visited flags in entity.h, irnode.h,

[libfirm] / ir / tr / typewalk.c

diff --git a/ir/tr/typewalk.c b/ir/tr/typewalk.c
index 1e34995..0b95917 100644 (file)
--- a/ir/tr/typewalk.c
+++ b/ir/tr/typewalk.c
@@ -9,6 +9,8 @@
 ** - execute the post function after recursion
 */
 
+/* $Id$ */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -20,9 +22,10 @@
 #include "irnode.h"
 #include "irprog.h"
 #include "type_or_entity.h"
+#include "typegmod.h"
 
 /* Make types visible to allow most efficient access */
-# include "entity_t.h"
+#include "entity_t.h"
 #include "type_t.h"
 
 typedef struct type_walk_env {
@@ -42,9 +45,15 @@ void type_walk_2(type_or_ent *tore,
   /* marked? */
   switch (get_kind(tore)) {
   case k_entity:
-    if (((entity *)tore)->visit >= type_visited) return; break;
+    if (((entity *)tore)->visit >= type_visited) return;
+    break;
   case k_type:
-    if (((type *)tore)->visit >= type_visited) return; break;
+    if(type_id == get_type_tpop((type*)tore)) {
+      type_walk_2((type_or_ent *)skip_tid((type *)tore), pre, post, env);
+      return;
+    }
+    if (((type *)tore)->visit >= type_visited) return;
+    break;
   default:
     break;
   }
@@ -68,55 +77,58 @@ void type_walk_2(type_or_ent *tore,
     {
       type *tp = (type *)tore;
       mark_type_visited(tp);
-      switch (get_type_tpop_code(tp))
-       case tpo_class:
-         {
-           for (i=0; i<get_class_n_member(tp); i++)
-             type_walk_2((type_or_ent *)get_class_member(tp, i), pre, post, env);
-           for (i=0; i<get_class_n_subtype(tp); i++)
-             type_walk_2((type_or_ent *)get_class_subtype(tp, i), pre, post, env);
-           for (i=0; i<get_class_n_supertype(tp); i++)   {
-             type_walk_2((type_or_ent *)get_class_supertype(tp, i), pre, post, env);
-           }
-           break;
-         case tpo_struct:
-           {
-             for (i=0; i<get_struct_n_member(tp); i++)
-               type_walk_2((type_or_ent *)get_struct_member(tp, i), pre, post, env);
-           }
-           break;
-         case tpo_method:
-           {
-             for (i = 0; i < get_method_n_params(tp); i++)
-               type_walk_2((type_or_ent *)get_method_param_type(tp, i), pre, post, env);
-             for (i = 0; i < get_method_n_res(tp); i++)
-               type_walk_2((type_or_ent *)get_method_res_type(tp, i), pre, post, env);
-           }
-           break;
-         case tpo_union:
-           {
-             for (i = 0; i < get_union_n_members(tp); i++)
-               type_walk_2((type_or_ent *)get_union_member(tp, i), pre, post, env);
-           }
-           break;
-         case tpo_array:
-           type_walk_2((type_or_ent *)get_array_element_type(tp),
-                       pre, post, env);
-           break;
-         case tpo_enumeration:
-           /* a leave */
-           break;
-         case tpo_pointer:
-           type_walk_2((type_or_ent *)get_pointer_points_to_type(tp),
-                       pre, post, env);
-           break;
-         case tpo_primitive:
-           /* a leave. */
-           break;
-         default:
-           printf(" *** Faulty type! \n");
-           break;
-         }
+      switch (get_type_tpop_code(tp)) {
+      case tpo_class:
+       {
+         for (i=0; i<get_class_n_supertype(tp); i++)
+           type_walk_2((type_or_ent *)get_class_supertype(tp, i), pre, post, env);
+         for (i=0; i<get_class_n_member(tp); i++)
+           type_walk_2((type_or_ent *)get_class_member(tp, i), pre, post, env);
+         for (i=0; i<get_class_n_subtype(tp); i++)
+           type_walk_2((type_or_ent *)get_class_subtype(tp, i), pre, post, env);
+       }
+       break;
+      case tpo_struct:
+       {
+         for (i=0; i<get_struct_n_member(tp); i++)
+           type_walk_2((type_or_ent *)get_struct_member(tp, i), pre, post, env);
+       }
+       break;
+      case tpo_method:
+       {
+         for (i = 0; i < get_method_n_params(tp); i++)
+           type_walk_2((type_or_ent *)get_method_param_type(tp, i), pre, post, env);
+         for (i = 0; i < get_method_n_res(tp); i++)
+           type_walk_2((type_or_ent *)get_method_res_type(tp, i), pre, post, env);
+       }
+       break;
+      case tpo_union:
+       {
+         for (i = 0; i < get_union_n_members(tp); i++)
+           type_walk_2((type_or_ent *)get_union_member(tp, i), pre, post, env);
+       }
+       break;
+      case tpo_array:
+       type_walk_2((type_or_ent *)get_array_element_type(tp),
+                   pre, post, env);
+       type_walk_2((type_or_ent *)get_array_element_entity(tp),
+                   pre, post, env);
+       break;
+      case tpo_enumeration:
+       /* a leave */
+       break;
+      case tpo_pointer:
+       type_walk_2((type_or_ent *)get_pointer_points_to_type(tp),
+                   pre, post, env);
+       break;
+      case tpo_primitive:
+      case tpo_id:
+       /* a leave. */
+       break;
+      default:
+       printf(" *** Faulty type! \n");
+       break;
+      }
     } break; /* end case k_type */
   default:
     printf(" *** Faulty type or entity! \n");
@@ -153,7 +165,6 @@ void start_type_walk(ir_node *node, void *env) {
     type_walk_2((type_or_ent *)get_Alloc_type(node), pre, post, envi);
     break;
   case iro_Free:
-    printf("here in typewalk\n");
     type_walk_2((type_or_ent *)get_Free_type(node), pre, post, envi);
     break;
   default:
@@ -166,7 +177,8 @@ void type_walk(void (pre)(type_or_ent*, void*),
               void *env) {
   int i;
   ++type_visited;
-  type_walk_2((type_or_ent *)get_glob_type(), pre, post, env);
+  /*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++) {
     type_walk_2((type_or_ent *)get_irp_type(i), pre, post, env);
   }
@@ -193,3 +205,87 @@ void type_walk_irg (ir_graph *irg,
   free(type_env);
   return;
 }
+
+void type_walk_s2s_2(type_or_ent *tore,
+                    void (pre)(type_or_ent*, void*),
+                    void (post)(type_or_ent*, void*),
+                    void *env)
+{
+  int i;
+
+  /* marked? */
+  switch (get_kind(tore)) {
+  case k_entity:
+    if (((entity *)tore)->visit >= type_visited) return;
+    break;
+  case k_type:
+    if(type_id == get_type_tpop((type*)tore)) {
+      type_walk_s2s_2((type_or_ent *)skip_tid((type *)tore), pre, post, env);
+      return;
+    }
+    if (((type *)tore)->visit >= type_visited) return;
+    break;
+  default:
+    break;
+  }
+
+  /* iterate */
+  switch (get_kind(tore)) {
+  case k_type:
+    {
+      type *tp = (type *)tore;
+      mark_type_visited(tp);
+      switch (get_type_tpop_code(tp)) {
+      case tpo_class:
+       {
+         for (i=0; i<get_class_n_supertype(tp); i++)
+           type_walk_s2s_2((type_or_ent *)get_class_supertype(tp, i), pre, post, env);
+
+         /* execute pre method */
+         if(pre)
+           pre(tore, env);
+         tp = skip_tid((type*)tore);
+
+         for (i=0; i<get_class_n_subtype(tp); i++)
+           type_walk_s2s_2((type_or_ent *)get_class_subtype(tp, i), pre, post, env);
+
+         /* execute post method */
+         if(post)
+           post(tore, env);
+       }
+       break;
+      case tpo_struct:
+      case tpo_method:
+      case tpo_union:
+      case tpo_array:
+      case tpo_enumeration:
+      case tpo_pointer:
+      case tpo_primitive:
+      case tpo_id:
+       /* dont care */
+       break;
+      default:
+       printf(" *** Faulty type! \n");
+       break;
+      }
+    } break; /* end case k_type */
+  case k_entity:
+    /* dont care */
+    break;
+  default:
+    printf(" *** Faulty type or entity! \n");
+    break;
+  }
+  return;
+}
+
+void type_walk_super2sub(void (pre)(type_or_ent*, void*),
+                        void (post)(type_or_ent*, void*),
+                        void *env) {
+  int i;
+  ++type_visited;
+  type_walk_s2s_2((type_or_ent *)get_glob_type(), pre, post, env);
+  for (i = 0; i < get_irp_n_types(); i++) {
+    type_walk_s2s_2((type_or_ent *)get_irp_type(i), pre, post, env);
+  }
+}