X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Frta.c;h=81397600d9cd636c67ef3398b7ecaf9f51d0854d;hb=a0f13e7f9dc221a7283bb6ea0fd7dd54239c1ddb;hp=c9313046b38cf1b87a812322188fb63a23a75ec7;hpb=abcfad6bfc9f197efe3130e753bfa64878e814cc;p=libfirm

diff --git a/ir/ana/rta.c b/ir/ana/rta.c
index c9313046b..81397600d 100644
--- a/ir/ana/rta.c
+++ b/ir/ana/rta.c
@@ -28,6 +28,7 @@
 #include "eset.h"
 #include "irgwalk.h"
 #include "irgmod.h"
+#include "typewalk.h"
 #include "irvrfy.h"
 #include "trvrfy.h"
 
@@ -100,7 +101,7 @@ static int add_graph (ir_graph *graph)
   return (FALSE);
 }
 
-static int add_class (type *clazz)
+static int add_class (ir_type *clazz)
 {
   if (!eset_contains (_live_classes, clazz)) {
     if (verbose > 1) {
@@ -200,7 +201,7 @@ static void rta_act (ir_node *node, void *env)
     }
 
   } else if (iro_Alloc == op) { /* ALLOC */
-    type *type = get_Alloc_type (node);
+    ir_type *type = get_Alloc_type (node);
 
     *change |= add_class (type);
   }
@@ -222,8 +223,6 @@ static int rta_fill_graph (ir_graph* graph)
 }
 
 /** Traverse all graphs to collect method accesses and object allocations.
- *
- *  @param rerun Whether to rely on is_alive in a second run
  */
 static int rta_fill_incremental (void)
 {
@@ -232,7 +231,7 @@ static int rta_fill_incremental (void)
   int rerun  = TRUE;
   int old_ip_view = get_interprocedural_view();
 
-  set_interprocedural_view(false);     /* save this for later */
+  set_interprocedural_view(0);     /* save this for later */
 
   /* init_tables has added main_irg to _live_graphs */
 
@@ -360,8 +359,8 @@ static void init_tables (void)
 
   /* Find static allocated classes */
   for (i = 0; i < n_globs; ++i) {
-    type *member_type = get_entity_type(get_class_member(get_glob_type(), i));
-    if (is_class_type(member_type))
+    ir_type *member_type = get_entity_type(get_class_member(get_glob_type(), i));
+    if (is_Class_type(member_type))
       eset_insert(_live_classes, member_type);
   }
 }
@@ -418,7 +417,7 @@ static void make_entity_to_description(type_or_ent *tore, void *env) {
   if (get_kind(tore) == k_entity) {
     entity *ent = (entity *)tore;
 
-    if ((is_method_type(get_entity_type(ent)))                        &&
+    if ((is_Method_type(get_entity_type(ent)))                        &&
         (get_entity_peculiarity(ent) != peculiarity_description)      &&
         (get_entity_visibility(ent)  != visibility_external_allocated)   ) {
       ir_graph *irg = get_entity_irg(get_SymConst_entity(get_atomic_ent_value(ent)));
@@ -501,7 +500,7 @@ void rta_cleanup (void)
 }
 
 /* Say whether this class might be instantiated at any point in the program: */
-int  rta_is_alive_class  (type   *clazz)
+int  rta_is_alive_class  (ir_type   *clazz)
 {
   return (eset_contains (_live_classes, clazz));
 }
@@ -518,8 +517,8 @@ void rta_report (void)
   int i;
 
   for (i = 0; i < get_irp_n_types(); ++i) {
-    type *tp = get_irp_type(i);
-    if (is_class_type(tp) && rta_is_alive_class(tp)) {
+    ir_type *tp = get_irp_type(i);
+    if (is_Class_type(tp) && rta_is_alive_class(tp)) {
       fprintf(stdout, "RTA: considered allocated: "); DDMT(tp);
     }
   }
@@ -535,6 +534,18 @@ void rta_report (void)
 
 /*
  * $Log$
+ * Revision 1.35  2006/01/13 21:51:59  beck
+ * renamed all types 'type' to 'ir_type'
+ *
+ * Revision 1.34  2006/01/02 15:01:16  beck
+ * missing include added
+ *
+ * Revision 1.33  2005/11/17 17:26:57  beck
+ * removed bool type and depency from stdbool.h (not C89)
+ *
+ * Revision 1.32  2005/01/05 14:24:52  beck
+ * renames all is_x*_type() functions to is_X*_type() to prevent name clash with EDG frontend
+ *
  * Revision 1.31  2004/12/21 13:45:14  beck
  * removed C99 constructs
  *