X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=jit%2FparseRTprint.h;h=bab68fc9fda90f7d0777fda165d0dd8bbb6d186e;hb=9b779c905053bd0af3f795b62d50fad71d39a056;hp=8460d9ca64cc6dbf96ca621645f0204634b77743;hpb=931fa76e34b567479682bd43b5eadfa5b36b9d47;p=cacao.git

diff --git a/jit/parseRTprint.h b/jit/parseRTprint.h
index 8460d9ca6..bab68fc9f 100644
--- a/jit/parseRTprint.h
+++ b/jit/parseRTprint.h
@@ -1,16 +1,18 @@
-/*  
-/* Defines of debug / trace /info  prints 
-/*     to make the actual code more readable
 /*
-/* COtest prints are just debug
-/* RTAprint prints are trace /info prints
-*/
+ * Defines of debug / trace /info  prints 
+ *     to make the actual code more readable
+ *
+ * COtest prints are just debug
+ * RTAprint prints are trace /info prints
+ */
 
 
+#include "parseRTstats.h"
+
 
 #define XTAPRINTcallgraph1  if(pWhenMarked>=1) \
         {printf("\n XTA Added to Call Graph #%i:",  \
-        methRTlast); \
+        methXTAlast); \
 	printf("\t <used flags c/m> <%i/%i> %i\t",  \
 	  submeth->class->classUsed, \
 	  submeth->methodUsed, \
@@ -22,8 +24,8 @@
 #define XTAPRINTcallgraph2  if(pWhenMarked>=1) { \
 	printf("\n XTA Added to Call Graph #%i:", \
 		methXTAlast); \
-	printf(" method name ="); \
-	utf_display(mi->class->name);printf("."); \
+	printf(" method name ="); fflush(stdout);\
+	utf_display(mi->class->name);printf(".");fflush(stdout); \
 	method_display(mi);fflush(stdout); \
 	}
 
@@ -40,7 +42,7 @@
 
 
 #define RTAPRINTmarkMethod1 if (pWhenMarked >= 2) { \
-        printf("<%i/%i> Just Marking Method - class: <index=%i>\n",   \
+        printf("<%i> Just Marking Method - class: <index=%i>\n",   \
 	submeth->methodUsed,  \
 	submeth->class->index); \
 	utf_display(submeth->class->name); \
@@ -62,8 +64,6 @@
 
 #define RTAPRINTmarkSubs1 if (pWhenMarked>=3) { \
   utf *name = topmethod -> name; \
-  utf *descriptor = topmethod -> descriptor; \
-  s4  flags = topmethod -> flags; \
 	printf("markMethod: "); utf_display(class->name); \
 	printf(".");utf_display(name); printf("\n");}
 
@@ -72,10 +72,10 @@
         utf_display(name); printf("\n");}
 
 #define RTAPRINT01method if ((pOpcodes == 1) || (pOpcodes == 3)) \
-        {printf("*********************************\n"); \
-        printf("PARSE RT method name = <%i/%i>",rt_method->class->classUsed,rt_method->methodUsed); \
-        utf_display(rt_method->class->name);printf("."); \
-        utf_display(rt_method->name);printf("\n\n"); \
+        {printf("*********************************\n"); fflush(stdout); \
+        printf("PARSE RT method name = <%i/%i>",rt_method->class->classUsed,rt_method->methodUsed); fflush(stdout);\
+        utf_display(rt_method->class->name);printf(".");fflush(stdout); \
+        utf_display(rt_method->name);printf("\n\n"); fflush(stdout);\
         method_display(rt_method); printf(">\n\n");fflush(stdout);}
 
 #define RTAPRINT02opcode if ((pOpcodes == 1) || (pOpcodes == 3)) \
@@ -161,9 +161,8 @@
 	method_display(mi); \
         fflush(stdout); }
 
-#define RTAPRINT07invoke_spec_virt2  if (pWhenMarked >= 1) { \
-        printf("Calling MarkSubs from SPECIAL/VIRTUAL :"); \
-        utf_display(mi->class->name);printf(".V."); \
+#define RTAPRINT07invoke_spec_virt2 if ((pOpcodes == 1) ||(pOpcodes == 3)  || (pWhenMarked >= 1)) { \
+        utf_display(mi->class->name);printf("."); \
 	method_display(mi); }
 
 #define RTAPRINT08AinvokeInterface0 if (pWhenMarked >= 2) { \
@@ -176,14 +175,13 @@
 		fflush(stdout); \
 		method_display(mi); \
 		fflush(stdout); \
-		printf("AAAAA\n");fflush(stdout); \
 	}
 
 #define RTAPRINT08invokeInterface1  if (pWhenMarked >= 1) { \
 	printf("Implemented By classes :\n");  \
                 fflush(stdout); \
 	if (subs == NULL) printf(" \tNOT IMPLEMENTED !!!\n"); \
-		printf("ZZZZZ\n");fflush(stdout); \
+		fflush(stdout); \
 	}
 
 #define RTAPRINT09invokeInterface2  if (pWhenMarked >= 3) { \
@@ -197,7 +195,7 @@
 
 #define RTAPRINT10newXTA  if (pWhenMarked >= 1) { \
 	utf_display(ci->name);printf(" XTA_NEW\n"); \
-	printSet(rt_method->XTAclassSet->head); \
+	printSet(rt_method->xta->XTAclassSet->head); \
 	}
 
 #define RTAPRINT11addedtoCallgraph  if (pWhenMarked >= 1){ \
@@ -248,9 +246,5 @@
 
 #define RTAPRINT16stats1 if (pStats == 2) { \
 	printf("OBJECT SUBS ARE_THERE 1\n"); \
-	unRTclassHeirCnt=0; \
-	unRTmethodCnt = 0; \
 		printObjectClassHeirarchy(class_java_lang_Object); \
-	printf("\n END of unanalysed Class Heirarchy: #%i classes /  #%i methods\n\n", \
-		unRTclassHeirCnt,unRTmethodCnt); \
 	}