Renamed verbose to opt_verbose.

diff --git a/jit/inline.c b/jit/inline.c
index 37f0d6ab12536ae4a259d95cbf6e0dac51b5aa1d..69cfadd631afa21f4ac9177e2b022da7a225f011 100644 (file)
--- a/jit/inline.c
+++ b/jit/inline.c
@@ -28,7 +28,7 @@ globals moved to structure and passed as parameter
 
    Authors: Dieter Thuernbeck
 
-   $Id: inline.c 1506 2004-11-14 14:48:49Z jowenn $
+   $Id: inline.c 1546 2004-11-18 12:25:04Z twisti $
 
 */
 
@@ -560,7 +560,7 @@ inlining_methodinfo *inlining_analyse_method(methodinfo *m,
 
                                                inline_env->cummethods++;
 
-                                               if (verbose) {
+                                               if (opt_verbose) {
                                                        char logtext[MAXLOGTEXT];
                                                        sprintf(logtext, "Going to inline: ");
                                                        utf_sprint(logtext  +strlen(logtext), imi->class->name);

diff --git a/jit/parse.c b/jit/parse.c
index 49eb4cef6ba0d687b3d2688bee443fc41e40f6bf..b2e7547fbd545286a38c9f72e62ded7c7ce8c25e 100644 (file)
--- a/jit/parse.c
+++ b/jit/parse.c
@@ -29,7 +29,7 @@
    Changes: Carolyn Oates
             Edwin Steiner
 
-   $Id: parse.c 1506 2004-11-14 14:48:49Z jowenn $
+   $Id: parse.c 1546 2004-11-18 12:25:04Z twisti $
 
 */
 
@@ -454,7 +454,7 @@ DEBUGMETH(m);
 }
 if (opt_rt) {
   if (m->methodUsed != USED) {
-    if (verbose) {
+    if (opt_verbose) {
       printf(" rta missed: "); fflush(stdout);
       METHINFO(m);
       }
@@ -488,11 +488,11 @@ if (opt_rt) {
         which has to be called before parse (or ???)
         will check if method being parsed was analysed here
        ****/ 
-       if ((opt_xta) && (verbose)) { 
+       if (opt_xta && opt_verbose) { 
                /**RT_jit_parse(m);**/
                printf("XTA requested, not available\n");
                }
-       if ((opt_vta) && (verbose))  
+       if (opt_vta && opt_verbose)  
                    printf("VTA requested, not yet implemented\n");
 
        /* allocate instruction array and block index table */

diff --git a/jit/parseRT.c b/jit/parseRT.c
index 579c01323a407714cb090d9b344e86bb7c9d4297..15b0a07f9ef11721f311ed0a3dcf170b8ebfb39d 100644 (file)
--- a/jit/parseRT.c
+++ b/jit/parseRT.c
@@ -26,7 +26,7 @@
 
    Authors: Carolyn Oates
 
-   $Id: parseRT.c 1508 2004-11-15 08:34:10Z carolyn $
+   $Id: parseRT.c 1546 2004-11-18 12:25:04Z twisti $
 
 Changes:
 opcode put into functions
@@ -921,7 +921,7 @@ int RT_jit_parse(methodinfo *m)
         firstCall = false; /* turn flag off */
 
         /*----- RTA initializations --------*/
-       if (verbose) 
+       if (opt_verbose) 
            log_text("RTA static analysis started.\n");
 
        mainmeth = initializeRTAworklist(m);
@@ -958,14 +958,14 @@ int RT_jit_parse(methodinfo *m)
             }                  
        }       
     fclose(rtMissed);
-    if (verbose) {
+    if (opt_verbose) {
         if (opt_stat) {
           printRThierarchyInfo(m); 
          }
       printCallgraph(rtaWorkList); 
       }
 
-    if (verbose) {
+    if (opt_verbose) {
       log_text("RTA static analysis done.\n");
       }
   }

diff --git a/native.c b/native.c
index 0232088bfd5235f74b5aebf626ea2f0a3cb42c58..2665e06797a013e68de7f64112926ba8070f42e4 100644 (file)
--- a/native.c
+++ b/native.c
@@ -31,7 +31,7 @@
    The .hh files created with the header file generator are all
    included here as are the C functions implementing these methods.
 
-   $Id: native.c 1512 2004-11-17 11:45:31Z twisti $
+   $Id: native.c 1546 2004-11-18 12:25:04Z twisti $
 
 */
 
@@ -567,7 +567,7 @@ java_objectheader *native_new_and_init(classinfo *c)
                                                 utf_new_char("()V"));
                                                      
        if (!m) {                           /* initializer not found              */
-               if (verbose) {
+               if (opt_verbose) {
                        char logtext[MAXLOGTEXT];
                        sprintf(logtext, "Warning: class has no instance-initializer: ");
                        utf_sprint_classname(logtext + strlen(logtext), c->name);
@@ -604,7 +604,7 @@ java_objectheader *native_new_and_init_string(classinfo *c, java_lang_String *s)
                                                 utf_new_char("(Ljava/lang/String;)V"));
                                                      
        if (!m) {                                       /* initializer not found  */
-               if (verbose) {
+               if (opt_verbose) {
                        char logtext[MAXLOGTEXT];
                        sprintf(logtext, "Warning: class has no instance-initializer: ");
                        utf_sprint_classname(logtext + strlen(logtext), c->name);
@@ -640,7 +640,7 @@ java_objectheader *native_new_and_init_int(classinfo *c, s4 i)
                                                 utf_new_char("(I)V"));
                                                      
        if (!m) {                                       /* initializer not found  */
-               if (verbose) {
+               if (opt_verbose) {
                        char logtext[MAXLOGTEXT];
                        sprintf(logtext, "Warning: class has no instance-initializer: ");
                        utf_sprint_classname(logtext + strlen(logtext), c->name);
@@ -680,7 +680,7 @@ java_objectheader *native_new_and_init_throwable(classinfo *c, java_lang_Throwab
                                                 utf_new_char("(Ljava/lang/Throwable;)V"));
                                                      
        if (!m) {                                       /* initializer not found  */
-               if (verbose) {
+               if (opt_verbose) {
                        char logtext[MAXLOGTEXT];
                        sprintf(logtext, "Warning: class has no instance-initializer: ");
                        utf_sprint_classname(logtext + strlen(logtext), c->name);

diff --git a/options.c b/options.c
index 6c2d93a9931e3010c6e5255d3f5a3b2979e6c83a..ccb776148f483dcc58d91206c9b14ad160941906 100644 (file)
--- a/options.c
+++ b/options.c
@@ -27,7 +27,7 @@
 
    Authors: Christian Thalinger
 
-   $Id: options.c 1529 2004-11-17 17:19:14Z twisti $
+   $Id: options.c 1546 2004-11-18 12:25:04Z twisti $
 
 */
 
@@ -39,7 +39,7 @@
 
 /* command line option */
 
-bool verbose = false;
+bool opt_verbose = false;
 bool compileall = false;
 bool runverbose = false;       /* trace all method invocation                */
 bool verboseexception = false;

diff --git a/options.h b/options.h
index 4fa468b3d76e72edda303e0efa97c56b729843c4..b4cf895f63969cc5469453acd9d5b1bd804c020d 100644 (file)
--- a/options.h
+++ b/options.h
@@ -27,7 +27,7 @@
 
    Authors: Christian Thalinger
 
-   $Id: options.h 1529 2004-11-17 17:19:14Z twisti $
+   $Id: options.h 1546 2004-11-18 12:25:04Z twisti $
 
 */
 
@@ -57,8 +57,8 @@ struct opt_struct {
 
 /* global variables ***********************************************************/
 
+extern bool opt_verbose;
 extern bool compileall;
-extern bool verbose;
 extern bool runverbose;
 extern bool verboseexception;
 extern bool collectverbose;

diff --git a/src/native/native.c b/src/native/native.c
index 0232088bfd5235f74b5aebf626ea2f0a3cb42c58..2665e06797a013e68de7f64112926ba8070f42e4 100644 (file)
--- a/src/native/native.c
+++ b/src/native/native.c
@@ -31,7 +31,7 @@
    The .hh files created with the header file generator are all
    included here as are the C functions implementing these methods.
 
-   $Id: native.c 1512 2004-11-17 11:45:31Z twisti $
+   $Id: native.c 1546 2004-11-18 12:25:04Z twisti $
 
 */
 
@@ -567,7 +567,7 @@ java_objectheader *native_new_and_init(classinfo *c)
                                                 utf_new_char("()V"));
                                                      
        if (!m) {                           /* initializer not found              */
-               if (verbose) {
+               if (opt_verbose) {
                        char logtext[MAXLOGTEXT];
                        sprintf(logtext, "Warning: class has no instance-initializer: ");
                        utf_sprint_classname(logtext + strlen(logtext), c->name);
@@ -604,7 +604,7 @@ java_objectheader *native_new_and_init_string(classinfo *c, java_lang_String *s)
                                                 utf_new_char("(Ljava/lang/String;)V"));
                                                      
        if (!m) {                                       /* initializer not found  */
-               if (verbose) {
+               if (opt_verbose) {
                        char logtext[MAXLOGTEXT];
                        sprintf(logtext, "Warning: class has no instance-initializer: ");
                        utf_sprint_classname(logtext + strlen(logtext), c->name);
@@ -640,7 +640,7 @@ java_objectheader *native_new_and_init_int(classinfo *c, s4 i)
                                                 utf_new_char("(I)V"));
                                                      
        if (!m) {                                       /* initializer not found  */
-               if (verbose) {
+               if (opt_verbose) {
                        char logtext[MAXLOGTEXT];
                        sprintf(logtext, "Warning: class has no instance-initializer: ");
                        utf_sprint_classname(logtext + strlen(logtext), c->name);
@@ -680,7 +680,7 @@ java_objectheader *native_new_and_init_throwable(classinfo *c, java_lang_Throwab
                                                 utf_new_char("(Ljava/lang/Throwable;)V"));
                                                      
        if (!m) {                                       /* initializer not found  */
-               if (verbose) {
+               if (opt_verbose) {
                        char logtext[MAXLOGTEXT];
                        sprintf(logtext, "Warning: class has no instance-initializer: ");
                        utf_sprint_classname(logtext + strlen(logtext), c->name);

diff --git a/src/vm/jit/inline/inline.c b/src/vm/jit/inline/inline.c
index 37f0d6ab12536ae4a259d95cbf6e0dac51b5aa1d..69cfadd631afa21f4ac9177e2b022da7a225f011 100644 (file)
--- a/src/vm/jit/inline/inline.c
+++ b/src/vm/jit/inline/inline.c
@@ -28,7 +28,7 @@ globals moved to structure and passed as parameter
 
    Authors: Dieter Thuernbeck
 
-   $Id: inline.c 1506 2004-11-14 14:48:49Z jowenn $
+   $Id: inline.c 1546 2004-11-18 12:25:04Z twisti $
 
 */
 
@@ -560,7 +560,7 @@ inlining_methodinfo *inlining_analyse_method(methodinfo *m,
 
                                                inline_env->cummethods++;
 
-                                               if (verbose) {
+                                               if (opt_verbose) {
                                                        char logtext[MAXLOGTEXT];
                                                        sprintf(logtext, "Going to inline: ");
                                                        utf_sprint(logtext  +strlen(logtext), imi->class->name);

diff --git a/src/vm/jit/inline/parseRT.c b/src/vm/jit/inline/parseRT.c
index 579c01323a407714cb090d9b344e86bb7c9d4297..15b0a07f9ef11721f311ed0a3dcf170b8ebfb39d 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 1508 2004-11-15 08:34:10Z carolyn $
+   $Id: parseRT.c 1546 2004-11-18 12:25:04Z twisti $
 
 Changes:
 opcode put into functions
@@ -921,7 +921,7 @@ int RT_jit_parse(methodinfo *m)
         firstCall = false; /* turn flag off */
 
         /*----- RTA initializations --------*/
-       if (verbose) 
+       if (opt_verbose) 
            log_text("RTA static analysis started.\n");
 
        mainmeth = initializeRTAworklist(m);
@@ -958,14 +958,14 @@ int RT_jit_parse(methodinfo *m)
             }                  
        }       
     fclose(rtMissed);
-    if (verbose) {
+    if (opt_verbose) {
         if (opt_stat) {
           printRThierarchyInfo(m); 
          }
       printCallgraph(rtaWorkList); 
       }
 
-    if (verbose) {
+    if (opt_verbose) {
       log_text("RTA static analysis done.\n");
       }
   }

diff --git a/src/vm/jit/parse.c b/src/vm/jit/parse.c
index 49eb4cef6ba0d687b3d2688bee443fc41e40f6bf..b2e7547fbd545286a38c9f72e62ded7c7ce8c25e 100644 (file)
--- a/src/vm/jit/parse.c
+++ b/src/vm/jit/parse.c
@@ -29,7 +29,7 @@
    Changes: Carolyn Oates
             Edwin Steiner
 
-   $Id: parse.c 1506 2004-11-14 14:48:49Z jowenn $
+   $Id: parse.c 1546 2004-11-18 12:25:04Z twisti $
 
 */
 
@@ -454,7 +454,7 @@ DEBUGMETH(m);
 }
 if (opt_rt) {
   if (m->methodUsed != USED) {
-    if (verbose) {
+    if (opt_verbose) {
       printf(" rta missed: "); fflush(stdout);
       METHINFO(m);
       }
@@ -488,11 +488,11 @@ if (opt_rt) {
         which has to be called before parse (or ???)
         will check if method being parsed was analysed here
        ****/ 
-       if ((opt_xta) && (verbose)) { 
+       if (opt_xta && opt_verbose) { 
                /**RT_jit_parse(m);**/
                printf("XTA requested, not available\n");
                }
-       if ((opt_vta) && (verbose))  
+       if (opt_vta && opt_verbose)  
                    printf("VTA requested, not yet implemented\n");
 
        /* allocate instruction array and block index table */

diff --git a/src/vm/options.c b/src/vm/options.c
index 6c2d93a9931e3010c6e5255d3f5a3b2979e6c83a..ccb776148f483dcc58d91206c9b14ad160941906 100644 (file)
--- a/src/vm/options.c
+++ b/src/vm/options.c
@@ -27,7 +27,7 @@
 
    Authors: Christian Thalinger
 
-   $Id: options.c 1529 2004-11-17 17:19:14Z twisti $
+   $Id: options.c 1546 2004-11-18 12:25:04Z twisti $
 
 */
 
@@ -39,7 +39,7 @@
 
 /* command line option */
 
-bool verbose = false;
+bool opt_verbose = false;
 bool compileall = false;
 bool runverbose = false;       /* trace all method invocation                */
 bool verboseexception = false;

diff --git a/src/vm/options.h b/src/vm/options.h
index 4fa468b3d76e72edda303e0efa97c56b729843c4..b4cf895f63969cc5469453acd9d5b1bd804c020d 100644 (file)
--- a/src/vm/options.h
+++ b/src/vm/options.h
@@ -27,7 +27,7 @@
 
    Authors: Christian Thalinger
 
-   $Id: options.h 1529 2004-11-17 17:19:14Z twisti $
+   $Id: options.h 1546 2004-11-18 12:25:04Z twisti $
 
 */
 
@@ -57,8 +57,8 @@ struct opt_struct {
 
 /* global variables ***********************************************************/
 
+extern bool opt_verbose;
 extern bool compileall;
-extern bool verbose;
 extern bool runverbose;
 extern bool verboseexception;
 extern bool collectverbose;