PR85 for x86_64.

[cacao.git] / src / vm / options.c

diff --git a/src/vm/options.c b/src/vm/options.c
index 42adb3f909c86005de44022c4b3444fe839f1bd5..b5b88a710336ff78ef428488af5da03a10489230 100644 (file)
--- a/src/vm/options.c
+++ b/src/vm/options.c
@@ -30,9 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "mm/memory.h"
-
-#include "native/jni.h"
+#include "mm/memory.hpp"
 
 #include "vm/options.h"
 #include "vm/os.hpp"
@@ -85,12 +83,10 @@ bool compileverbose =  false;           /* trace compiler actions             */
 bool showstack = false;
 
 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 checkbounds = true;       /* check array bounds                         */
-bool opt_noieee = false;       /* don't implement ieee compliant floats      */
 bool checksync = true;         /* do synchronization                         */
 #if defined(ENABLE_LOOP)
 bool opt_loops = false;        /* optimize array accesses in loops           */
@@ -164,6 +160,7 @@ int      opt_ThreadStackSize              = 0;
 
 /* Debugging options which can be turned off. */
 
+bool     opt_AlwaysEmitLongBranches       = false;
 int      opt_DebugExceptions              = 0;
 int      opt_DebugFinalizer               = 0;
 int      opt_DebugLocalReferences         = 0;
@@ -234,6 +231,7 @@ enum {
 
        /* Debugging options which can be turned off. */
 
+       OPT_AlwaysEmitLongBranches,
        OPT_DebugExceptions,
        OPT_DebugFinalizer,
        OPT_DebugLocalReferences,
@@ -287,6 +285,7 @@ option_t options_XX[] = {
 
        /* Debugging options which can be turned off. */
 
+       { "AlwaysEmitLongBranches",       OPT_AlwaysEmitLongBranches,       OPT_TYPE_BOOLEAN, "Always emit long-branches." },
        { "DebugExceptions",              OPT_DebugExceptions,              OPT_TYPE_BOOLEAN, "debug exceptions" },
        { "DebugFinalizer",               OPT_DebugFinalizer,               OPT_TYPE_BOOLEAN, "debug finalizer thread" },
        { "DebugLocalReferences",         OPT_DebugLocalReferences,         OPT_TYPE_BOOLEAN, "print debug information for local reference tables" },
@@ -619,6 +618,10 @@ void options_xx(JavaVMInitArgs *vm_args)
 
                /* Debugging options which can be turned off. */
 
+               case OPT_AlwaysEmitLongBranches:
+                       opt_AlwaysEmitLongBranches = enable;
+                       break;
+
                case OPT_DebugExceptions:
                        opt_DebugExceptions = enable;
                        break;