* src/vm/options.c (opt_shownops): Added.

* src/vm/options.h (opt_shownops): Likewise.
* src/vm/vm.c (usage): Added -so help.
(vm_create): Added opt_shownops handling.

diff --git a/src/vm/options.c b/src/vm/options.c
index f3ee29585d346c5be521811425734e5054be7ff6..4afbbdde1fafbab65df000f730e5a35e9afdfe97 100644 (file)
--- a/src/vm/options.c
+++ b/src/vm/options.c
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: options.c 5842 2006-10-27 10:41:02Z twisti $
+   $Id: options.c 5922 2006-11-05 21:43:09Z twisti $
 
 */
 
@@ -90,11 +90,13 @@ char *opt_signature = NULL;
 
 bool compileverbose =  false;           /* trace compiler actions             */
 bool showstack = false;
-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_showdisassemble    = false;    /* generate disassembler listing      */
+bool opt_shownops           = false;
+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 opt_shownativestub     = false;
 
 bool useinlining = false;      /* use method inlining                        */
 bool inlinevirtuals = false;   /* inline unique virtual methods              */

diff --git a/src/vm/options.h b/src/vm/options.h
index a7c1905fe2b6a067811c6f7eb6bb851070ef5b10..c919b6218cecf3d0d61710004115f241fd128c5f 100644 (file)
--- a/src/vm/options.h
+++ b/src/vm/options.h
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: options.h 5842 2006-10-27 10:41:02Z twisti $
+   $Id: options.h 5922 2006-11-05 21:43:09Z twisti $
 
 */
 
@@ -102,7 +102,9 @@ extern char *opt_signature;
 
 extern bool compileverbose;
 extern bool showstack;
+
 extern bool opt_showdisassemble;
+extern bool opt_shownops;
 extern bool opt_showddatasegment;
 extern bool opt_showintermediate;
 extern bool opt_showexceptionstubs;

diff --git a/src/vm/vm.c b/src/vm/vm.c
index d2f87dfb3696ed08815bd87bb92fc310e8adef81..ca422134272cd9f010d0c1c967ccdb2037328933 100644 (file)
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -25,8 +25,7 @@
    Contact: cacao@cacaojvm.org
 
    Authors: Christian Thalinger
-
-   Changes: Martin Platter
+            Martin Platter
 
    $Id: vm.c 4357 2006-01-22 23:33:38Z twisti $
 
@@ -77,7 +76,7 @@
 #include "vm/jit/optimizing/recompile.h"
 
 #if defined(ENABLE_JVMTI)
-#include "native/jvmti/cacaodbg.h"
+# include "native/jvmti/cacaodbg.h"
 #endif
 
 
@@ -443,17 +442,18 @@ void usage(void)
        puts("    -sig                     specify signature for a specific method");
 #endif
 
-       puts("    -s(how)...               show...");
-       puts("           c(onstants)       the constant pool");
-       puts("           m(ethods)         class fields and methods");
-       puts("           u(tf)             the utf - hash");
-       puts("           i(ntermediate)    intermediate representation");
+       puts("    -s...                    show...");
+       puts("      (c)onstants            the constant pool");
+       puts("      (m)ethods              class fields and methods");
+       puts("      (u)tf                  the utf - hash");
+       puts("      (i)ntermediate         intermediate representation");
 #if defined(ENABLE_DISASSEMBLER)
-       puts("           a(ssembler)       disassembled listing");
-       puts("           e(xceptionstubs)  disassembled exception stubs (only with -sa)");
-       puts("           n(ative)          disassembled native stubs");
+       puts("      (a)ssembler            disassembled listing");
+       puts("      n(o)ps                 show NOPs in disassembler output");
+       puts("      (e)xceptionstubs       disassembled exception stubs (only with -sa)");
+       puts("      (n)ative               disassembled native stubs");
 #endif
-       puts("           d(atasegment)     data segment listing");
+       puts("           (d)atasegment     data segment listing");
 #if defined(ENABLE_INLINING)
        puts("    -i     n(line)           activate inlining");
        puts("           v(irtual)         inline virtual methods (uses/turns rt option on)");
@@ -1099,6 +1099,10 @@ bool vm_create(JavaVMInitArgs *vm_args)
                                        compileverbose = true;
                                        break;
 
+                               case 'o':
+                                       opt_shownops = true;
+                                       break;
+
                                case 'e':
                                        opt_showexceptionstubs = true;
                                        break;