- Implement all the state switching stuff needed for efficient fpu mode

[libfirm] / ir / common / firmwalk.c

diff --git a/ir/common/firmwalk.c b/ir/common/firmwalk.c
index 7dab4bf..fd52704 100644 (file)
--- a/ir/common/firmwalk.c
+++ b/ir/common/firmwalk.c
@@ -24,6 +24,7 @@
 #include "irnode_t.h"
 #include "irprog_t.h"
 #include "irgwalk.h"
+#include "typewalk.h"
 #include "irtools.h"
 
 #include "array.h"
@@ -217,19 +218,19 @@ void *get_firm_walk_link(void *thing)
 static
 void fw_collect_tore(type_or_ent *tore, void *env)
 {
-  type *tp;
-  entity *ent;
+  ir_type *tp;
+  ir_entity *ent;
 
   switch (get_kind(tore)) {
   case k_entity:
-    ent = (entity *)tore;
+    ent = (ir_entity *)tore;
     /*  append entity to list */
     set_entity_link(ent, NULL);
     if (!pmap_contains(entity_map, ent))
       pmap_insert(entity_map, ent, env);
     break;
   case k_type:
-    tp = (type *)tore;
+    tp = (ir_type *)tore;
 
     /*  append type to list */
     set_type_link(tp, NULL);
@@ -374,7 +375,7 @@ void firm_walk(firm_walk_interface *wif)
   if (wif->do_type)
   {
     for (entry = pmap_first(type_map); entry; entry = pmap_next(type_map))
-      wif->do_type((type *)entry->key, wif->env);
+      wif->do_type((ir_type *)entry->key, wif->env);
   }
   if (wif->do_type_finalize) wif->do_type_finalize(wif->env);
 
@@ -383,7 +384,7 @@ void firm_walk(firm_walk_interface *wif)
   if (wif->do_entity)
   {
     for (entry = pmap_first(entity_map); entry; entry = pmap_next(entity_map))
-      wif->do_entity((entity *)entry->key, wif->env);
+      wif->do_entity((ir_entity *)entry->key, wif->env);
   }
   if (wif->do_entity_finalize) wif->do_entity_finalize(wif->env);