X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=firmjni%2Fauxilliary%2FHeapanal.c;h=5c18bcf004487ad43bb784b1ff615e127d5d25c8;hb=62808642b0f7e73553cb33316b9174a8d83e61ed;hp=2a9b6bf2809f8c2c0c0925caf14cd3003503fdc4;hpb=49bffc7940799caf659e520a1953e90710588352;p=libfirm

diff --git a/firmjni/auxilliary/Heapanal.c b/firmjni/auxilliary/Heapanal.c
index 2a9b6bf28..5c18bcf00 100644
--- a/firmjni/auxilliary/Heapanal.c
+++ b/firmjni/auxilliary/Heapanal.c
@@ -2,14 +2,14 @@
 
 # include "Heapanal.h"
 
-# include "libfirm/firm.h"
+# include "firm.h"
 # include "irsimpletype.h"
 # include "heapanal/heapanal.h"
 
 /*  boilerplate stuff: */
-#include "libfirm/irvrfy.h"
-#include "libfirm/trvrfy.h"
-#include "libfirm/irdump.h"
+#include "irvrfy.h"
+#include "trvrfy.h"
+#include "irdump.h"
 
 
 /*  I/O: */
@@ -70,12 +70,12 @@ void Java_firmjni_Heapanal_analHeap__ (JNIEnv *env, jclass clazz)
     /*  opt_load_const_static(); */
 
     /* dump graphs as they come out of the front end */
-    dump_file_suffix = "-fe";
-    dump_all_types ();
-    dump_class_hierarchy (true);
-    dump_all_ir_graphs(dump_ir_block_graph);
-    dump_all_ir_graphs(dump_ir_block_graph_w_types);
-    dump_all_ir_graphs(dump_cfg);
+    char *suffix = "-fe";
+    dump_all_types (suffix);
+    dump_class_hierarchy (true, suffix);
+    dump_all_ir_graphs(dump_ir_block_graph, suffix);
+    dump_all_ir_graphs(dump_ir_block_graph_w_types, suffix);
+    dump_all_ir_graphs(dump_cfg, suffix);
 
     /* verify constructed graphs */
     for (i = 0; i < get_irp_n_irgs(); i++)
@@ -92,17 +92,16 @@ void Java_firmjni_Heapanal_analHeap__ (JNIEnv *env, jclass clazz)
       construct_backedges(get_irp_irg(i));
 
       if (1) {
-        dump_loop_information();
-        dump_file_suffix = "-1.2-intra-loop";
-        dump_ir_block_graph(get_irp_irg(i));
-        dont_dump_loop_information();
+        dump_loop_information(1);
+        dump_ir_block_graph(get_irp_irg(i), "-1.2-intra-loop");
+        dump_loop_information(0);
         dump_loop_tree(get_irp_irg(i), "-1.2-intra");
       }
     }
 
     DDMG (get_irp_main_irg ());
     assert(get_irp_main_irg());
-    assert(get_irg_ent(get_irp_main_irg()));
+    assert(get_irg_entity(get_irp_main_irg()));
 
 
     /** Do interprocedural optimizations **/
@@ -118,10 +117,9 @@ void Java_firmjni_Heapanal_analHeap__ (JNIEnv *env, jclass clazz)
     /* Test construction of interprocedural loop information */
     /*  construct_ip_backedges(); */
 
-    dump_loop_information();
-    dump_file_suffix = "-1.2-inter-loop";
-    dump_all_cg_block_graph();
-    dont_dump_loop_information();
+    dump_loop_information(1);
+    dump_all_cg_block_graph("-1.2-inter-loop");
+    dump_loop_information(0);
     dump_loop_tree(get_irp_main_irg(), "-1.2-inter");
 
 
@@ -130,7 +128,7 @@ void Java_firmjni_Heapanal_analHeap__ (JNIEnv *env, jclass clazz)
 
     set_max_chi_height(8);  /* change ad lib */
     set_initial_context_depth(4);   /* change as needed */
-    ha_analyse_heap(get_irg_ent(get_irp_main_irg()), 1);
+    ha_analyse_heap(get_irg_entity(get_irp_main_irg()), 1);
 
     /* Remove the interprocedural dataflow representation */
     free(free_methods);
@@ -156,6 +154,16 @@ void Java_firmjni_Heapanal_analHeap__ (JNIEnv *env, jclass clazz)
 
 /*
  * $Log$
+ * Revision 1.6  2005/03/01 16:22:39  goetz
+ * changed irdump flag
+ *
+ * Revision 1.5  2004/11/15 12:38:16  goetz
+ * we need more and more libs at linking ...
+ * changed node numbers (unknown_entity)
+ *
+ * Revision 1.4  2004/08/14 10:09:52  goetz
+ * adapted to new semantics
+ *
  * Revision 1.3  2004/04/30 09:00:01  goetz
  * added configure support for heap analyses
  *