X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Frta.c;h=1e5fda8c8ab7839d05d1bc18370b02a45876ff75;hb=ff0e8d7fcb34481652f0bf521ba04b1eca5e2106;hp=676bb6f3b384e1d6646efe872a334dd2f9dadcda;hpb=6c165ecbc0725a21b7f68a31f8624c218e7d1288;p=libfirm

diff --git a/ir/ana/rta.c b/ir/ana/rta.c
index 676bb6f3b..1e5fda8c8 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"
 
@@ -85,6 +86,13 @@ static ir_graph *get_implementing_graph (entity *method)
 #endif
 }
 
+/**
+ * Add a graph to the set of live graphs.
+ *
+ * @param graph  the graph to add
+ * @return non-zero if the graph was added, zero
+ *         if it was already in the live set
+ */
 static int add_graph (ir_graph *graph)
 {
   if (!eset_contains (_live_graphs, graph)) {
@@ -100,7 +108,14 @@ static int add_graph (ir_graph *graph)
   return (FALSE);
 }
 
-static int add_class (type *clazz)
+/**
+ * Add a class to the set of live classes.
+ *
+ * @param clazz   the class to add
+ * @return non-zero if the graph was added, zero
+ *         if it was already in the live set
+ */
+static int add_class (ir_type *clazz)
 {
   if (!eset_contains (_live_classes, clazz)) {
     if (verbose > 1) {
@@ -158,7 +173,6 @@ static int add_implementing_graphs (entity *method)
 static void rta_act (ir_node *node, void *env)
 {
   int *change = (int*) env;
-
   opcode op = get_irn_opcode (node);
 
   if (iro_Call == op) {         /* CALL */
@@ -174,18 +188,20 @@ static void rta_act (ir_node *node, void *env)
       /* CALL SYMCONST */
     } else if (iro_SymConst == get_irn_opcode (ptr)) {
       if (get_SymConst_kind(ptr) == symconst_addr_ent) {
+        ir_graph *graph;
+
         ent = get_SymConst_entity (ptr);
-        ir_graph *graph = get_entity_irg (ent);
+        graph = get_entity_irg (ent);
         if (graph) {
           *change |= add_graph (graph);
         } else {
           /* it's an external allocated thing. */
         }
       } else if (get_SymConst_kind(ptr) == symconst_addr_name) {
-	/* Entities of kind addr_name may not be allocated in this compilation unit.
-	   If so, the frontend built faulty Firm.  So just ignore. */
-	/* if (get_SymConst_name(ptr) != new_id_from_str("iro_Catch"))
-	  assert (ent && "couldn't determine entity of call to SymConst of kind addr_name."); */
+	    /* Entities of kind addr_name may not be allocated in this compilation unit.
+	       If so, the frontend built faulty Firm.  So just ignore. */
+	    /* if (get_SymConst_name(ptr) != new_id_from_str("iro_Catch"))
+        assert (ent && "couldn't determine entity of call to SymConst of kind addr_name."); */
       } else {
         /* other symconst. */
         assert(0 && "This SymConst can not be an address for a method call.");
@@ -198,7 +214,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);
   }
@@ -211,17 +227,11 @@ static void rta_act (ir_node *node, void *env)
 static int rta_fill_graph (ir_graph* graph)
 {
   int change = FALSE;
-
-  current_ir_graph = graph;
-
   irg_walk_graph (graph, rta_act, NULL, &change);
-
-  return (change);
+  return change;
 }
 
 /** 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)
 {
@@ -230,7 +240,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 */
 
@@ -285,9 +295,9 @@ static int rta_fill_incremental (void)
   return (n_runs);
 }
 
-/*
-   Count the number of graphs that we have found to be live.
-*/
+/**
+ * Count the number of graphs that we have found to be live.
+ */
 static int stats (void)
 {
   int i;
@@ -343,11 +353,12 @@ static void force_description (entity *ent, entity *addr)
 }
 
 /**
-   Initialise the static data structures.
+   Initialize the static data structures.
 */
 static void init_tables (void)
 {
-  int i, n_globs = get_class_n_members(get_glob_type());
+  ir_type *tp;
+  int i, n;
 
   _live_classes = eset_create ();
   _live_graphs  = eset_create ();
@@ -357,27 +368,37 @@ 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))
+  tp = get_glob_type();
+  n = get_class_n_members(tp);
+  for (i = 0; i < n; ++i) {
+    ir_type *member_type = get_entity_type(get_class_member(tp, i));
+    if (is_Class_type(member_type))
+      eset_insert(_live_classes, member_type);
+  }
+
+  tp = get_tls_type();
+  n = get_struct_n_members(tp);
+  for (i = 0; i < n; ++i) {
+    ir_type *member_type = get_entity_type(get_struct_member(tp, i));
+    if (is_Class_type(member_type))
       eset_insert(_live_classes, member_type);
   }
 }
 
 /*
- * Initialise the RTA data structures, and perform RTA.
+ * Initialize the RTA data structures, and perform RTA.
  * do_verbose If == 1, print statistics, if > 1, chatter about every detail
  */
 void rta_init (int do_verbose)
 {
-  int n_runs = 0;
+  int i, n, n_runs = 0;
 
   int rem_vpi = get_visit_pseudo_irgs();
   set_visit_pseudo_irgs(1);
 
 # ifdef DEBUG_libfirm
-  int i;
-  for (i = 0; i < get_irp_n_irgs(); i++) {
+  n = get_irp_n_irgs();
+  for (i = 0; i < n; i++) {
     irg_vrfy (get_irp_irg(i));
   }
   tr_vrfy ();
@@ -398,7 +419,7 @@ void rta_init (int do_verbose)
   }
 
 # ifdef DEBUG_libfirm
-  for (i = 0; i < get_irp_n_irgs(); i++) {
+  for (i = 0; i < n; i++) {
     irg_vrfy (get_irp_irg(i));
   }
   tr_vrfy ();
@@ -417,13 +438,13 @@ 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)))                        &&
-    (get_entity_peculiarity(ent) != peculiarity_description)      &&
-    (get_entity_visibility(ent)  != visibility_external_allocated)   ) {
+    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)));
       if (!eset_contains (_live_graphs, irg)) {
-    set_entity_peculiarity(ent, peculiarity_description);
-    set_entity_irg(ent, NULL);
+        set_entity_peculiarity(ent, peculiarity_description);
+        set_entity_irg(ent, NULL);
       }
     }
   }
@@ -438,13 +459,14 @@ void rta_delete_dead_graphs (void)
   int n_graphs = get_irp_n_irgs ();
   ir_graph *graph = NULL;
   int n_dead_graphs = 0;
+  ir_graph **dead_graphs;
 
   int rem_vpi = get_visit_pseudo_irgs();
   set_visit_pseudo_irgs(1);
 
   if (!get_optimize() || !get_opt_dead_method_elimination()) return;
 
-  ir_graph *dead_graphs[get_irp_n_irgs()];
+  dead_graphs = xmalloc(sizeof(*dead_graphs) * get_irp_n_irgs());
 
   for (i = 0; i < n_graphs; i++) {
     graph = get_irp_irg(i);
@@ -472,6 +494,8 @@ void rta_delete_dead_graphs (void)
   }
 
   set_visit_pseudo_irgs(rem_vpi);
+
+  free(dead_graphs);
 }
 
 /* Clean up the RTA data structures.  Call this after calling rta_init */
@@ -497,7 +521,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));
 }
@@ -514,8 +538,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);
     }
   }
@@ -531,6 +555,25 @@ void rta_report (void)
 
 /*
  * $Log$
+ * Revision 1.36  2006/06/05 15:58:12  beck
+ * added support for Thread local storage
+ * added more doxygen docu
+ *
+ * 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
+ *
  * Revision 1.30  2004/12/02 16:16:11  beck
  * fixed config.h include
  * used xmalloc instead of malloc