introduce new mode for initializer

[libfirm] / ir / ana / rta.c

diff --git a/ir/ana/rta.c b/ir/ana/rta.c
index bfe87c0..85084e4 100644 (file)
--- a/ir/ana/rta.c
+++ b/ir/ana/rta.c
@@ -1,5 +1,5 @@
 /*
- * Copyrigth (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -39,9 +39,8 @@
 #include "eset.h"
 #include "irgwalk.h"
 #include "irgmod.h"
-#include "typewalk.h"
 #include "irvrfy.h"
-#include "trvrfy.h"
+#include "irprintf.h"
 
 # ifndef TRUE
 #  define TRUE 1
@@ -108,8 +107,7 @@ static int add_graph (ir_graph *graph)
 {
   if (!eset_contains (_live_graphs, graph)) {
     if (verbose > 1) {
-      fprintf(stdout, "RTA:        new graph of ");
-      DDMEO(get_irg_entity (graph));
+      ir_fprintf(stdout, "RTA:        new graph of %+F\n", graph);
     }
 
     eset_insert (_live_graphs, graph);
@@ -130,8 +128,7 @@ static int add_class (ir_type *clazz)
 {
   if (!eset_contains (_live_classes, clazz)) {
     if (verbose > 1) {
-      fprintf(stdout, "RTA:        new class: ");
-      DDMT(clazz);
+      ir_fprintf(stdout, "RTA:        new class: %+F\n", clazz);
     }
 
     eset_insert (_live_classes, clazz);
@@ -158,8 +155,7 @@ static int add_implementing_graphs (ir_entity *method)
   }
 
   if (verbose > 1) {
-    fprintf(stdout, "RTA:        new call to ");
-    DDMEO(method);
+    ir_fprintf(stdout, "RTA:        new call to %+F\n", method);
   }
 
   if (rta_is_alive_class (get_entity_owner (method))) {
@@ -220,7 +216,6 @@ static void rta_act (ir_node *node, void *env)
 
       /* STRANGE */
     } else {
-      DDMN(ptr);
       assert(0 && "Unexpected address expression: can not analyse, therefore can not do correct rta!");
     }
 
@@ -249,9 +244,11 @@ static int rta_fill_incremental (void)
   int i;
   int n_runs = 0;
   int rerun  = TRUE;
+#ifdef INTERPROCEDURAL_VIEW
   int old_ip_view = get_interprocedural_view();
 
   set_interprocedural_view(0);     /* save this for later */
+#endif
 
   /* init_tables has added main_irg to _live_graphs */
 
@@ -289,8 +286,8 @@ static int rta_fill_incremental (void)
          graph = eset_next (live_graphs)) {
 
       if (verbose > 1) {
-        fprintf(stdout, "RTA: RUN %i: considering graph of ", n_runs);
-        DDMEO(get_irg_entity (graph));
+        ir_fprintf(stdout, "RTA: RUN %i: considering graph of %+F\n", n_runs,
+                       graph);
       }
 
       rerun |= rta_fill_graph (graph);
@@ -301,7 +298,9 @@ static int rta_fill_incremental (void)
     n_runs ++;
   }
 
+#ifdef INTERPROCEDURAL_VIEW
   set_interprocedural_view(old_ip_view); /* cover up our traces */
+#endif
 
   return (n_runs);
 }
@@ -453,6 +452,7 @@ void rta_init (int do_verbose)
  * dead graphs to peculiarity_description.
  */
 static void make_entity_to_description(type_or_ent *tore, void *env) {
+  (void) env;
   if (get_kind(tore) == k_entity) {
     ir_entity *ent = (ir_entity *)tore;
 
@@ -482,8 +482,6 @@ void rta_delete_dead_graphs (void)
   int rem_vpi = get_visit_pseudo_irgs();
   set_visit_pseudo_irgs(1);
 
-  if (!get_optimize() || !get_opt_dead_method_elimination()) return;
-
   dead_graphs = xmalloc(sizeof(*dead_graphs) * get_irp_n_irgs());
 
   for (i = 0; i < n_graphs; i++) {
@@ -558,14 +556,13 @@ void rta_report (void)
   for (i = 0; i < get_irp_n_types(); ++i) {
     ir_type *tp = get_irp_type(i);
     if (is_Class_type(tp) && rta_is_alive_class(tp)) {
-      fprintf(stdout, "RTA: considered allocated: "); DDMT(tp);
+      ir_fprintf(stdout, "RTA: considered allocated: %+F\n", tp);
     }
   }
 
   for (i = 0; i < get_irp_n_irgs(); i++) {
     if (rta_is_alive_graph (get_irp_irg(i))) {
-      fprintf(stdout, "RTA: considered called: graph of ");
-      DDMEO(get_irg_entity (get_irp_irg(i)));
+      ir_fprintf(stdout, "RTA: considered called: graph of %+F\n", get_irp_irg(i));
     }
   }
 }