* src/vm/options.h: Renamed -verbosecolor to -debug-color,

opt_colorverbose to opt_debugcolor and OPT_COLORVERBOSE to
OPT_DEBUGCOLOR
* src/vm/method.c: Same as above.
* src/vm/jit/dseg.c: Same as above.
* src/vm/vm.c: Same as above.
* src/vm/options.c: Same as above.
* src/vm/jit/Makefile.am: Removed options.h dependecy, as deps are
tracked  automatically.

diff --git a/src/vm/jit/Makefile.am b/src/vm/jit/Makefile.am
index 7b920455562828b56a5aa9c3ca75c1e184052b89..0c6181a84c0b73a879bfecab9e0b685f9f4d08b0 100644 (file)
--- a/src/vm/jit/Makefile.am
+++ b/src/vm/jit/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes: Edwin Steiner
 ##
-## $Id: Makefile.am 5253 2006-08-18 18:37:19Z tbfg $
+## $Id: Makefile.am 5258 2006-08-22 09:02:25Z tbfg $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -144,8 +144,7 @@ libjit_la_SOURCES = \
        stack.c \
        stack.h \
        stacktrace.c \
-       stacktrace.h \
-       ../options.h
+       stacktrace.h
 
 libjit_la_SOURCES += \
        cfg.c \

diff --git a/src/vm/jit/dseg.c b/src/vm/jit/dseg.c
index 4eba934780c1a7d6331929e7d5085b217544366a..386d057f1a64ac355f965643aa04b29c0e90ac55 100644 (file)
--- a/src/vm/jit/dseg.c
+++ b/src/vm/jit/dseg.c
@@ -31,7 +31,7 @@
             Joseph Wenninger
                        Edwin Steiner
 
-   $Id: dseg.c 5253 2006-08-18 18:37:19Z tbfg $
+   $Id: dseg.c 5258 2006-08-22 09:02:25Z tbfg $
 
 */
 
@@ -801,7 +801,7 @@ void dseg_display(jitdata *jd)
 
        s4ptr = (s4 *) (ptrint) code->mcode;
 
-       if (opt_colorverbose) printf("\033[34m");       /* blue */
+       if (opt_debugcolor) printf("\033[34m"); /* blue */
        printf("  --- dump of datasegment\n");
 
        for (i = cd->dseglen; i > 0 ; i -= 4) {
@@ -816,7 +816,7 @@ void dseg_display(jitdata *jd)
        }
 
        printf("  --- begin of data segment: %p\n", (void *) s4ptr);
-       if (opt_colorverbose) printf("\033[m");
+       if (opt_debugcolor) printf("\033[m");
 }
 #endif /* !defined(NDEBUG) */
 

diff --git a/src/vm/method.c b/src/vm/method.c
index 6bbb8c7ac1c36fb2809e583acaf8382a07940d52..4aa0705850e8c9425e93c8b4c6a400b88e72906c 100644 (file)
--- a/src/vm/method.c
+++ b/src/vm/method.c
@@ -32,7 +32,7 @@
             Edwin Steiner
             Christian Thalinger
 
-   $Id: method.c 5253 2006-08-18 18:37:19Z tbfg $
+   $Id: method.c 5258 2006-08-22 09:02:25Z tbfg $
 
 */
 
@@ -213,9 +213,9 @@ void method_print(methodinfo *m)
 #if !defined(NDEBUG)
 void method_println(methodinfo *m)
 {
-       if (opt_colorverbose) printf("\033[31m");       /* red */
+       if (opt_debugcolor) printf("\033[31m"); /* red */
        method_print(m);
-       if (opt_colorverbose) printf("\033[m"); 
+       if (opt_debugcolor) printf("\033[m");   
        printf("\n");
 }
 #endif /* !defined(NDEBUG) */

diff --git a/src/vm/options.c b/src/vm/options.c
index 6b8b666567db35fc0e53b473748a58e2ec252b92..eba1fe7f0987bde5fe6989c4cdc0a7774f64b7ae 100644 (file)
--- a/src/vm/options.c
+++ b/src/vm/options.c
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: options.c 5253 2006-08-18 18:37:19Z tbfg $
+   $Id: options.c 5258 2006-08-22 09:02:25Z tbfg $
 
 */
 
@@ -68,7 +68,7 @@ s4   opt_heapstartsize = 0;     /* initial heap size                          */
 s4   opt_stacksize     = 0;     /* thread stack size                          */
 
 bool opt_verbose = false;
-bool opt_colorverbose = false; /* use ANSI terminal sequences                */
+bool opt_debugcolor = false;   /* use ANSI terminal sequences                */
 bool compileall = false;
 
 bool loadverbose = false;

diff --git a/src/vm/options.h b/src/vm/options.h
index 292b145fa4761af5cd4113e2d98e531a752857ce..376bb3b61758b0efa1390a06e5584fb51133d583 100644 (file)
--- a/src/vm/options.h
+++ b/src/vm/options.h
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: options.h 5253 2006-08-18 18:37:19Z tbfg $
+   $Id: options.h 5258 2006-08-22 09:02:25Z tbfg $
 
 */
 
@@ -80,7 +80,7 @@ extern s4   opt_heapstartsize;
 extern s4   opt_stacksize;
 
 extern bool opt_verbose;
-extern bool opt_colorverbose;
+extern bool opt_debugcolor;
 extern bool compileall;
 
 extern bool loadverbose;         /* Print debug messages during loading */

diff --git a/src/vm/vm.c b/src/vm/vm.c
index 2a9325df55ad4387dcee290fa75a2d648e88a168..21c63c792448b50da4363b54475a0c3a162da08a 100644 (file)
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -167,7 +167,7 @@ enum {
        OPT_METHOD,
        OPT_SIGNATURE,
        OPT_SHOW,
-       OPT_COLORVERBOSE,
+       OPT_DEBUGCOLOR,
        OPT_ALL,
 
 #if defined(ENABLE_VERIFIER)
@@ -330,7 +330,7 @@ opt_struct opts[] = {
 #endif
        { "m",                 true,  OPT_METHOD },
        { "s",                 true,  OPT_SHOW },
-       { "verbosecolor",     false,  OPT_COLORVERBOSE },
+       { "debug-color",      false,  OPT_DEBUGCOLOR },
 
        { NULL,                false, 0 }
 };
@@ -382,7 +382,7 @@ void usage(void)
        puts("    -v                       write state-information");
        puts("    -verbose[:call|exception|jit]");
        puts("                             enable specific verbose output");
-       puts("    -verbosecolor            colored output for ANSI terms");
+       puts("    -debug-color             colored output for ANSI terms");
 #ifdef TYPECHECK_VERBOSE
        puts("    -verbosetc               write debug messages while typechecking");
 #endif
@@ -861,8 +861,8 @@ bool vm_create(JavaVMInitArgs *vm_args)
                        else if (strcmp("exception", opt_arg) == 0)
                                opt_verboseexception = true;
                        break;
-               case OPT_COLORVERBOSE:
-                       opt_colorverbose = true;
+               case OPT_DEBUGCOLOR:
+                       opt_debugcolor = true;
                        break;
 
 #if defined(ENABLE_VERIFIER) && defined(TYPECHECK_VERBOSE)