more XTA updates

diff --git a/jit/parseRT.c b/jit/parseRT.c
index e2803868edb765ccac45c8edce97741ea8747570..3444a49545125cf302f41c1ba29a73aa0acced6b 100644 (file)
--- a/jit/parseRT.c
+++ b/jit/parseRT.c
@@ -26,7 +26,7 @@
 
    Authors: Carolyn Oates
 
-   $Id: parseRT.c 655 2003-11-20 14:52:00Z carolyn $
+   $Id: parseRT.c 657 2003-11-20 15:18:33Z carolyn $
 
 */
 
@@ -1455,9 +1455,11 @@ static void parseRT()
                        mr = class_getconstant (rt_class, i, CONSTANT_InterfaceMethodref);
                        mi = class_findmethod (mr->class, mr->name, mr->descriptor);
                        
+                                               /*RTAprint*/ if (pWhenMarked >= 1) {
                                                /*RTAprint*/ printf("\t");fflush(stdout);
                                                /*RTAprint*/ utf_display(mr->class->name); printf(".");fflush(stdout);
                                                /*RTAprint*/ method_display(mi); fflush(stdout); 
+                                               /*RTAprint*/ }
 
                        if (mi->flags & ACC_STATIC)
                                panic ("Static/Nonstatic mismatch calling static method");
@@ -1768,7 +1770,6 @@ void RT_jit_parse(methodinfo *m)
                } /* if */
 
        /*---- RTA call graph worklist -----***/
-                                       printf("USING RTA call graph>>>>>>>>>><<\n");
        while (methRT <= methRTlast) {
                rt_method      = callgraph[methRT];
                rt_class       = rt_method->class;
@@ -1804,7 +1805,6 @@ void RT_jit_parse(methodinfo *m)
                                         /*RTAprint*/ if (pCallgraph >= 1) {
                                         /*RTAprint*/    printCallgraph ();}
                                         /*RTprint*/ if (pClassHeir >= 1) {
-                                        /*RTprint*/     printf("Last RTA Info -+-+-");
                                         /*RTprint*/     printRThierarchyInfo(m);
                                         /*RTprint*/     }
                                         /*RTprint*/     /**printObjectClassHeirarchyAll( );**/

diff --git a/jit/parseRTstats.c b/jit/parseRTstats.c
index f97df9cbff774e70c88115780bfe092c4c6d0ff8..0876104d4fa777ed361328283fb528261a2a15b7 100644 (file)
--- a/jit/parseRTstats.c
+++ b/jit/parseRTstats.c
@@ -26,7 +26,7 @@
 
    Authors: Carolyn Oates
 
-   $Id: parseRTstats.c 655 2003-11-20 14:52:00Z carolyn $
+   $Id: parseRTstats.c 657 2003-11-20 15:18:33Z carolyn $
 
 */
 
@@ -494,9 +494,7 @@ void printRThierarchyInfo(methodinfo *m) {
                        printf("\n");
                }
     }
-printf("BEFORE printRT Class Heir\n");
        printRTClassHeirarchy(class_java_lang_Object);
-printf("AFTER  printRT Class Heir\n");
        if (pClassHeirStatsOnly >= 2) {
                fflush(stdout);
                printf("--- end  of RT info ---------------\n");

diff --git a/main.c b/main.c
index 9f954bc4f939af34d57ab0823c4e8b66d36c052a..0e1c462a79f961ac4b4dfa208a87a135b4608cef 100644 (file)
--- a/main.c
+++ b/main.c
@@ -37,7 +37,7 @@
      - Calling the class loader
      - Running the main method
 
-   $Id: main.c 655 2003-11-20 14:52:00Z carolyn $
+   $Id: main.c 657 2003-11-20 15:18:33Z carolyn $
 
 */
 
@@ -733,7 +733,7 @@ int main(int argc, char **argv)
                        break;
 
                case OPT_XTA:
-                       opt_xta = true; /**not yet **/
+                       opt_xta = false; /**not yet **/
                        break;
 
                case OPT_VTA:

diff --git a/src/cacao/cacao.c b/src/cacao/cacao.c
index 3a31bb72307bb43f107c54201501e233ee9394d8..771873dd1f1f74deab669b68dddb34f39231bb53 100644 (file)
--- a/src/cacao/cacao.c
+++ b/src/cacao/cacao.c
@@ -37,7 +37,7 @@
      - Calling the class loader
      - Running the main method
 
-   $Id: cacao.c 655 2003-11-20 14:52:00Z carolyn $
+   $Id: cacao.c 657 2003-11-20 15:18:33Z carolyn $
 
 */
 
@@ -733,7 +733,7 @@ int main(int argc, char **argv)
                        break;
 
                case OPT_XTA:
-                       opt_xta = true; /**not yet **/
+                       opt_xta = false; /**not yet **/
                        break;
 
                case OPT_VTA:

diff --git a/src/vm/jit/inline/parseRT.c b/src/vm/jit/inline/parseRT.c
index e2803868edb765ccac45c8edce97741ea8747570..3444a49545125cf302f41c1ba29a73aa0acced6b 100644 (file)
--- a/src/vm/jit/inline/parseRT.c
+++ b/src/vm/jit/inline/parseRT.c
@@ -26,7 +26,7 @@
 
    Authors: Carolyn Oates
 
-   $Id: parseRT.c 655 2003-11-20 14:52:00Z carolyn $
+   $Id: parseRT.c 657 2003-11-20 15:18:33Z carolyn $
 
 */
 
@@ -1455,9 +1455,11 @@ static void parseRT()
                        mr = class_getconstant (rt_class, i, CONSTANT_InterfaceMethodref);
                        mi = class_findmethod (mr->class, mr->name, mr->descriptor);
                        
+                                               /*RTAprint*/ if (pWhenMarked >= 1) {
                                                /*RTAprint*/ printf("\t");fflush(stdout);
                                                /*RTAprint*/ utf_display(mr->class->name); printf(".");fflush(stdout);
                                                /*RTAprint*/ method_display(mi); fflush(stdout); 
+                                               /*RTAprint*/ }
 
                        if (mi->flags & ACC_STATIC)
                                panic ("Static/Nonstatic mismatch calling static method");
@@ -1768,7 +1770,6 @@ void RT_jit_parse(methodinfo *m)
                } /* if */
 
        /*---- RTA call graph worklist -----***/
-                                       printf("USING RTA call graph>>>>>>>>>><<\n");
        while (methRT <= methRTlast) {
                rt_method      = callgraph[methRT];
                rt_class       = rt_method->class;
@@ -1804,7 +1805,6 @@ void RT_jit_parse(methodinfo *m)
                                         /*RTAprint*/ if (pCallgraph >= 1) {
                                         /*RTAprint*/    printCallgraph ();}
                                         /*RTprint*/ if (pClassHeir >= 1) {
-                                        /*RTprint*/     printf("Last RTA Info -+-+-");
                                         /*RTprint*/     printRThierarchyInfo(m);
                                         /*RTprint*/     }
                                         /*RTprint*/     /**printObjectClassHeirarchyAll( );**/

diff --git a/src/vm/jit/inline/parseRTstats.c b/src/vm/jit/inline/parseRTstats.c
index f97df9cbff774e70c88115780bfe092c4c6d0ff8..0876104d4fa777ed361328283fb528261a2a15b7 100644 (file)
--- a/src/vm/jit/inline/parseRTstats.c
+++ b/src/vm/jit/inline/parseRTstats.c
@@ -26,7 +26,7 @@
 
    Authors: Carolyn Oates
 
-   $Id: parseRTstats.c 655 2003-11-20 14:52:00Z carolyn $
+   $Id: parseRTstats.c 657 2003-11-20 15:18:33Z carolyn $
 
 */
 
@@ -494,9 +494,7 @@ void printRThierarchyInfo(methodinfo *m) {
                        printf("\n");
                }
     }
-printf("BEFORE printRT Class Heir\n");
        printRTClassHeirarchy(class_java_lang_Object);
-printf("AFTER  printRT Class Heir\n");
        if (pClassHeirStatsOnly >= 2) {
                fflush(stdout);
                printf("--- end  of RT info ---------------\n");