* opt_showexceptionstubs: added

* renamed some options (opt_ prefix)

diff --git a/src/cacao/cacao.c b/src/cacao/cacao.c
index 97431961e036c644e1909a31e946c5e5d65099fd..ebc42b1a29b08bf2d64a0107d7557ff85f4d78c7 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 2897 2005-07-04 20:39:26Z twisti $
+   $Id: cacao.c 2950 2005-07-09 13:37:29Z twisti $
 
 */
 
@@ -165,7 +165,6 @@ opt_struct opts[] = {
        { "noasyncgc",         false, OPT_IGNORE },
        { "noverify",          false, OPT_NOVERIFY },
        { "liberalutf",        false, OPT_LIBERALUTF },
-       { "oss",               true,  OPT_IGNORE },
        { "ss",                true,  OPT_IGNORE },
        { "v",                 false, OPT_VERBOSE1 },
        { "verbose",           false, OPT_VERBOSE },
@@ -268,6 +267,7 @@ static void usage(void)
        printf("    -s(how)a(ssembler)       show disassembled listing\n");
        printf("           c(onstants)       show the constant pool\n");
        printf("           d(atasegment)     show data segment listing\n");
+       printf("           e(xceptionstubs)  show disassembled exception stubs (only with -sa)\n");
        printf("           i(ntermediate)    show intermediate representation\n");
        printf("           m(ethods)         show class fields and methods\n");
        printf("           n(ative)          show disassembled native stubs\n");
@@ -791,17 +791,20 @@ int main(int argc, char **argv)
                        for (j = 0; j < strlen(opt_arg); j++) {         
                                switch (opt_arg[j]) {
                                case 'a':
-                                       showdisassemble = true;
+                                       opt_showdisassemble = true;
                                        compileverbose = true;
                                        break;
                                case 'c':
                                        showconstantpool = true;
                                        break;
                                case 'd':
-                                       showddatasegment = true;
+                                       opt_showddatasegment = true;
+                                       break;
+                               case 'e':
+                                       opt_showexceptionstubs = true;
                                        break;
                                case 'i':
-                                       showintermediate = true;
+                                       opt_showintermediate = true;
                                        compileverbose = true;
                                        break;
                                case 'm':

diff --git a/src/vm/options.c b/src/vm/options.c
index edb92bc374c14fb0e2bed83f79dc9589f5a6e4ce..1f08ea637217b12a12d7d5faefd8cf7a087236b8 100644 (file)
--- a/src/vm/options.c
+++ b/src/vm/options.c
@@ -26,7 +26,7 @@
 
    Authors: Christian Thalinger
 
-   $Id: options.c 2894 2005-07-04 20:38:07Z twisti $
+   $Id: options.c 2950 2005-07-09 13:37:29Z twisti $
 
 */
 
@@ -49,21 +49,22 @@ bool initverbose = false;
 bool opt_verbosegc = false;
 bool opt_verbosejni = false;
 
-bool opt_rt = false;           /* true if RTA parse should be used     RT-CO */
-bool opt_xta = false;          /* true if XTA parse should be used    XTA-CO */
-bool opt_vta = false;          /* true if VTA parse should be used    VTA-CO */
+bool opt_rt = false;           /* true if RTA parse should be used     RT-CO  */
+bool opt_xta = false;          /* true if XTA parse should be used    XTA-CO  */
+bool opt_vta = false;          /* true if VTA parse should be used    VTA-CO  */
 
-bool opt_liberalutf = false;   /* Don't check overlong UTF-8 sequences       */
+bool opt_liberalutf = false;   /* Don't check overlong UTF-8 sequences        */
 
 bool showmethods = false;
 bool showconstantpool = false;
 bool showutf = false;
 
-bool compileverbose =  false;  /* trace compiler actions                     */
+bool compileverbose =  false;           /* trace compiler actions             */
 bool showstack = false;
-bool showdisassemble = false;  /* generate disassembler listing              */
-bool showddatasegment = false; /* generate data segment listing              */
-bool showintermediate = false; /* generate intermediate code listing         */
+bool opt_showdisassemble = false;       /* generate disassembler listing      */
+bool opt_showddatasegment = false;      /* generate data segment listing      */
+bool opt_showintermediate = false;      /* generate intermediate code listing */
+bool opt_showexceptionstubs = false;
 bool opt_shownativestub = false;
 
 bool useinliningm = false;      /* use method inlining                        */

diff --git a/src/vm/options.h b/src/vm/options.h
index ba460525aa4b453985cb52c3d1584a23a9eb3191..be5a426402f5a07d1116c96a5a8e090a50aa9e6b 100644 (file)
--- a/src/vm/options.h
+++ b/src/vm/options.h
@@ -26,7 +26,7 @@
 
    Authors: Christian Thalinger
 
-   $Id: options.h 2894 2005-07-04 20:38:07Z twisti $
+   $Id: options.h 2950 2005-07-09 13:37:29Z twisti $
 
 */
 
@@ -79,9 +79,10 @@ extern bool showutf;
 
 extern bool compileverbose;
 extern bool showstack;
-extern bool showdisassemble;
-extern bool showddatasegment;
-extern bool showintermediate;
+extern bool opt_showdisassemble;
+extern bool opt_showddatasegment;
+extern bool opt_showintermediate;
+extern bool opt_showexceptionstubs;
 extern bool opt_shownativestub;
 
 /*#undef INAFTERMAIN*/  /*use to inline system methods before main is called*/