correct exception handler range checks

[cacao.git] / jit / parseRTprint.h

diff --git a/jit/parseRTprint.h b/jit/parseRTprint.h
index b9d5c90beccc2437f51e52d1d9ddf879edfc7cc1..a081981038075f52f868b7b570457e15364e83d6 100644 (file)
--- a/jit/parseRTprint.h
+++ b/jit/parseRTprint.h
@@ -7,24 +7,26 @@
  */
 
 
+#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, \
          USED);  \
        printf(" method name =");   \
         utf_display(submeth->class->name);printf("."); \
-        method_display(submeth);fflush(stdout);}
+        method_display_flags_last(submeth);fflush(stdout);}
 
 #define XTAPRINTcallgraph2  if(pWhenMarked>=1) { \
        printf("\n XTA Added to Call Graph #%i:", \
                methXTAlast); \
        printf(" method name ="); fflush(stdout);\
        utf_display(mi->class->name);printf(".");fflush(stdout); \
-       method_display(mi);fflush(stdout); \
+       method_display_flags_last(mi);fflush(stdout); \
        }
 
 #define RTAPRINTcallgraph1  if(pWhenMarked>=1) \
@@ -36,7 +38,7 @@
          USED);  \
        printf(" method name =");   \
         utf_display(meth->class->name);printf("."); \
-        method_display(meth);fflush(stdout);} 
+        method_display_flags_last(meth);fflush(stdout);} 
 
 
 #define RTAPRINTmarkMethod1 if (pWhenMarked >= 2) { \
@@ -70,10 +72,11 @@
         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("<%i/%i>PARSE RT method name = <%i/%i>", \
+               methRT,methRTlast,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)) \
@@ -159,9 +162,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) { \
@@ -174,14 +176,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) { \
@@ -201,7 +202,7 @@
 #define RTAPRINT11addedtoCallgraph  if (pWhenMarked >= 1){ \
        printf("\n<Added to Call Graph #%i:",methRTlast); \
        method_display(m); \
-       printf(" method name =");utf_display(m->class->name); printf("."); \
+       printf("<%i> method name =",methRTlast);utf_display(m->class->name); printf("."); \
        utf_display(m->name);printf("\n"); \
        }
 
@@ -246,9 +247,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); \
        }