* src/vmcore/options.c (options_xx): Integrated vmlog options handling.
[cacao.git] / src / vm / vm.c
index 3685969a33a7f56ac5bd8d86244919281c23096b..cb74b4144c3cb2c232d3c837c8bbe9374a504c35 100644 (file)
@@ -1,9 +1,7 @@
-/* src/vm/finalizer.c - finalizer linked list and thread
+/* src/vm/vm.c - VM startup and shutdown functions
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   J. Wenninger, Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-
-   Changes: Martin Platter
-
-   $Id: finalizer.c 4357 2006-01-22 23:33:38Z twisti $
-
 */
 
 
 #include "config.h"
 
 #include <assert.h>
+#include <errno.h>
+#include <stdint.h>
 #include <stdlib.h>
 
 #include "vm/types.h"
 
-#include "mm/boehm.h"
+#include "arch.h"
+#include "md-abi.h"
+
+#include "vm/jit/abi-asm.h"
+
+#include "mm/codememory.h"
+#include "mm/gc-common.h"
 #include "mm/memory.h"
+
 #include "native/jni.h"
+#include "native/llni.h"
+#include "native/localref.h"
 #include "native/native.h"
 
-#if defined(ENABLE_THREADS)
-# include "threads/native/threads.h"
+#include "native/include/java_lang_Object.h"             /* required by j.l.C */
+#include "native/include/java_lang_String.h"             /* required by j.l.C */
+
+#if defined(WITH_CLASSPATH_SUN)
+# include "native/include/java_nio_ByteBuffer.h"        /* required by j.l.CL */
+# include "native/include/java_lang_ClassLoader.h"       /* required by j.l.C */
+#endif
+
+#include "native/include/java_lang_Class.h"
+
+#include "native/vm/nativevm.h"
+
+#include "threads/threads-common.h"
+
+#include "toolbox/logging.h"
+
+#include "vm/array.h"
+
+#if defined(ENABLE_ASSERTION)
+#include "vm/assertion.h"
 #endif
 
-#include "vm/classcache.h"
+#include "vm/builtin.h"
 #include "vm/exceptions.h"
 #include "vm/finalizer.h"
 #include "vm/global.h"
 #include "vm/initialize.h"
-#include "vm/options.h"
+#include "vm/package.h"
+#include "vm/primitive.h"
 #include "vm/properties.h"
 #include "vm/signallocal.h"
 #include "vm/stringlocal.h"
-#include "vm/suck.h"
 #include "vm/vm.h"
-#include "vm/jit/jit.h"
+
+#include "vm/jit/argument.h"
 #include "vm/jit/asmpart.h"
-#include "vm/jit/profile/profile.h"
-#include "vm/rt-timing.h"
+
+#if defined(ENABLE_DISASSEMBLER)
+# include "vm/jit/disass.h"
+#endif
+
+#include "vm/jit/jit.h"
+
+#if defined(ENABLE_PROFILING)
+# include "vm/jit/optimizing/profile.h"
+#endif
+
+#include "vm/jit/optimizing/recompile.h"
+
+#if defined(ENABLE_PYTHON)
+# include "vm/jit/python.h"
+#endif
+
+#include "vmcore/classcache.h"
+#include "vmcore/options.h"
+#include "vmcore/statistics.h"
+#include "vmcore/suck.h"
+#include "vmcore/system.h"
 
 #if defined(ENABLE_JVMTI)
-#include "native/jvmti/cacaodbg.h"
+# include "native/jvmti/cacaodbg.h"
+#endif
+
+#if defined(ENABLE_VMLOG)
+#include <vmlog_cacao.h>
 #endif
 
+
 /* Invocation API variables ***************************************************/
 
 _Jv_JavaVM *_Jv_jvm;                    /* denotes a Java VM                  */
@@ -82,29 +127,26 @@ s4 vms = 0;                             /* number of VMs created              */
 bool vm_initializing = false;
 bool vm_exiting = false;
 
+char      *mainstring = NULL;
+classinfo *mainclass = NULL;
+
 #if defined(ENABLE_INTRP)
 u1 *intrp_main_stack = NULL;
 #endif
 
-char *mainstring = NULL;
-classinfo *mainclass = NULL;
-
-char *specificmethodname = NULL;
-char *specificsignature = NULL;
-
-bool startit = true;
-
 
 /* define heap sizes **********************************************************/
 
-#define HEAP_MAXSIZE      64 * 1024 * 1024  /* default 64MB                   */
-#define HEAP_STARTSIZE    2  * 1024 * 1024  /* default 2MB                    */
-#define STACK_SIZE              128 * 1024  /* default 128kB                  */
+#define HEAP_MAXSIZE      128 * 1024 * 1024 /* default 128MB                  */
+#define HEAP_STARTSIZE      2 * 1024 * 1024 /* default 2MB                    */
+#define STACK_SIZE               128 * 1024 /* default 64kB                   */
 
 
 /* define command line options ************************************************/
 
 enum {
+       OPT_FOO,
+
        /* Java options */
 
        OPT_JAR,
@@ -123,6 +165,16 @@ enum {
 
        OPT_HELP,
        OPT_X,
+       OPT_XX,
+
+       OPT_EA,
+       OPT_DA,
+       OPT_EA_NOARG,
+       OPT_DA_NOARG,
+    
+
+       OPT_ESA,
+       OPT_DSA,
 
        /* Java non-standard options */
 
@@ -133,8 +185,12 @@ enum {
        OPT_BOOTCLASSPATH_A,
        OPT_BOOTCLASSPATH_P,
 
+       OPT_BOOTCLASSPATH_C,
+
+#if defined(ENABLE_PROFILING)
        OPT_PROF,
        OPT_PROF_OPTION,
+#endif
 
        OPT_MS,
        OPT_MX,
@@ -143,7 +199,6 @@ enum {
 
        OPT_VERBOSE1,
        OPT_NOIEEE,
-       OPT_SOFTNULL,
 
 #if defined(ENABLE_STATISTICS)
        OPT_TIME,
@@ -153,10 +208,14 @@ enum {
        OPT_LOG,
        OPT_CHECK,
        OPT_LOAD,
-       OPT_METHOD,
-       OPT_SIGNATURE,
        OPT_SHOW,
+       OPT_DEBUGCOLOR,
+
+#if !defined(NDEBUG)
        OPT_ALL,
+       OPT_METHOD,
+       OPT_SIGNATURE,
+#endif
 
 #if defined(ENABLE_VERIFIER)
        OPT_NOVERIFY,
@@ -164,7 +223,6 @@ enum {
        OPT_VERBOSETC,
 #endif
 #endif /* defined(ENABLE_VERIFIER) */
-       OPT_EAGER,
 
        /* optimization options */
 
@@ -176,13 +234,22 @@ enum {
        OPT_IFCONV,
 #endif
 
-#if defined(ENABLE_LSRA)
+#if defined(ENABLE_LSRA) || defined(ENABLE_SSA)
        OPT_LSRA,
 #endif
 
 #if defined(ENABLE_INLINING)
        OPT_INLINING,
-#endif
+#if !defined(NDEBUG)
+       OPT_INLINE_LOG,
+#endif
+#if defined(ENABLE_INLINING_DEBUG)
+       OPT_INLINE_DEBUG_ALL,
+       OPT_INLINE_DEBUG_END,
+       OPT_INLINE_DEBUG_MIN,
+       OPT_INLINE_DEBUG_MAX,
+#endif /* defined(ENABLE_INLINING_DEBUG) */
+#endif /* defined(ENABLE_INLINING) */
 
 #if defined(ENABLE_INTRP)
        /* interpreter options */
@@ -204,11 +271,19 @@ enum {
        OPT_AGENTPATH,
 #endif
 
+#if defined(ENABLE_DEBUG_FILTER)
+       OPT_FILTER_VERBOSECALL_INCLUDE,
+       OPT_FILTER_VERBOSECALL_EXCLUDE,
+       OPT_FILTER_SHOW_METHOD,
+#endif
+
        DUMMY
 };
 
 
 opt_struct opts[] = {
+       { "foo",               false, OPT_FOO },
+
        /* Java options */
 
        { "jar",               false, OPT_JAR },
@@ -217,6 +292,7 @@ opt_struct opts[] = {
        { "d64",               false, OPT_D64 },
        { "client",            false, OPT_IGNORE },
        { "server",            false, OPT_IGNORE },
+       { "jvm",               false, OPT_IGNORE },
        { "hotspot",           false, OPT_IGNORE },
 
        { "classpath",         true,  OPT_CLASSPATH },
@@ -228,10 +304,27 @@ opt_struct opts[] = {
        { "help",              false, OPT_HELP },
        { "?",                 false, OPT_HELP },
        { "X",                 false, OPT_X },
+       { "XX:",               true,  OPT_XX },
+
+       { "ea:",               true,  OPT_EA },
+       { "da:",               true,  OPT_DA },
+       { "ea",                false, OPT_EA_NOARG },
+       { "da",                false, OPT_DA_NOARG },
+
+       { "enableassertions:",  true,  OPT_EA },
+       { "disableassertions:", true,  OPT_DA },
+       { "enableassertions",   false, OPT_EA_NOARG },
+       { "disableassertions",  false, OPT_DA_NOARG },
+
+       { "esa",                     false, OPT_ESA },
+       { "enablesystemassertions",  false, OPT_ESA },
+       { "dsa",                     false, OPT_DSA },
+       { "disablesystemassertions", false, OPT_DSA },
 
        { "noasyncgc",         false, OPT_IGNORE },
 #if defined(ENABLE_VERIFIER)
        { "noverify",          false, OPT_NOVERIFY },
+       { "Xverify:none",      false, OPT_NOVERIFY },
 #endif
        { "v",                 false, OPT_VERBOSE1 },
        { "verbose:",          true,  OPT_VERBOSE },
@@ -242,7 +335,6 @@ opt_struct opts[] = {
 #if defined(__ALPHA__)
        { "noieee",            false, OPT_NOIEEE },
 #endif
-       { "softnull",          false, OPT_SOFTNULL },
 #if defined(ENABLE_STATISTICS)
        { "time",              false, OPT_TIME },
        { "stat",              false, OPT_STAT },
@@ -250,9 +342,12 @@ opt_struct opts[] = {
        { "log",               true,  OPT_LOG },
        { "c",                 true,  OPT_CHECK },
        { "l",                 false, OPT_LOAD },
-       { "eager",             false, OPT_EAGER },
-       { "sig",               true,  OPT_SIGNATURE },
+
+#if !defined(NDEBUG)
        { "all",               false, OPT_ALL },
+       { "sig",               true,  OPT_SIGNATURE },
+#endif
+
 #if defined(ENABLE_LOOP)
        { "oloop",             false, OPT_OLOOP },
 #endif
@@ -262,6 +357,9 @@ opt_struct opts[] = {
 #if defined(ENABLE_LSRA)
        { "lsra",              false, OPT_LSRA },
 #endif
+#if  defined(ENABLE_SSA)
+       { "lsra",              true, OPT_LSRA },
+#endif
 
 #if defined(ENABLE_INTRP)
        /* interpreter options */
@@ -286,27 +384,55 @@ opt_struct opts[] = {
        { "Xbootclasspath:",   true,  OPT_BOOTCLASSPATH },
        { "Xbootclasspath/a:", true,  OPT_BOOTCLASSPATH_A },
        { "Xbootclasspath/p:", true,  OPT_BOOTCLASSPATH_P },
+       { "Xbootclasspath/c:", true,  OPT_BOOTCLASSPATH_C },
+
 #ifdef ENABLE_JVMTI
        { "Xdebug",            false, OPT_DEBUG },
        { "Xnoagent",          false, OPT_NOAGENT },
        { "Xrunjdwp",          true,  OPT_XRUNJDWP },
 #endif 
+
        { "Xms",               true,  OPT_MS },
        { "ms",                true,  OPT_MS },
        { "Xmx",               true,  OPT_MX },
        { "mx",                true,  OPT_MX },
        { "Xss",               true,  OPT_SS },
        { "ss",                true,  OPT_SS },
+
+#if defined(ENABLE_PROFILING)
        { "Xprof:",            true,  OPT_PROF_OPTION },
        { "Xprof",             false, OPT_PROF },
+#endif
 
-       /* keep these at the end of the list */
+       /* inlining options */
 
 #if defined(ENABLE_INLINING)
-       { "i",                 true,  OPT_INLINING },
+#if defined(ENABLE_INLINING_DEBUG)
+       { "ia",                false, OPT_INLINE_DEBUG_ALL },
+       { "ii",                true,  OPT_INLINE_DEBUG_MIN },
+       { "im",                true,  OPT_INLINE_DEBUG_MAX },
+       { "ie",                true,  OPT_INLINE_DEBUG_END },
+#endif /* defined(ENABLE_INLINING_DEBUG) */
+#if !defined(NDEBUG)
+       { "il",                false, OPT_INLINE_LOG },
 #endif
+       { "i",                 false, OPT_INLINING },
+#endif /* defined(ENABLE_INLINING) */
+
+       /* keep these at the end of the list */
+
+#if !defined(NDEBUG)
        { "m",                 true,  OPT_METHOD },
+#endif
+
        { "s",                 true,  OPT_SHOW },
+       { "debug-color",      false,  OPT_DEBUGCOLOR },
+
+#if defined(ENABLE_DEBUG_FILTER)
+       { "XXfi",              true,  OPT_FILTER_VERBOSECALL_INCLUDE },
+       { "XXfx",              true,  OPT_FILTER_VERBOSECALL_EXCLUDE },
+       { "XXfm",              true,  OPT_FILTER_SHOW_METHOD },
+#endif
 
        { NULL,                false, 0 }
 };
@@ -325,11 +451,12 @@ void usage(void)
        puts("   or  cacao [-options] -jar jarfile [arguments]");
        puts("               (to run a standalone jar file)\n");
 
-       puts("Java options:");
+       puts("where options include:");
        puts("    -d32                     use 32-bit data model if available");
        puts("    -d64                     use 64-bit data model if available");
        puts("    -client                  compatibility (currently ignored)");
        puts("    -server                  compatibility (currently ignored)");
+       puts("    -jvm                     compatibility (currently ignored)");
        puts("    -hotspot                 compatibility (currently ignored)\n");
 
        puts("    -cp <path>               specify a path to look for classes");
@@ -340,16 +467,78 @@ void usage(void)
        puts("    -fullversion             print jpackage-compatible product version and exit");
        puts("    -showversion             print product version and continue");
        puts("    -help, -?                print this help message");
-       puts("    -X                       print help on non-standard Java options\n");
+       puts("    -X                       print help on non-standard Java options");
+       puts("    -XX                      print help on debugging options");
+    puts("    -ea[:<packagename>...|:<classname>]");
+    puts("    -enableassertions[:<packagename>...|:<classname>]");
+       puts("                             enable assertions with specified granularity");
+       puts("    -da[:<packagename>...|:<classname>]");
+       puts("    -disableassertions[:<packagename>...|:<classname>]");
+       puts("                             disable assertions with specified granularity");
+       puts("    -esa | -enablesystemassertions");
+       puts("                             enable system assertions");
+       puts("    -dsa | -disablesystemassertions");
+       puts("                             disable system assertions");
 
 #ifdef ENABLE_JVMTI
        puts("    -agentlib:<agent-lib-name>=<options>  library to load containg JVMTI agent");
+       puts ("                                         for jdwp help use: -agentlib:jdwp=help");
        puts("    -agentpath:<path-to-agent>=<options>  path to library containg JVMTI agent");
 #endif
 
-       puts("CACAO options:\n");
+       /* exit with error code */
+
+       exit(1);
+}   
+
+
+static void Xusage(void)
+{
+#if defined(ENABLE_JIT)
+       puts("    -Xjit                    JIT mode execution (default)");
+#endif
+#if defined(ENABLE_INTRP)
+       puts("    -Xint                    interpreter mode execution");
+#endif
+       puts("    -Xbootclasspath:<zip/jar files and directories separated by :>");
+    puts("                             value is set as bootstrap class path");
+       puts("    -Xbootclasspath/a:<zip/jar files and directories separated by :>");
+       puts("                             value is appended to the bootstrap class path");
+       puts("    -Xbootclasspath/p:<zip/jar files and directories separated by :>");
+       puts("                             value is prepended to the bootstrap class path");
+       puts("    -Xbootclasspath/c:<zip/jar files and directories separated by :>");
+       puts("                             value is used as Java core library, but the");
+       puts("                             hardcoded VM interface classes are prepended");
+       printf("    -Xms<size>               set the initial size of the heap (default: %dMB)\n", HEAP_STARTSIZE / 1024 / 1024);
+       printf("    -Xmx<size>               set the maximum size of the heap (default: %dMB)\n", HEAP_MAXSIZE / 1024 / 1024);
+       printf("    -Xss<size>               set the thread stack size (default: %dkB)\n", STACK_SIZE / 1024);
+
+#if defined(ENABLE_PROFILING)
+       puts("    -Xprof[:bb]              collect and print profiling data");
+#endif
+
+#if defined(ENABLE_JVMTI)
+    /* -Xdebug option depend on gnu classpath JDWP options. options: 
+        transport=dt_socket,address=<hostname:port>,server=(y|n),suspend(y|n) */
+       puts("    -Xdebug                  enable remote debugging\n");
+       puts("    -Xrunjdwp transport=[dt_socket|...],address=<hostname:port>,server=[y|n],suspend=[y|n]\n");
+       puts("                             enable remote debugging\n");
+#endif 
+
+       /* exit with error code */
+
+       exit(1);
+}   
+
+
+#if 0
+static void XXusage(void)
+{
        puts("    -v                       write state-information");
-       puts("    -verbose[:call|exception]enable specific verbose output");
+#if !defined(NDEBUG)
+       puts("    -verbose:jit             enable specific verbose output");
+       puts("    -debug-color             colored output for ANSI terms");
+#endif
 #ifdef TYPECHECK_VERBOSE
        puts("    -verbosetc               write debug messages while typechecking");
 #endif
@@ -359,7 +548,6 @@ void usage(void)
 #if defined(ENABLE_VERIFIER)
        puts("    -noverify                don't verify classfiles");
 #endif
-       puts("    -softnull                use software nullpointer check");
 #if defined(ENABLE_STATISTICS)
        puts("    -time                    measure the runtime");
        puts("    -stat                    detailed compiler statistics");
@@ -371,68 +559,57 @@ void usage(void)
        puts("    -oloop                   optimize array accesses in loops");
 #endif
        puts("    -l                       don't start the class after loading");
-       puts("    -eager                   perform eager class loading and linking");
+#if !defined(NDEBUG)
        puts("    -all                     compile all methods, no execution");
        puts("    -m                       compile only a specific method");
        puts("    -sig                     specify signature for a specific method");
-       puts("    -s(how)a(ssembler)       show disassembled listing");
-       puts("           c(onstants)       show the constant pool");
-       puts("           d(atasegment)     show data segment listing");
-       puts("           e(xceptionstubs)  show disassembled exception stubs (only with -sa)");
-       puts("           i(ntermediate)    show intermediate representation");
-       puts("           m(ethods)         show class fields and methods");
-       puts("           n(ative)          show disassembled native stubs");
-       puts("           u(tf)             show the utf - hash");
+#endif
+
+       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("      n(o)ps                 show NOPs in disassembler output");
+#endif
+       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)");
-       puts("           e(exception)      inline methods with exceptions");
-       puts("           p(aramopt)        optimize argument renaming");
-       puts("           o(utsiders)       inline methods of foreign classes");
+       puts("    -i                       activate inlining");
+#if !defined(NDEBUG)
+       puts("    -il                      log inlining");
+#endif
+#if defined(ENABLE_INLINING_DEBUG)
+       puts("    -ia                      use inlining for all methods");
+       puts("    -ii <size>               set minimum size for inlined result");
+       puts("    -im <size>               set maximum size for inlined result");
+       puts("    -ie <number>             stop inlining after the given number of roots");
+#endif /* defined(ENABLE_INLINING_DEBUG) */
 #endif /* defined(ENABLE_INLINING) */
+
 #if defined(ENABLE_IFCONV)
        puts("    -ifconv                  use if-conversion");
 #endif
 #if defined(ENABLE_LSRA)
        puts("    -lsra                    use linear scan register allocation");
 #endif
-
-       /* exit with error code */
-
-       exit(1);
-}   
-
-
-static void Xusage(void)
-{
-#if defined(ENABLE_JIT)
-       puts("    -Xjit                    JIT mode execution (default)");
+#if defined(ENABLE_SSA)
+       puts("    -lsra:...                use linear scan register allocation (with SSA)");
+       puts("       (d)ead code elimination");
+       puts("       (c)opy propagation");
 #endif
-#if defined(ENABLE_INTRP)
-       puts("    -Xint                    interpreter mode execution");
+#if defined(ENABLE_DEBUG_FILTER)
+       puts("    -XXfi <regex>            begin of dynamic scope for verbosecall filter");
+       puts("    -XXfx <regex>            end of dynamic scope for verbosecall filter");
+       puts("    -XXfm <regex>            filter for show options");
 #endif
-       puts("    -Xbootclasspath:<zip/jar files and directories separated by :>");
-    puts("                             value is set as bootstrap class path");
-       puts("    -Xbootclasspath/a:<zip/jar files and directories separated by :>");
-       puts("                             value is appended to the bootstrap class path");
-       puts("    -Xbootclasspath/p:<zip/jar files and directories separated by :>");
-       puts("                             value is prepended to the bootstrap class path");
-       puts("    -Xms<size>               set the initial size of the heap (default: 2MB)");
-       puts("    -Xmx<size>               set the maximum size of the heap (default: 64MB)");
-       puts("    -Xss<size>               set the thread stack size (default: 128kB)");
-       puts("    -Xprof[:bb]              collect and print profiling data");
-#if defined(ENABLE_JVMTI)
-    /* -Xdebug option depend on gnu classpath JDWP options. options: 
-        transport=dt_socket,address=<hostname:port>,server=(y|n),suspend(y|n) */
-       puts("    -Xdebug           enable remote debugging\n");
-       puts("    -Xrunjdwp transport=[dt_socket|...],address=<hostname:port>,server=[y|n],suspend=[y|n]\n");
-       puts("                      enable remote debugging\n");
-#endif 
-
        /* exit with error code */
 
        exit(1);
-}   
+}
+#endif
 
 
 /* version *********************************************************************
@@ -441,26 +618,42 @@ static void Xusage(void)
 
 *******************************************************************************/
 
-static void version(void)
+static void version(bool opt_exit)
 {
        puts("java version \""JAVA_VERSION"\"");
-       puts("CACAO version "VERSION"");
+       puts("CACAO version "VERSION"\n");
 
-       puts("Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,");
-       puts("C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,");
-       puts("E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,");
-       puts("J. Wenninger, Institut f. Computersprachen - TU Wien\n");
+       puts("Copyright (C) 1996-2005, 2006, 2007, 2008");
+       puts("CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO");
+       puts("This is free software; see the source for copying conditions.  There is NO");
+       puts("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.");
 
-       puts("This program is free software; you can redistribute it and/or");
-       puts("modify it under the terms of the GNU General Public License as");
-       puts("published by the Free Software Foundation; either version 2, or (at");
-       puts("your option) any later version.\n");
+       /* exit normally, if requested */
 
-       puts("This program is distributed in the hope that it will be useful, but");
-       puts("WITHOUT ANY WARRANTY; without even the implied warranty of");
-       puts("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU");
-       puts("General Public License for more details.\n");
+       if (opt_exit)
+               exit(0);
+}
+
+
+/* fullversion *****************************************************************
+
+   Prints a Sun compatible version information (required e.g. by
+   jpackage, www.jpackage.org).
+
+*******************************************************************************/
+
+static void fullversion(void)
+{
+       puts("java full version \"cacao-"JAVA_VERSION"\"");
+
+       /* exit normally */
+
+       exit(0);
+}
 
+
+static void vm_printconfig(void)
+{
        puts("Configure/Build options:\n");
        puts("  ./configure: "VERSION_CONFIGURE_ARGS"");
 #if defined(__VERSION__)
@@ -470,146 +663,211 @@ static void version(void)
 #endif
        puts("  CFLAGS     : "VERSION_CFLAGS"\n");
 
-       puts("Default classpath variables:\n");
-       puts("  java.boot.class.path    : "CACAO_VM_ZIP_PATH":"CLASSPATH_GLIBJ_ZIP_PATH"");
-       puts("  java.library.path       : "CLASSPATH_LIBRARY_PATH"\n");
+       puts("Default variables:\n");
+       printf("  maximum heap size              : %d\n", HEAP_MAXSIZE);
+       printf("  initial heap size              : %d\n", HEAP_STARTSIZE);
+       printf("  stack size                     : %d\n", STACK_SIZE);
+
+#if defined(WITH_JRE_LAYOUT)
+       /* When we're building with JRE-layout, the default paths are the
+          same as the runtime paths. */
+#else
+# if defined(WITH_CLASSPATH_GNU)
+       puts("  gnu.classpath.boot.library.path: "CLASSPATH_LIBDIR);
+       puts("  java.boot.class.path           : "CACAO_VM_ZIP":"CLASSPATH_CLASSES"");
+# elif defined(WITH_CLASSPATH_SUN)
+       puts("  sun.boot.library.path          : "CLASSPATH_LIBDIR);
+       puts("  java.boot.class.path           : "CLASSPATH_CLASSES);
+# endif
+#endif
+
+       puts("");
+
+       puts("Runtime variables:\n");
+       printf("  maximum heap size              : %d\n", opt_heapmaxsize);
+       printf("  initial heap size              : %d\n", opt_heapstartsize);
+       printf("  stack size                     : %d\n", opt_stacksize);
+
+#if defined(WITH_CLASSPATH_GNU)
+       printf("  gnu.classpath.boot.library.path: %s\n", properties_get("gnu.classpath.boot.library.path"));
+#elif defined(WITH_CLASSPATH_SUN)
+       printf("  sun.boot.library.path          : %s\n", properties_get("sun.boot.library.path"));
+#endif
 
-       puts("Runtime classpath variables:\n");
-       printf("  java.boot.class.path    : %s\n", bootclasspath);
+       printf("  java.boot.class.path           : %s\n", properties_get("java.boot.class.path"));
+       printf("  java.class.path                : %s\n", properties_get("java.class.path"));
 }
 
 
-/* fullversion *****************************************************************
+/* forward declarations *******************************************************/
 
-   Prints a Sun compatible version information (required e.g. by
-   jpackage, www.jpackage.org).
+static char *vm_get_mainclass_from_jar(char *mainstring);
+#if !defined(NDEBUG)
+static void  vm_compile_all(void);
+static void  vm_compile_method(void);
+#endif
+
+
+/* vm_createjvm ****************************************************************
+
+   Implementation for JNI_CreateJavaVM.
 
 *******************************************************************************/
 
-static void fullversion(void)
+bool vm_createjvm(JavaVM **p_vm, void **p_env, void *vm_args)
 {
-       puts("java full version \"cacao-"JAVA_VERSION"\"");
+       JavaVMInitArgs *_vm_args;
+       _Jv_JNIEnv     *env;
+       _Jv_JavaVM     *vm;
 
-       /* exit normally */
+       /* get the arguments for the new JVM */
 
-       exit(0);
+       _vm_args = (JavaVMInitArgs *) vm_args;
+
+       /* get the VM and Env tables (must be set before vm_create) */
+
+       env = NEW(_Jv_JNIEnv);
+
+#if defined(ENABLE_JNI)
+       env->env = &_Jv_JNINativeInterface;
+#endif
+
+       /* XXX Set the global variable.  Maybe we should do that differently. */
+
+       _Jv_env = env;
+
+       /* create and fill a JavaVM structure */
+
+       vm = NEW(_Jv_JavaVM);
+
+#if defined(ENABLE_JNI)
+       vm->functions = &_Jv_JNIInvokeInterface;
+#endif
+
+       /* XXX Set the global variable.  Maybe we should do that differently. */
+       /* XXX JVMTI Agents needs a JavaVM  */
+
+       _Jv_jvm = vm;
+
+       /* actually create the JVM */
+
+       if (!vm_create(_vm_args))
+               goto error;
+
+       /* now return the values */
+
+       *p_vm  = (JavaVM *) vm;
+       *p_env = (void *) env;
+
+       return true;
+
+ error:
+       /* release allocated memory */
+
+       FREE(env, _Jv_JNIEnv);
+       FREE(vm, _Jv_JavaVM);
+
+       return false;
 }
 
 
 /* vm_create *******************************************************************
 
-   Creates a JVM.  Called by JNI_CreateJavaVM.
+   Creates a JVM.  Called by vm_createjvm.
 
 *******************************************************************************/
 
 bool vm_create(JavaVMInitArgs *vm_args)
 {
-       char *cp;
-       s4    cplen;
-       u4    heapmaxsize;
-       u4    heapstartsize;
-       s4    opt;
-       s4    i, j, k;
-
+       int   len;
+       char *p;
+       char *boot_class_path;
+       char *class_path;
+       int   opt;
+       int   i, j;
+       bool  opt_version;
+       bool  opt_exit;
 
 #if defined(ENABLE_JVMTI)
        lt_dlhandle  handle;
-       char* libname;
-       bool agentbypath = false;;
+       char *libname, *agentarg;
+       bool jdwp,agentbypath;
+       jdwp = agentbypath = false;
 #endif
-       
-
 
-       /* check the JNI version requested */
+#if defined(ENABLE_JNI)
+       /* Check the JNI version requested. */
 
-       switch (vm_args->version) {
-       case JNI_VERSION_1_1:
-               break;
-       case JNI_VERSION_1_2:
-       case JNI_VERSION_1_4:
-               break;
-       default:
+       if (!jni_version_check(vm_args->version))
                return false;
-       }
+#endif
 
-       /* we only support 1 JVM instance */
+       /* We only support 1 JVM instance. */
 
        if (vms > 0)
                return false;
 
+       /* Install the exit handler. */
 
-       /* get stuff from the environment *****************************************/
-
-#if defined(DISABLE_GC)
-       nogc_init(HEAP_MAXSIZE, HEAP_STARTSIZE);
-#endif
-
+       if (atexit(vm_exit_handler))
+               vm_abort("atexit failed: %s\n", strerror(errno));
 
-       /* set the bootclasspath */
+       /* Set some options. */
 
-       cp = getenv("BOOTCLASSPATH");
+       opt_version       = false;
+       opt_exit          = false;
 
-       if (cp) {
-               bootclasspath = MNEW(char, strlen(cp) + strlen("0"));
-               strcpy(bootclasspath, cp);
+       opt_noieee        = false;
 
-       } else {
-               cplen = strlen(CACAO_VM_ZIP_PATH) +
-                       strlen(":") +
-                       strlen(CLASSPATH_GLIBJ_ZIP_PATH) +
-                       strlen("0");
+       opt_heapmaxsize   = HEAP_MAXSIZE;
+       opt_heapstartsize = HEAP_STARTSIZE;
+       opt_stacksize     = STACK_SIZE;
 
-               bootclasspath = MNEW(char, cplen);
-               strcat(bootclasspath, CACAO_VM_ZIP_PATH);
-               strcat(bootclasspath, ":");
-               strcat(bootclasspath, CLASSPATH_GLIBJ_ZIP_PATH);
-       }
+       /* Initialize the properties list before command-line handling.
+          Otherwise -XX:+PrintConfig crashes. */
 
+       properties_init();
 
-       /* set the classpath */
+       /* First of all, parse the -XX options. */
 
-       cp = getenv("CLASSPATH");
+#if defined(ENABLE_VMLOG)
+       vmlog_cacao_init_options();
+#endif
 
-       if (cp) {
-               classpath = MNEW(char, strlen(cp) + strlen("0"));
-               strcat(classpath, cp);
+       options_xx(vm_args);
 
-       } else {
-               classpath = MNEW(char, strlen(".") + strlen("0"));
-               strcpy(classpath, ".");
-       }
+#if defined(ENABLE_VMLOG)
+       vmlog_cacao_init();
+#endif
 
+       /* We need to check if the actual size of a java.lang.Class object
+          is smaller or equal than the assumption made in
+          src/vmcore/class.h. */
 
-       /* interpret the options **************************************************/
-   
-       checknull  = false;
-       opt_noieee = false;
+       if (sizeof(java_lang_Class) > sizeof(dummy_java_lang_Class))
+               vm_abort("vm_create: java_lang_Class structure is bigger than classinfo.object (%d > %d)", sizeof(java_lang_Class), sizeof(dummy_java_lang_Class));
 
-       heapmaxsize   = HEAP_MAXSIZE;
-       heapstartsize = HEAP_STARTSIZE;
-       opt_stacksize = STACK_SIZE;
+       /* set the VM starttime */
 
+       _Jv_jvm->starttime = builtin_currenttimemillis();
 
 #if defined(ENABLE_JVMTI)
        /* initialize JVMTI related  **********************************************/
-       jdwp = jvmti = false;
+       jvmti = false;
 #endif
 
-       /* initialize properties before commandline handling */
-
-       if (!properties_init())
-               throw_cacao_exception_exit(string_java_lang_InternalError,
-                                                                  "Unable to init properties");
-
-       /* add some default properties */
-
-       properties_add("java.endorsed.dirs", ""CACAO_PREFIX"/jre/lib/endorsed");
+       /* Fill the properties before command-line handling. */
 
+       properties_set();
 
        /* iterate over all passed options */
 
        while ((opt = options_get(opts, vm_args)) != OPT_DONE) {
                switch (opt) {
+               case OPT_FOO:
+                       opt_foo = true;
+                       break;
+
                case OPT_IGNORE:
                        break;
                        
@@ -632,19 +890,28 @@ bool vm_create(JavaVMInitArgs *vm_args)
                        break;
 
                case OPT_CLASSPATH:
-                       /* forget old classpath and set the argument as new classpath */
-                       MFREE(classpath, char, strlen(classpath));
+                       /* Forget old classpath and set the argument as new
+                          classpath. */
+
+                       class_path = properties_get("java.class.path");
+
+                       p = MNEW(char, strlen(opt_arg) + strlen("0"));
+
+                       strcpy(p, opt_arg);
 
-                       classpath = MNEW(char, strlen(opt_arg) + strlen("0"));
-                       strcpy(classpath, opt_arg);
+#if defined(ENABLE_JAVASE)
+                       properties_add("java.class.path", p);
+#endif
+
+                       MFREE(class_path, char, strlen(class_path));
                        break;
 
                case OPT_D:
-                       for (j = 0; j < strlen(opt_arg); j++) {
-                               if (opt_arg[j] == '=') {
-                                       opt_arg[j] = '\0';
-                                       properties_add(opt_arg, opt_arg + j + 1);
-                                       goto didit;
+                       for (i = 0; i < strlen(opt_arg); i++) {
+                               if (opt_arg[i] == '=') {
+                                       opt_arg[i] = '\0';
+                                       properties_add(opt_arg, opt_arg + i + 1);
+                                       goto opt_d_done;
                                }
                        }
 
@@ -652,83 +919,121 @@ bool vm_create(JavaVMInitArgs *vm_args)
 
                        properties_add(opt_arg, "");
 
-               didit:
+               opt_d_done:
                        break;
 
                case OPT_BOOTCLASSPATH:
                        /* Forget default bootclasspath and set the argument as
                           new boot classpath. */
-                       MFREE(bootclasspath, char, strlen(bootclasspath));
 
-                       bootclasspath = MNEW(char, strlen(opt_arg) + strlen("0"));
-                       strcpy(bootclasspath, opt_arg);
+                       boot_class_path = properties_get("sun.boot.class.path");
+
+                       p = MNEW(char, strlen(opt_arg) + strlen("0"));
+
+                       strcpy(p, opt_arg);
+
+                       properties_add("sun.boot.class.path", p);
+                       properties_add("java.boot.class.path", p);
+
+                       MFREE(boot_class_path, char, strlen(boot_class_path));
                        break;
 
                case OPT_BOOTCLASSPATH_A:
-                       /* append to end of bootclasspath */
-                       cplen = strlen(bootclasspath);
+                       /* Append to bootclasspath. */
+
+                       boot_class_path = properties_get("sun.boot.class.path");
+
+                       len = strlen(boot_class_path);
 
-                       bootclasspath = MREALLOC(bootclasspath,
-                                                                        char,
-                                                                        cplen,
-                                                                        cplen + strlen(":") +
-                                                                        strlen(opt_arg) + strlen("0"));
+                       p = MREALLOC(boot_class_path,
+                                                char,
+                                                len + strlen("0"),
+                                                len + strlen(":") +
+                                                strlen(opt_arg) + strlen("0"));
 
-                       strcat(bootclasspath, ":");
-                       strcat(bootclasspath, opt_arg);
+                       strcat(p, ":");
+                       strcat(p, opt_arg);
+
+                       properties_add("sun.boot.class.path", p);
+                       properties_add("java.boot.class.path", p);
                        break;
 
                case OPT_BOOTCLASSPATH_P:
-                       /* prepend in front of bootclasspath */
-                       cp = bootclasspath;
-                       cplen = strlen(cp);
+                       /* Prepend to bootclasspath. */
+
+                       boot_class_path = properties_get("sun.boot.class.path");
+
+                       len = strlen(boot_class_path);
+
+                       p = MNEW(char, strlen(opt_arg) + strlen(":") + len + strlen("0"));
 
-                       bootclasspath = MNEW(char, strlen(opt_arg) + strlen(":") +
-                                                                cplen + strlen("0"));
+                       strcpy(p, opt_arg);
+                       strcat(p, ":");
+                       strcat(p, boot_class_path);
 
-                       strcpy(bootclasspath, opt_arg);
-                       strcat(bootclasspath, ":");
-                       strcat(bootclasspath, cp);
+                       properties_add("sun.boot.class.path", p);
+                       properties_add("java.boot.class.path", p);
 
-                       MFREE(cp, char, cplen);
+                       MFREE(boot_class_path, char, len);
+                       break;
+
+               case OPT_BOOTCLASSPATH_C:
+                       /* Use as Java core library, but prepend VM interface
+                          classes. */
+
+                       boot_class_path = properties_get("sun.boot.class.path");
+
+                       len =
+                               strlen(CACAO_VM_ZIP) +
+                               strlen(":") +
+                               strlen(opt_arg) +
+                               strlen("0");
+
+                       p = MNEW(char, len);
+
+                       strcpy(p, CACAO_VM_ZIP);
+                       strcat(p, ":");
+                       strcat(p, opt_arg);
+
+                       properties_add("sun.boot.class.path", p);
+                       properties_add("java.boot.class.path", p);
+
+                       MFREE(boot_class_path, char, strlen(boot_class_path));
                        break;
 
 #if defined(ENABLE_JVMTI)
                case OPT_DEBUG:
-                       jdwp=true;
+                       /* this option exists only for compatibility reasons */
                        break;
+
                case OPT_NOAGENT:
                        /* I don't know yet what Xnoagent should do. This is only for 
                           compatiblity with eclipse - motse */
                        break;
+
                case OPT_XRUNJDWP:
-                       transport = opt_arg;
-                       j=0;
-                       while (transport[j]!='=') j++;
-                       j++;
-                       while (j<strlen(transport)) {
-                               if (strncmp("suspend=",&transport[j],8)==0) {
-                                       if ((j+8)>=strlen(transport) || 
-                                               (transport[j+8]!= 'y' && transport[j+8]!= 'n')) {
-                                               printf("bad Xrunjdwp option: -Xrunjdwp%s\n",transport);
-                                               usage();
-                                               break;
-                                       }
-                                       else {
-                                               suspend = transport[j+8] == 'y';
-                                               break;
-                                       }
-                               }
-                               while (transport[j]!=',') j++;
-                               j++;
-                       }
-                       
+                       agentbypath = true;
+                       jvmti       = true;
+                       jdwp        = true;
+
+                       len =
+                               strlen(CACAO_LIBDIR) +
+                               strlen("/libjdwp.so=") +
+                               strlen(opt_arg) +
+                               strlen("0");
+
+                       agentarg = MNEW(char, len);
+
+                       strcpy(agentarg, CACAO_LIBDIR);
+                       strcat(agentarg, "/libjdwp.so=");
+                       strcat(agentarg, &opt_arg[1]);
                        break;
 
                case OPT_AGENTPATH:
                        agentbypath = true;
+
                case OPT_AGENTLIB:
-                       jvmti=true;
+                       jvmti = true;
                        agentarg = opt_arg;
                        break;
 #endif
@@ -750,9 +1055,9 @@ bool vm_create(JavaVMInitArgs *vm_args)
                                        j = atoi(opt_arg);
 
                                if (opt == OPT_MX)
-                                       heapmaxsize = j;
+                                       opt_heapmaxsize = j;
                                else if (opt == OPT_MS)
-                                       heapstartsize = j;
+                                       opt_heapstartsize = j;
                                else
                                        opt_stacksize = j;
                        }
@@ -763,27 +1068,31 @@ bool vm_create(JavaVMInitArgs *vm_args)
                        break;
 
                case OPT_VERBOSE:
-                       if (strcmp("class", opt_arg) == 0)
+                       if (strcmp("class", opt_arg) == 0) {
                                opt_verboseclass = true;
-
-                       else if (strcmp("gc", opt_arg) == 0)
+                       }
+                       else if (strcmp("gc", opt_arg) == 0) {
                                opt_verbosegc = true;
-
-                       else if (strcmp("jni", opt_arg) == 0)
+                       }
+                       else if (strcmp("jni", opt_arg) == 0) {
                                opt_verbosejni = true;
-
-                       else if (strcmp("call", opt_arg) == 0)
-                               opt_verbosecall = true;
-
+                       }
+#if !defined(NDEBUG)
                        else if (strcmp("jit", opt_arg) == 0) {
                                opt_verbose = true;
                                loadverbose = true;
-                               linkverbose = true;
                                initverbose = true;
                                compileverbose = true;
                        }
-                       else if (strcmp("exception", opt_arg) == 0)
-                               opt_verboseexception = true;
+#endif
+                       else {
+                               printf("Unknown -verbose option: %s\n", opt_arg);
+                               usage();
+                       }
+                       break;
+
+               case OPT_DEBUGCOLOR:
+                       opt_debugcolor = true;
                        break;
 
 #if defined(ENABLE_VERIFIER) && defined(TYPECHECK_VERBOSE)
@@ -793,8 +1102,8 @@ bool vm_create(JavaVMInitArgs *vm_args)
 #endif
                                
                case OPT_VERSION:
-                       version();
-                       exit(0);
+                       opt_version = true;
+                       opt_exit    = true;
                        break;
 
                case OPT_FULLVERSION:
@@ -802,7 +1111,7 @@ bool vm_create(JavaVMInitArgs *vm_args)
                        break;
 
                case OPT_SHOWVERSION:
-                       version();
+                       opt_version = true;
                        break;
 
                case OPT_NOIEEE:
@@ -815,10 +1124,6 @@ bool vm_create(JavaVMInitArgs *vm_args)
                        break;
 #endif
 
-               case OPT_SOFTNULL:
-                       checknull = true;
-                       break;
-
 #if defined(ENABLE_STATISTICS)
                case OPT_TIME:
                        opt_getcompilingtime = true;
@@ -835,8 +1140,8 @@ bool vm_create(JavaVMInitArgs *vm_args)
                        break;
                        
                case OPT_CHECK:
-                       for (j = 0; j < strlen(opt_arg); j++) {
-                               switch (opt_arg[j]) {
+                       for (i = 0; i < strlen(opt_arg); i++) {
+                               switch (opt_arg[i]) {
                                case 'b':
                                        checkbounds = false;
                                        break;
@@ -854,8 +1159,11 @@ bool vm_create(JavaVMInitArgs *vm_args)
                        makeinitializations = false;
                        break;
 
-               case OPT_EAGER:
-                       opt_eager = true;
+#if !defined(NDEBUG)
+               case OPT_ALL:
+                       compileall = true;
+                       opt_run = false;
+                       makeinitializations = false;
                        break;
 
                case OPT_METHOD:
@@ -863,46 +1171,47 @@ bool vm_create(JavaVMInitArgs *vm_args)
                        opt_method = opt_arg;
                        makeinitializations = false;
                        break;
-                       
+
                case OPT_SIGNATURE:
                        opt_signature = opt_arg;
                        break;
-                       
-               case OPT_ALL:
-                       compileall = true;
-                       opt_run = false;
-                       makeinitializations = false;
-                       break;
-                       
+#endif
+
                case OPT_SHOW:       /* Display options */
-                       for (j = 0; j < strlen(opt_arg); j++) {         
-                               switch (opt_arg[j]) {
-                               case 'a':
-                                       opt_showdisassemble = true;
-                                       compileverbose = true;
-                                       break;
+                       for (i = 0; i < strlen(opt_arg); i++) {         
+                               switch (opt_arg[i]) {
                                case 'c':
                                        showconstantpool = true;
                                        break;
-                               case 'd':
-                                       opt_showddatasegment = true;
+
+                               case 'u':
+                                       showutf = true;
                                        break;
-                               case 'e':
-                                       opt_showexceptionstubs = true;
+
+                               case 'm':
+                                       showmethods = true;
                                        break;
+
                                case 'i':
                                        opt_showintermediate = true;
                                        compileverbose = true;
                                        break;
-                               case 'm':
-                                       showmethods = true;
+
+#if defined(ENABLE_DISASSEMBLER)
+                               case 'a':
+                                       opt_showdisassemble = true;
+                                       compileverbose = true;
                                        break;
-                               case 'n':
-                                       opt_shownativestub = true;
+
+                               case 'o':
+                                       opt_shownops = true;
                                        break;
-                               case 'u':
-                                       showutf = true;
+#endif
+
+                               case 'd':
+                                       opt_showddatasegment = true;
                                        break;
+
                                default:
                                        usage();
                                }
@@ -916,30 +1225,28 @@ bool vm_create(JavaVMInitArgs *vm_args)
 #endif
 
 #if defined(ENABLE_INLINING)
+#if defined(ENABLE_INLINING_DEBUG)
+               case OPT_INLINE_DEBUG_ALL:
+                       opt_inline_debug_all = true;
+                       break;
+               case OPT_INLINE_DEBUG_END:
+                       opt_inline_debug_end_counter = atoi(opt_arg);
+                       break;
+               case OPT_INLINE_DEBUG_MIN:
+                       opt_inline_debug_min_size = atoi(opt_arg);
+                       break;
+               case OPT_INLINE_DEBUG_MAX:
+                       opt_inline_debug_max_size = atoi(opt_arg);
+                       break;
+#endif /* defined(ENABLE_INLINING_DEBUG) */
+#if !defined(NDEBUG)
+               case OPT_INLINE_LOG:
+                       opt_inline_debug_log = true;
+                       break;
+#endif /* !defined(NDEBUG) */
+
                case OPT_INLINING:
-                       for (j = 0; j < strlen(opt_arg); j++) {         
-                               switch (opt_arg[j]) {
-                               case 'n':
-                                       /* define in options.h; Used in main.c, jit.c
-                                          & inline.c inlining is currently
-                                          deactivated */
-                                       break;
-                               case 'v':
-                                       inlinevirtuals = true;
-                                       break;
-                               case 'e':
-                                       inlineexceptions = true;
-                                       break;
-                               case 'p':
-                                       inlineparamopt = true;
-                                       break;
-                               case 'o':
-                                       inlineoutsiders = true;
-                                       break;
-                               default:
-                                       usage();
-                               }
-                       }
+                       opt_inlining = true;
                        break;
 #endif /* defined(ENABLE_INLINING) */
 
@@ -954,6 +1261,28 @@ bool vm_create(JavaVMInitArgs *vm_args)
                        opt_lsra = true;
                        break;
 #endif
+#if  defined(ENABLE_SSA)
+               case OPT_LSRA:
+                       opt_lsra = true;
+                       for (i = 0; i < strlen(opt_arg); i++) {         
+                               switch (opt_arg[i]) {
+                               case 'c':
+                                       opt_ssa_cp = true;
+                                       break;
+
+                               case 'd':
+                                       opt_ssa_dce = true;
+                                       break;
+
+                               case ':':
+                                       break;
+
+                               default:
+                                       usage();
+                               }
+                       }
+                       break;
+#endif
 
                case OPT_HELP:
                        usage();
@@ -963,25 +1292,66 @@ bool vm_create(JavaVMInitArgs *vm_args)
                        Xusage();
                        break;
 
+               case OPT_XX:
+                       /* Already parsed. */
+                       break;
+
+               case OPT_EA:
+#if defined(ENABLE_ASSERTION)
+                       assertion_ea_da(opt_arg, true);
+#endif
+                       break;
+
+               case OPT_DA:
+#if defined(ENABLE_ASSERTION)
+                       assertion_ea_da(opt_arg, false);
+#endif
+                       break;
+
+               case OPT_EA_NOARG:
+#if defined(ENABLE_ASSERTION)
+                       assertion_user_enabled = true;
+#endif
+                       break;
+
+               case OPT_DA_NOARG:
+#if defined(ENABLE_ASSERTION)
+                       assertion_user_enabled = false;
+#endif
+                       break;
+
+               case OPT_ESA:
+#if defined(ENABLE_ASSERTION)
+                       assertion_system_enabled = true;
+#endif
+                       break;
+
+               case OPT_DSA:
+#if defined(ENABLE_ASSERTION)
+                       assertion_system_enabled = false;
+#endif
+                       break;
+
+#if defined(ENABLE_PROFILING)
                case OPT_PROF_OPTION:
                        /* use <= to get the last \0 too */
 
-                       for (j = 0, k = 0; j <= strlen(opt_arg); j++) {
-                               if (opt_arg[j] == ',')
-                                       opt_arg[j] = '\0';
+                       for (i = 0, j = 0; i <= strlen(opt_arg); i++) {
+                               if (opt_arg[i] == ',')
+                                       opt_arg[i] = '\0';
 
-                               if (opt_arg[j] == '\0') {
-                                       if (strcmp("bb", opt_arg + k) == 0)
+                               if (opt_arg[i] == '\0') {
+                                       if (strcmp("bb", opt_arg + j) == 0)
                                                opt_prof_bb = true;
 
                                        else {
-                                               printf("Unknown option: -Xprof:%s\n", opt_arg + k);
+                                               printf("Unknown option: -Xprof:%s\n", opt_arg + j);
                                                usage();
                                        }
 
                                        /* set k to next char */
 
-                                       k = j + 1;
+                                       j = i + 1;
                                }
                        }
                        /* fall through */
@@ -989,6 +1359,7 @@ bool vm_create(JavaVMInitArgs *vm_args)
                case OPT_PROF:
                        opt_prof = true;
                        break;
+#endif
 
                case OPT_JIT:
 #if defined(ENABLE_JIT)
@@ -1030,6 +1401,20 @@ bool vm_create(JavaVMInitArgs *vm_args)
                        break;
 #endif
 
+#if defined(ENABLE_DEBUG_FILTER)
+               case OPT_FILTER_VERBOSECALL_INCLUDE:
+                       opt_filter_verbosecall_include = opt_arg;
+                       break;
+
+               case OPT_FILTER_VERBOSECALL_EXCLUDE:
+                       opt_filter_verbosecall_exclude = opt_arg;
+                       break;
+
+               case OPT_FILTER_SHOW_METHOD:
+                       opt_filter_show_method = opt_arg;
+                       break;
+
+#endif
                default:
                        printf("Unknown option: %s\n",
                                   vm_args->options[opt_index].optionString);
@@ -1037,7 +1422,6 @@ bool vm_create(JavaVMInitArgs *vm_args)
                }
        }
 
-
        /* get the main class *****************************************************/
 
        if (opt_index < vm_args->nOptions) {
@@ -1048,15 +1432,19 @@ bool vm_create(JavaVMInitArgs *vm_args)
                if (opt_jar == true) {
                        /* free old classpath */
 
-                       MFREE(classpath, char, strlen(classpath));
+/*                     MFREE(_Jv_classpath, char, strlen(_Jv_classpath)); */
 
                        /* put jarfile into classpath */
 
-                       classpath = MNEW(char, strlen(mainstring) + strlen("0"));
+                       p = MNEW(char, strlen(mainstring) + strlen("0"));
 
-                       strcpy(classpath, mainstring);
-               
-               } else {
+                       strcpy(p, mainstring);
+
+#if defined(ENABLE_JAVASE)
+                       properties_add("java.class.path", p);
+#endif
+               }
+               else {
                        /* replace .'s with /'s in classname */
 
                        for (i = strlen(mainstring) - 1; i >= 0; i--)
@@ -1067,20 +1455,35 @@ bool vm_create(JavaVMInitArgs *vm_args)
 
 #if defined(ENABLE_JVMTI)
        if (jvmti) {
-               set_jvmti_phase(JVMTI_PHASE_ONLOAD);
-               agentload(agentarg, agentbypath, &handle, &libname);
+               jvmti_set_phase(JVMTI_PHASE_ONLOAD);
+               jvmti_agentload(agentarg, agentbypath, &handle, &libname);
+
+               if (jdwp)
+                       MFREE(agentarg, char, strlen(agentarg));
+
+               jvmti_set_phase(JVMTI_PHASE_PRIMORDIAL);
        }
-       set_jvmti_phase(JVMTI_PHASE_PRIMORDIAL);
 #endif
 
-
        /* initialize this JVM ****************************************************/
 
        vm_initializing = true;
 
        /* initialize the garbage collector */
 
-       gc_init(heapmaxsize, heapstartsize);
+       gc_init(opt_heapmaxsize, opt_heapstartsize);
+
+#if defined(ENABLE_THREADS)
+       /* AFTER: gc_init (directly after, as this initializes the
+          stopworldlock lock */
+
+       threads_preinit();
+#endif
+
+       /* install architecture dependent signal handlers */
+
+       if (!signal_init())
+               vm_abort("vm_create: signal_init failed");
 
 #if defined(ENABLE_INTRP)
        /* Allocate main thread stack on the Java heap. */
@@ -1091,132 +1494,181 @@ bool vm_create(JavaVMInitArgs *vm_args)
        }
 #endif
 
-#if defined(ENABLE_THREADS)
-       threads_preinit();
-#endif
-
-       /* initialize the string hashtable stuff: lock (must be done
-          _after_ threads_preinit) */
+       /* AFTER: threads_preinit */
 
        if (!string_init())
-               throw_main_exception_exit();
+               vm_abort("vm_create: string_init failed");
 
-       /* initialize the utf8 hashtable stuff: lock, often used utf8
-          strings (must be done _after_ threads_preinit) */
+       /* AFTER: threads_preinit */
 
        if (!utf8_init())
-               throw_main_exception_exit();
-
-       /* initialize the classcache hashtable stuff: lock, hashtable
-          (must be done _after_ threads_preinit) */
-
-       if (!classcache_init())
-               throw_main_exception_exit();
+               vm_abort("vm_create: utf8_init failed");
 
-       /* initialize the loader with bootclasspath (must be done _after_
-          thread_preinit) */
+       /* AFTER: thread_preinit */
 
        if (!suck_init())
-               throw_main_exception_exit();
+               vm_abort("vm_create: suck_init failed");
 
        suck_add_from_property("java.endorsed.dirs");
-       suck_add(bootclasspath);
 
-       /* initialize the memory subsystem (must be done _after_
-          threads_preinit) */
+       /* Now we have all options handled and we can print the version
+          information.
+
+          AFTER: suck_add_from_property("java.endorsed.dirs"); */
+
+       if (opt_version)
+               version(opt_exit);
+
+       /* AFTER: utf8_init */
 
-       if (!memory_init())
-               throw_main_exception_exit();
+       boot_class_path = properties_get("sun.boot.class.path");
+       suck_add(boot_class_path);
+
+       /* initialize the classcache hashtable stuff: lock, hashtable
+          (must be done _after_ threads_preinit) */
+
+       if (!classcache_init())
+               vm_abort("vm_create: classcache_init failed");
+
+       /* Initialize the code memory management. */
+       /* AFTER: threads_preinit */
+
+       codememory_init();
 
        /* initialize the finalizer stuff (must be done _after_
           threads_preinit) */
 
        if (!finalizer_init())
-               throw_main_exception_exit();
+               vm_abort("vm_create: finalizer_init failed");
+
+       /* initializes jit compiler */
 
-       /* install architecture dependent signal handler used for exceptions */
+       jit_init();
 
-       signal_init();
+#if defined(ENABLE_PYTHON)
+       pythonpass_init();
+#endif
 
-       /* initialize the codegen subsystems */
+       /* BEFORE: loader_preinit */
 
-       codegen_init();
+       package_init();
 
-       /* initializes jit compiler */
+       /* AFTER: utf8_init, classcache_init */
 
-       jit_init();
+       loader_preinit();
+       linker_preinit();
 
-       /* machine dependent initialization */
+       /* AFTER: loader_preinit, linker_preinit */
 
-#if defined(ENABLE_JIT)
-# if defined(ENABLE_INTRP)
-       if (opt_intrp)
-               intrp_md_init();
-       else
-# endif
-               md_init();
-#else
-       intrp_md_init();
-#endif
+       primitive_init();
+
+       loader_init();
+       linker_init();
+
+       /* AFTER: loader_init, linker_init */
+
+       primitive_postinit();
 
-       /* initialize the loader subsystems (must be done _after_
-       classcache_init) */
+       exceptions_init();
 
-       if (!loader_init())
-               throw_main_exception_exit();
+       if (!builtin_init())
+               vm_abort("vm_create: builtin_init failed");
 
-       if (!linker_init())
-               throw_main_exception_exit();
+       /* Initialize the native subsystem. */
+       /* BEFORE: threads_init */
 
        if (!native_init())
-               throw_main_exception_exit();
+               vm_abort("vm_create: native_init failed");
 
-       if (!exceptions_init())
-               throw_main_exception_exit();
+       /* Register the native methods implemented in the VM. */
+       /* BEFORE: threads_init */
 
-       if (!builtin_init())
-               throw_main_exception_exit();
+       if (!nativevm_preinit())
+               vm_abort("vm_create: nativevm_preinit failed");
 
+#if defined(ENABLE_JNI)
        /* Initialize the JNI subsystem (must be done _before_
           threads_init, as threads_init can call JNI methods
           (e.g. NewGlobalRef). */
 
        if (!jni_init())
-               throw_main_exception_exit();
+               vm_abort("vm_create: jni_init failed");
+#endif
+
+#if defined(ENABLE_JNI) || defined(ENABLE_HANDLES)
+       /* Initialize the local reference table for the main thread. */
+       /* BEFORE: threads_init */
+
+       if (!localref_table_init())
+               vm_abort("vm_create: localref_table_init failed");
+#endif
 
 #if defined(ENABLE_THREADS)
        if (!threads_init())
-               throw_main_exception_exit();
+               vm_abort("vm_create: threads_init failed");
 #endif
 
-       /* That's important, otherwise we get into trouble, if the Runtime
-          static initializer is called before (circular dependency. This
-          is with classpath 0.09. Another important thing is, that this
-          has to happen after initThreads!!! */
+       /* Initialize the native VM subsystem. */
+       /* AFTER: threads_init (at least for SUN's classes) */
 
-       if (!initialize_class(class_java_lang_System))
-               throw_main_exception_exit();
+       if (!nativevm_init())
+               vm_abort("vm_create: nativevm_init failed");
 
 #if defined(ENABLE_PROFILING)
        /* initialize profiling */
 
        if (!profile_init())
-               throw_main_exception_exit();
+               vm_abort("vm_create: profile_init failed");
 #endif
 
 #if defined(ENABLE_THREADS)
+       /* initialize recompilation */
+
+       if (!recompile_init())
+               vm_abort("vm_create: recompile_init failed");
+
+       /* start the signal handler thread */
+
+#if defined(__LINUX__)
+       /* XXX Remove for exact-GC. */
+       if (threads_pthreads_implementation_nptl)
+#endif
+               if (!signal_start_thread())
+                       vm_abort("vm_create: signal_start_thread failed");
+
        /* finally, start the finalizer thread */
 
        if (!finalizer_start_thread())
-               throw_main_exception_exit();
+               vm_abort("vm_create: finalizer_start_thread failed");
+
+# if !defined(NDEBUG)
+       /* start the memory profiling thread */
 
+       if (opt_ProfileMemoryUsage || opt_ProfileGCMemoryUsage)
+               if (!memory_start_thread())
+                       vm_abort("vm_create: memory_start_thread failed");
+# endif
+
+       /* start the recompilation thread (must be done before the
+          profiling thread) */
+
+       if (!recompile_start_thread())
+               vm_abort("vm_create: recompile_start_thread failed");
+
+# if defined(ENABLE_PROFILING)
        /* start the profile sampling thread */
 
-/*     if (!profile_start_thread()) */
-/*             throw_main_exception_exit(); */
+/*     if (opt_prof) */
+/*             if (!profile_start_thread()) */
+/*                     vm_abort("vm_create: profile_start_thread failed"); */
+# endif
 #endif
 
 #if defined(ENABLE_JVMTI)
+# if defined(ENABLE_GC_CACAO)
+       /* XXX this will not work with the new indirection cells for classloaders!!! */
+       assert(0);
+# endif
        if (jvmti) {
                /* add agent library to native library hashtable */
                native_hashtable_library_add(utf_new_char(libname), class_java_lang_Object->classloader, handle);
@@ -1231,74 +1683,241 @@ bool vm_create(JavaVMInitArgs *vm_args)
 
        vm_initializing = false;
 
+#if !defined(NDEBUG)
+       /* Print the VM configuration after all stuff is set and the VM is
+          initialized. */
+
+       if (opt_PrintConfig)
+               vm_printconfig();
+#endif
+
        /* everything's ok */
 
        return true;
 }
 
 
-/* vm_destroy ******************************************************************
+/* vm_run **********************************************************************
 
-   Unloads a Java VM and reclaims its resources.
+   Runs the main-method of the passed class.
 
 *******************************************************************************/
 
-s4 vm_destroy(JavaVM *vm)
+void vm_run(JavaVM *vm, JavaVMInitArgs *vm_args)
 {
-#if defined(ENABLE_THREADS)
-       threads_join_all_threads();
-#endif
+       utf                       *mainutf;
+       classinfo                 *mainclass;
+       java_handle_t             *e;
+       methodinfo                *m;
+       java_handle_objectarray_t *oa; 
+       s4                         oalength;
+       utf                       *u;
+       java_handle_t             *s;
+       s4                         status;
+       s4                         i;
 
-       /* everything's ok */
+#if !defined(NDEBUG)
+       if (compileall) {
+               vm_compile_all();
+               return;
+       }
 
-       return 0;
-}
+       if (opt_method != NULL) {
+               vm_compile_method();
+               return;
+       }
+#endif /* !defined(NDEBUG) */
 
+       /* should we run the main-method? */
 
-/* vm_exit *********************************************************************
+       if (mainstring == NULL)
+               usage();
 
-   Calls java.lang.System.exit(I)V to exit the JavaVM correctly.
+       /* set return value to OK */
 
-*******************************************************************************/
+       status = 0;
 
-void vm_exit(s4 status)
-{
-       methodinfo *m;
+       if (opt_jar == true) {
+               /* open jar file with java.util.jar.JarFile */
 
-       /* signal that we are exiting */
+               mainstring = vm_get_mainclass_from_jar(mainstring);
 
-       vm_exiting = true;
+               if (mainstring == NULL)
+                       vm_exit(1);
+       }
 
-       assert(class_java_lang_System);
-       assert(class_java_lang_System->state & CLASS_LOADED);
+       /* load the main class */
 
-#if defined(ENABLE_JVMTI)
-       set_jvmti_phase(JVMTI_PHASE_DEAD);
-       if (jvmti) agentunload();
+       mainutf = utf_new_char(mainstring);
+
+#if defined(ENABLE_JAVAME_CLDC1_1)
+       mainclass = load_class_bootstrap(mainutf);
+#else
+       mainclass = load_class_from_sysloader(mainutf);
 #endif
 
-       if (!link_class(class_java_lang_System))
-               throw_main_exception_exit();
+       /* error loading class */
 
-       /* call java.lang.System.exit(I)V */
+       e = exceptions_get_and_clear_exception();
 
-       m = class_resolveclassmethod(class_java_lang_System,
-                                                                utf_new_char("exit"),
-                                                                utf_int__void,
+       if ((e != NULL) || (mainclass == NULL)) {
+               exceptions_throw_noclassdeffounderror_cause(e);
+               exceptions_print_stacktrace(); 
+               vm_exit(1);
+       }
+
+       if (!link_class(mainclass)) {
+               exceptions_print_stacktrace();
+               vm_exit(1);
+       }
+                       
+       /* find the `main' method of the main class */
+
+       m = class_resolveclassmethod(mainclass,
+                                                                utf_new_char("main"), 
+                                                                utf_new_char("([Ljava/lang/String;)V"),
                                                                 class_java_lang_Object,
-                                                                true);
-       
-       if (m == NULL)
-               throw_main_exception_exit();
+                                                                false);
 
-       /* call the exit function with passed exit status */
+       if (exceptions_get_exception()) {
+               exceptions_print_stacktrace();
+               vm_exit(1);
+       }
 
-       (void) vm_call_method(m, NULL, status);
+       /* there is no main method or it isn't static */
 
-       /* If we had an exception, just ignore the exception and exit with
-          the proper code. */
+       if ((m == NULL) || !(m->flags & ACC_STATIC)) {
+               exceptions_clear_exception();
+               exceptions_throw_nosuchmethoderror(mainclass,
+                                                                                  utf_new_char("main"), 
+                                                                                  utf_new_char("([Ljava/lang/String;)V"));
 
-       vm_shutdown(status);
+               exceptions_print_stacktrace();
+               vm_exit(1);
+       }
+
+       /* build argument array */
+
+       oalength = vm_args->nOptions - opt_index;
+
+       oa = builtin_anewarray(oalength, class_java_lang_String);
+
+       for (i = 0; i < oalength; i++) {
+               u = utf_new_char(vm_args->options[opt_index + i].optionString);
+               s = javastring_new(u);
+
+               array_objectarray_element_set(oa, i, s);
+       }
+
+#ifdef TYPEINFO_DEBUG_TEST
+       /* test the typeinfo system */
+       typeinfo_test();
+#endif
+       /*class_showmethods(currentThread->group->header.vftbl->class); */
+
+#if defined(ENABLE_JVMTI)
+       jvmti_set_phase(JVMTI_PHASE_LIVE);
+#endif
+
+       /* set ThreadMXBean variables */
+
+       _Jv_jvm->java_lang_management_ThreadMXBean_ThreadCount++;
+       _Jv_jvm->java_lang_management_ThreadMXBean_TotalStartedThreadCount++;
+
+       if (_Jv_jvm->java_lang_management_ThreadMXBean_ThreadCount >
+               _Jv_jvm->java_lang_management_ThreadMXBean_PeakThreadCount)
+               _Jv_jvm->java_lang_management_ThreadMXBean_PeakThreadCount =
+                       _Jv_jvm->java_lang_management_ThreadMXBean_ThreadCount;
+
+       /* start the main thread */
+
+       (void) vm_call_method(m, NULL, oa);
+
+       /* exception occurred? */
+
+       if (exceptions_get_exception()) {
+               exceptions_print_stacktrace();
+               status = 1;
+       }
+
+       /* unload the JavaVM */
+
+       (void) vm_destroy(vm);
+
+       /* and exit */
+
+       vm_exit(status);
+}
+
+
+/* vm_destroy ******************************************************************
+
+   Unloads a Java VM and reclaims its resources.
+
+*******************************************************************************/
+
+s4 vm_destroy(JavaVM *vm)
+{
+#if defined(ENABLE_THREADS)
+       threads_join_all_threads();
+#endif
+
+       /* everything's ok */
+
+       return 0;
+}
+
+
+/* vm_exit *********************************************************************
+
+   Calls java.lang.System.exit(I)V to exit the JavaVM correctly.
+
+*******************************************************************************/
+
+void vm_exit(s4 status)
+{
+       methodinfo *m;
+
+       /* signal that we are exiting */
+
+       vm_exiting = true;
+
+       assert(class_java_lang_System);
+       assert(class_java_lang_System->state & CLASS_LOADED);
+
+#if defined(ENABLE_JVMTI)
+       if (jvmti || (dbgcom!=NULL)) {
+               jvmti_set_phase(JVMTI_PHASE_DEAD);
+               if (jvmti) jvmti_agentunload();
+       }
+#endif
+
+       if (!link_class(class_java_lang_System)) {
+               exceptions_print_stacktrace();
+               exit(1);
+       }
+
+       /* call java.lang.System.exit(I)V */
+
+       m = class_resolveclassmethod(class_java_lang_System,
+                                                                utf_new_char("exit"),
+                                                                utf_int__void,
+                                                                class_java_lang_Object,
+                                                                true);
+       
+       if (m == NULL) {
+               exceptions_print_stacktrace();
+               exit(1);
+       }
+
+       /* call the exit function with passed exit status */
+
+       (void) vm_call_method(m, NULL, status);
+
+       /* If we had an exception, just ignore the exception and exit with
+          the proper code. */
+
+       vm_shutdown(status);
 }
 
 
@@ -1319,8 +1938,19 @@ void vm_shutdown(s4 status)
        {
                log_text("CACAO terminated by shutdown");
                dolog("Exit status: %d\n", (s4) status);
+
        }
 
+#if defined(ENABLE_JVMTI)
+       /* terminate cacaodbgserver */
+       if (dbgcom!=NULL) {
+               pthread_mutex_lock(&dbgcomlock);
+               dbgcom->running=1;
+               pthread_mutex_unlock(&dbgcomlock);
+               jvmti_cacaodbgserver_quit();
+       }       
+#endif
+
        exit(status);
 }
 
@@ -1378,8 +2008,6 @@ void vm_exit_handler(void)
 #endif
                }
 
-               mem_usagelog(1);
-
                if (opt_getcompilingtime)
                        print_times();
 #endif /* defined(ENABLE_STATISTICS) */
@@ -1388,800 +2016,650 @@ void vm_exit_handler(void)
 }
 
 
-/* vm_vmargs_from_valist *******************************************************
+/* vm_abort ********************************************************************
+
+   Prints an error message and aborts the VM.
 
-   XXX
+   IN:
+       text ... error message to print
 
 *******************************************************************************/
 
-static void vm_vmargs_from_valist(methodinfo *m, java_objectheader *o,
-                                                                 vm_arg *vmargs, va_list ap)
+void vm_abort(const char *text, ...)
 {
-       typedesc *paramtypes;
-       s4        i;
-
-       paramtypes = m->parseddesc->paramtypes;
-
-       /* if method is non-static fill first block and skip `this' pointer */
-
-       i = 0;
-
-       if (o != NULL) {
-               /* the `this' pointer */
-               vmargs[0].type   = TYPE_ADR;
-               vmargs[0].data.l = (u8) (ptrint) o;
-
-               paramtypes++;
-               i++;
-       } 
+       va_list ap;
 
-       for (; i < m->parseddesc->paramcount; i++, paramtypes++) {
-               switch (paramtypes->decltype) {
-               /* primitive types */
-               case PRIMITIVETYPE_BOOLEAN: 
-               case PRIMITIVETYPE_BYTE:
-               case PRIMITIVETYPE_CHAR:
-               case PRIMITIVETYPE_SHORT: 
-               case PRIMITIVETYPE_INT:
-                       vmargs[i].type   = TYPE_INT;
-                       vmargs[i].data.l = (s8) va_arg(ap, s4);
-                       break;
+       /* Print the log message. */
 
-               case PRIMITIVETYPE_LONG:
-                       vmargs[i].type   = TYPE_LNG;
-                       vmargs[i].data.l = (s8) va_arg(ap, s8);
-                       break;
+       log_start();
 
-               case PRIMITIVETYPE_FLOAT:
-                       vmargs[i].type   = TYPE_FLT;
-#if defined(__ALPHA__)
-                       /* this keeps the assembler function much simpler */
+       va_start(ap, text);
+       log_vprint(text, ap);
+       va_end(ap);
 
-                       vmargs[i].data.d = (jdouble) va_arg(ap, jdouble);
-#else
-                       vmargs[i].data.f = (jfloat) va_arg(ap, jdouble);
-#endif
-                       break;
+       log_finish();
 
-               case PRIMITIVETYPE_DOUBLE:
-                       vmargs[i].type   = TYPE_DBL;
-                       vmargs[i].data.d = (jdouble) va_arg(ap, jdouble);
-                       break;
+       /* Now abort the VM. */
 
-               case TYPE_ADR: 
-                       vmargs[i].type   = TYPE_ADR;
-                       vmargs[i].data.l = (u8) (ptrint) va_arg(ap, void*);
-                       break;
-               }
-       }
+       system_abort();
 }
 
 
-/* vm_vmargs_from_jvalue *******************************************************
+/* vm_abort_errnum *************************************************************
 
-   XXX
+   Prints an error message, appends ":" plus the strerror-message of
+   errnum and aborts the VM.
+
+   IN:
+       errnum ... error number
+       text ..... error message to print
 
 *******************************************************************************/
 
-static void vm_vmargs_from_jvalue(methodinfo *m, java_objectheader *o,
-                                                                 vm_arg *vmargs, jvalue *args)
+void vm_abort_errnum(int errnum, const char *text, ...)
 {
-       typedesc *paramtypes;
-       s4        i;
-       s4        j;
-
-       paramtypes = m->parseddesc->paramtypes;
+       va_list ap;
 
-       /* if method is non-static fill first block and skip `this' pointer */
+       /* Print the log message. */
 
-       i = 0;
+       log_start();
 
-       if (o != NULL) {
-               /* the `this' pointer */
-               vmargs[0].type   = TYPE_ADR;
-               vmargs[0].data.l = (u8) (ptrint) o;
+       va_start(ap, text);
+       log_vprint(text, ap);
+       va_end(ap);
 
-               paramtypes++;
-               i++;
-       } 
+       /* Print the strerror-message of errnum. */
 
-       for (j = 0; i < m->parseddesc->paramcount; i++, j++, paramtypes++) {
-               switch (paramtypes->decltype) {
-               /* primitive types */
-               case PRIMITIVETYPE_BOOLEAN: 
-               case PRIMITIVETYPE_BYTE:
-               case PRIMITIVETYPE_CHAR:
-               case PRIMITIVETYPE_SHORT: 
-               case PRIMITIVETYPE_INT:
-                       vmargs[i].type   = TYPE_INT;
-                       vmargs[i].data.l = (s8) args[j].i;
-                       break;
+       log_print(": %s", system_strerror(errnum));
 
-               case PRIMITIVETYPE_LONG:
-                       vmargs[i].type   = TYPE_LNG;
-                       vmargs[i].data.l = (s8) args[j].j;
-                       break;
+       log_finish();
 
-               case PRIMITIVETYPE_FLOAT:
-                       vmargs[i].type = TYPE_FLT;
-#if defined(__ALPHA__)
-                       /* this keeps the assembler function much simpler */
+       /* Now abort the VM. */
 
-                       vmargs[i].data.d = (jdouble) args[j].f;
-#else
-                       vmargs[i].data.f = args[j].f;
-#endif
-                       break;
-
-               case PRIMITIVETYPE_DOUBLE:
-                       vmargs[i].type   = TYPE_DBL;
-                       vmargs[i].data.d = args[j].d;
-                       break;
-
-               case TYPE_ADR: 
-                       vmargs[i].type   = TYPE_ADR;
-                       vmargs[i].data.l = (u8) (ptrint) args[j].l;
-                       break;
-               }
-       }
+       system_abort();
 }
 
 
-/* vm_call_method **************************************************************
+/* vm_abort_errno **************************************************************
+
+   Equal to vm_abort_errnum, but uses errno to get the error number.
 
-   Calls a Java method with a variable number of arguments and returns
-   an address.
+   IN:
+       text ... error message to print
 
 *******************************************************************************/
 
-java_objectheader *vm_call_method(methodinfo *m, java_objectheader *o, ...)
+void vm_abort_errno(const char *text, ...)
 {
-       va_list            ap;
-       java_objectheader *ro;
+       va_list ap;
 
-       va_start(ap, o);
-       ro = vm_call_method_valist(m, o, ap);
+       va_start(ap, text);
+       vm_abort_errnum(errno, text, ap);
        va_end(ap);
-
-       return ro;
 }
 
 
-/* vm_call_method_valist *******************************************************
-
-   Calls a Java method with a variable number of arguments, passed via
-   a va_list, and returns an address.
-
-*******************************************************************************/
-
-java_objectheader *vm_call_method_valist(methodinfo *m, java_objectheader *o,
-                                                                                va_list ap)
-{
-       s4                 vmargscount;
-       vm_arg            *vmargs;
-       java_objectheader *ro;
-       s4                 dumpsize;
-
-       /* mark start of dump memory area */
-
-       dumpsize = dump_size();
-
-       /* get number of Java method arguments */
+/* vm_abort_disassemble ********************************************************
 
-       vmargscount = m->parseddesc->paramcount;
+   Prints an error message, disassemble the given code range (if
+   enabled) and aborts the VM.
 
-       /* allocate vm_arg array */
-
-       vmargs = DMNEW(vm_arg, vmargscount);
-
-       /* fill the vm_arg array from a va_list */
-
-       vm_vmargs_from_valist(m, o, vmargs, ap);
-
-       /* call the Java method */
-
-       ro = vm_call_method_vmarg(m, vmargscount, vmargs);
-
-       /* release dump area */
-
-       dump_release(dumpsize);
-
-       return ro;
-}
-
-
-/* vm_call_method_jvalue *******************************************************
-
-   Calls a Java method with a variable number of arguments, passed via
-   a jvalue array, and returns an address.
+   IN:
+       pc.......PC to disassemble
+          count....number of instructions to disassemble
 
 *******************************************************************************/
 
-java_objectheader *vm_call_method_jvalue(methodinfo *m, java_objectheader *o,
-                                                                                jvalue *args)
+void vm_abort_disassemble(void *pc, int count, const char *text, ...)
 {
-       s4                 vmargscount;
-       vm_arg            *vmargs;
-       java_objectheader *ro;
-       s4                 dumpsize;
-
-       /* mark start of dump memory area */
-
-       dumpsize = dump_size();
-
-       /* get number of Java method arguments */
-
-       vmargscount = m->parseddesc->paramcount;
-
-       /* allocate vm_arg array */
-
-       vmargs = DMNEW(vm_arg, vmargscount);
-
-       /* fill the vm_arg array from a va_list */
-
-       vm_vmargs_from_jvalue(m, o, vmargs, args);
-
-       /* call the Java method */
-
-       ro = vm_call_method_vmarg(m, vmargscount, vmargs);
-
-       /* release dump area */
-
-       dump_release(dumpsize);
-
-       return ro;
-}
+       va_list ap;
+#if defined(ENABLE_DISASSEMBLER)
+       int     i;
+#endif
 
+       /* Print debug message. */
 
-/* vm_call_method_vmarg ********************************************************
+       log_start();
 
-   Calls a Java method with a variable number of arguments, passed via
-   a vm_arg array, and returns an address.
+       va_start(ap, text);
+       log_vprint(text, ap);
+       va_end(ap);
 
-*******************************************************************************/
+       log_finish();
 
-java_objectheader *vm_call_method_vmarg(methodinfo *m, s4 vmargscount,
-                                                                               vm_arg *vmargs)
-{
-       java_objectheader *o;
+       /* Print the PC. */
 
-#if defined(ENABLE_JIT)
-# if defined(ENABLE_INTRP)
-       if (opt_intrp)
-               o = intrp_asm_vm_call_method(m, vmargscount, vmargs);
-       else
-# endif
-               o = asm_vm_call_method(m, vmargscount, vmargs);
+#if SIZEOF_VOID_P == 8
+       log_println("PC=0x%016lx", pc);
 #else
-       o = intrp_asm_vm_call_method(m, vmargscount, vmargs);
+       log_println("PC=0x%08x", pc);
 #endif
 
-       return o;
-}
-
+#if defined(ENABLE_DISASSEMBLER)
+       log_println("machine instructions at PC:");
 
-/* vm_call_method_int **********************************************************
+       /* Disassemble the given number of instructions. */
 
-   Calls a Java method with a variable number of arguments and returns
-   an integer (s4).
-
-*******************************************************************************/
-
-s4 vm_call_method_int(methodinfo *m, java_objectheader *o, ...)
-{
-       va_list ap;
-       s4      i;
-
-       va_start(ap, o);
-       i = vm_call_method_int_valist(m, o, ap);
-       va_end(ap);
+       for (i = 0; i < count; i++)
+               pc = disassinstr(pc);
+#endif
 
-       return i;
+       vm_abort("Aborting...");
 }
 
 
-/* vm_call_method_int_valist ***************************************************
+/* vm_get_mainclass_from_jar ***************************************************
 
-   Calls a Java method with a variable number of arguments, passed via
-   a va_list, and returns an integer (s4).
+   Gets the name of the main class from a JAR's manifest file.
 
 *******************************************************************************/
 
-s4 vm_call_method_int_valist(methodinfo *m, java_objectheader *o, va_list ap)
+static char *vm_get_mainclass_from_jar(char *mainstring)
 {
-       s4      vmargscount;
-       vm_arg *vmargs;
-       s4      i;
-       s4      dumpsize;
-
-       /* mark start of dump memory area */
-
-       dumpsize = dump_size();
-
-       /* get number of Java method arguments */
-
-       vmargscount = m->parseddesc->paramcount;
+       classinfo     *c;
+       java_handle_t *o;
+       methodinfo    *m;
+       java_handle_t *s;
 
-       /* allocate vm_arg array */
+       c = load_class_from_sysloader(utf_new_char("java/util/jar/JarFile"));
 
-       vmargs = DMNEW(vm_arg, vmargscount);
-
-       /* fill the vm_arg array from a va_list */
-
-       vm_vmargs_from_valist(m, o, vmargs, ap);
-
-       /* call the Java method */
+       if (c == NULL) {
+               exceptions_print_stacktrace();
+               return NULL;
+       }
 
-       i = vm_call_method_int_vmarg(m, vmargscount, vmargs);
+       /* create JarFile object */
 
-       /* release dump area */
+       o = builtin_new(c);
 
-       dump_release(dumpsize);
+       if (o == NULL) {
+               exceptions_print_stacktrace();
+               return NULL;
+       }
 
-       return i;
-}
+       m = class_resolveclassmethod(c,
+                                                                utf_init, 
+                                                                utf_java_lang_String__void,
+                                                                class_java_lang_Object,
+                                                                true);
 
+       if (m == NULL) {
+               exceptions_print_stacktrace();
+               return NULL;
+       }
 
-/* vm_call_method_int_jvalue ***************************************************
+       s = javastring_new_from_ascii(mainstring);
 
-   Calls a Java method with a variable number of arguments, passed via
-   a jvalue array, and returns an integer (s4).
+       (void) vm_call_method(m, o, s);
 
-*******************************************************************************/
+       if (exceptions_get_exception()) {
+               exceptions_print_stacktrace();
+               return NULL;
+       }
 
-s4 vm_call_method_int_jvalue(methodinfo *m, java_objectheader *o, jvalue *args)
-{
-       s4      vmargscount;
-       vm_arg *vmargs;
-       s4      i;
-       s4      dumpsize;
+       /* get manifest object */
 
-       /* mark start of dump memory area */
+       m = class_resolveclassmethod(c,
+                                                                utf_new_char("getManifest"), 
+                                                                utf_new_char("()Ljava/util/jar/Manifest;"),
+                                                                class_java_lang_Object,
+                                                                true);
 
-       dumpsize = dump_size();
+       if (m == NULL) {
+               exceptions_print_stacktrace();
+               return NULL;
+       }
 
-       /* get number of Java method arguments */
+       o = vm_call_method(m, o);
 
-       vmargscount = m->parseddesc->paramcount;
+       if (o == NULL) {
+               fprintf(stderr, "Could not get manifest from %s (invalid or corrupt jarfile?)\n", mainstring);
+               return NULL;
+       }
 
-       /* allocate vm_arg array */
 
-       vmargs = DMNEW(vm_arg, vmargscount);
+       /* get Main Attributes */
 
-       /* fill the vm_arg array from a va_list */
+       LLNI_class_get(o, c);
 
-       vm_vmargs_from_jvalue(m, o, vmargs, args);
+       m = class_resolveclassmethod(c,
+                                                                utf_new_char("getMainAttributes"), 
+                                                                utf_new_char("()Ljava/util/jar/Attributes;"),
+                                                                class_java_lang_Object,
+                                                                true);
 
-       /* call the Java method */
+       if (m == NULL) {
+               exceptions_print_stacktrace();
+               return NULL;
+       }
 
-       i = vm_call_method_int_vmarg(m, vmargscount, vmargs);
+       o = vm_call_method(m, o);
 
-       /* release dump area */
+       if (o == NULL) {
+               fprintf(stderr, "Could not get main attributes from %s (invalid or corrupt jarfile?)\n", mainstring);
+               return NULL;
+       }
 
-       dump_release(dumpsize);
 
-       return i;
-}
+       /* get property Main-Class */
 
+       LLNI_class_get(o, c);
 
-/* vm_call_method_int_vmarg ****************************************************
+       m = class_resolveclassmethod(c,
+                                                                utf_new_char("getValue"), 
+                                                                utf_new_char("(Ljava/lang/String;)Ljava/lang/String;"),
+                                                                class_java_lang_Object,
+                                                                true);
 
-   Calls a Java method with a variable number of arguments, passed via
-   a vm_arg array, and returns an integer (s4).
+       if (m == NULL) {
+               exceptions_print_stacktrace();
+               return NULL;
+       }
 
-*******************************************************************************/
+       s = javastring_new_from_ascii("Main-Class");
 
-s4 vm_call_method_int_vmarg(methodinfo *m, s4 vmargscount, vm_arg *vmargs)
-{
-       s4 i;
+       o = vm_call_method(m, o, s);
 
-#if defined(ENABLE_JIT)
-# if defined(ENABLE_INTRP)
-       if (opt_intrp)
-               i = intrp_asm_vm_call_method_int(m, vmargscount, vmargs);
-       else
-# endif
-               i = asm_vm_call_method_int(m, vmargscount, vmargs);
-#else
-       i = intrp_asm_vm_call_method_int(m, vmargscount, vmargs);
-#endif
+       if (o == NULL) {
+               exceptions_print_stacktrace();
+               return NULL;
+       }
 
-       return i;
+       return javastring_tochar(o);
 }
 
 
-/* vm_call_method_long *********************************************************
+/* vm_compile_all **************************************************************
 
-   Calls a Java method with a variable number of arguments and returns
-   a long (s8).
+   Compile all methods found in the bootclasspath.
 
 *******************************************************************************/
 
-s8 vm_call_method_long(methodinfo *m, java_objectheader *o, ...)
+#if !defined(NDEBUG)
+static void vm_compile_all(void)
 {
-       va_list ap;
-       s8      l;
-
-       va_start(ap, o);
-       l = vm_call_method_long_valist(m, o, ap);
-       va_end(ap);
-
-       return l;
-}
-
+       classinfo              *c;
+       methodinfo             *m;
+       u4                      slot;
+       classcache_name_entry  *nmen;
+       classcache_class_entry *clsen;
+       s4                      i;
 
-/* vm_call_method_long_valist **************************************************
+       /* create all classes found in the bootclasspath */
+       /* XXX currently only works with zip/jar's */
 
-   Calls a Java method with a variable number of arguments, passed via
-   a va_list, and returns a long (s8).
+       loader_load_all_classes();
 
-*******************************************************************************/
+       /* link all classes */
 
-s8 vm_call_method_long_valist(methodinfo *m, java_objectheader *o, va_list ap)
-{
-       s4      vmargscount;
-       vm_arg *vmargs;
-       s8      l;
-       s4      dumpsize;
+       for (slot = 0; slot < hashtable_classcache.size; slot++) {
+               nmen = (classcache_name_entry *) hashtable_classcache.ptr[slot];
 
-       /* mark start of dump memory area */
+               for (; nmen; nmen = nmen->hashlink) {
+                       /* iterate over all class entries */
 
-       dumpsize = dump_size();
+                       for (clsen = nmen->classes; clsen; clsen = clsen->next) {
+                               c = clsen->classobj;
 
-       /* get number of Java method arguments */
+                               if (c == NULL)
+                                       continue;
 
-       vmargscount = m->parseddesc->paramcount;
+                               if (!(c->state & CLASS_LINKED)) {
+                                       if (!link_class(c)) {
+                                               fprintf(stderr, "Error linking: ");
+                                               utf_fprint_printable_ascii_classname(stderr, c->name);
+                                               fprintf(stderr, "\n");
 
-       /* allocate vm_arg array */
+                                               /* print out exception and cause */
 
-       vmargs = DMNEW(vm_arg, vmargscount);
+                                               exceptions_print_current_exception();
 
-       /* fill the vm_arg array from a va_list */
+                                               /* goto next class */
 
-       vm_vmargs_from_valist(m, o, vmargs, ap);
+                                               continue;
+                                       }
+                               }
 
-       /* call the Java method */
+                               /* compile all class methods */
 
-       l = vm_call_method_long_vmarg(m, vmargscount, vmargs);
+                               for (i = 0; i < c->methodscount; i++) {
+                                       m = &(c->methods[i]);
 
-       /* release dump area */
+                                       if (m->jcode != NULL) {
+                                               if (!jit_compile(m)) {
+                                                       fprintf(stderr, "Error compiling: ");
+                                                       utf_fprint_printable_ascii_classname(stderr, c->name);
+                                                       fprintf(stderr, ".");
+                                                       utf_fprint_printable_ascii(stderr, m->name);
+                                                       utf_fprint_printable_ascii(stderr, m->descriptor);
+                                                       fprintf(stderr, "\n");
 
-       dump_release(dumpsize);
+                                                       /* print out exception and cause */
 
-       return l;
+                                                       exceptions_print_current_exception();
+                                               }
+                                       }
+                               }
+                       }
+               }
+       }
 }
+#endif /* !defined(NDEBUG) */
 
 
-/* vm_call_method_long_jvalue **************************************************
+/* vm_compile_method ***********************************************************
 
-   Calls a Java method with a variable number of arguments, passed via
-   a jvalue array, and returns a long (s8).
+   Compile a specific method.
 
 *******************************************************************************/
 
-s8 vm_call_method_long_jvalue(methodinfo *m, java_objectheader *o, jvalue *args)
+#if !defined(NDEBUG)
+static void vm_compile_method(void)
 {
-       s4      vmargscount;
-       vm_arg *vmargs;
-       s8      l;
-       s4      dumpsize;
-
-       /* mark start of dump memory area */
-
-       dumpsize = dump_size();
-
-       /* get number of Java method arguments */
-
-       vmargscount = m->parseddesc->paramcount;
-
-       /* allocate vm_arg array */
-
-       vmargs = DMNEW(vm_arg, vmargscount);
-
-       /* fill the vm_arg array from a va_list */
+       methodinfo *m;
 
-       vm_vmargs_from_jvalue(m, o, vmargs, args);
+       /* create, load and link the main class */
 
-       /* call the Java method */
+       mainclass = load_class_bootstrap(utf_new_char(mainstring));
 
-       l = vm_call_method_long_vmarg(m, vmargscount, vmargs);
+       if (mainclass == NULL)
+               exceptions_print_stacktrace();
 
-       /* release dump area */
+       if (!link_class(mainclass))
+               exceptions_print_stacktrace();
 
-       dump_release(dumpsize);
+       if (opt_signature != NULL) {
+               m = class_resolveclassmethod(mainclass,
+                                                                        utf_new_char(opt_method),
+                                                                        utf_new_char(opt_signature),
+                                                                        mainclass,
+                                                                        false);
+       }
+       else {
+               m = class_resolveclassmethod(mainclass,
+                                                                        utf_new_char(opt_method),
+                                                                        NULL,
+                                                                        mainclass,
+                                                                        false);
+       }
 
-       return l;
+       if (m == NULL)
+               vm_abort("vm_compile_method: java.lang.NoSuchMethodException: %s.%s",
+                                opt_method, opt_signature ? opt_signature : "");
+               
+       jit_compile(m);
 }
+#endif /* !defined(NDEBUG) */
 
 
-/* vm_call_method_long_vmarg ***************************************************
+/* vm_call_array ***************************************************************
 
    Calls a Java method with a variable number of arguments, passed via
-   a vm_arg array, and returns a long (s8).
-
-*******************************************************************************/
-
-s8 vm_call_method_long_vmarg(methodinfo *m, s4 vmargscount, vm_arg *vmargs)
-{
-       s8 l;
-
-#if defined(ENABLE_JIT)
-# if defined(ENABLE_INTRP)
-       if (opt_intrp)
-               l = intrp_asm_vm_call_method_long(m, vmargscount, vmargs);
-       else
-# endif
-               l = asm_vm_call_method_long(m, vmargscount, vmargs);
-#else
-       l = intrp_asm_vm_call_method_long(m, vmargscount, vmargs);
-#endif
-
-       return l;
-}
+   an argument array.
 
-
-/* vm_call_method_float ********************************************************
-
-   Calls a Java method with a variable number of arguments and returns
-   an float.
+   ATTENTION: This function has to be used outside the nativeworld.
 
 *******************************************************************************/
 
-float vm_call_method_float(methodinfo *m, java_objectheader *o, ...)
-{
-       va_list ap;
-       float   f;
-
-       va_start(ap, o);
-       f = vm_call_method_float_valist(m, o, ap);
-       va_end(ap);
-
-       return f;
+#define VM_CALL_ARRAY(name, type)                                 \
+static type vm_call##name##_array(methodinfo *m, uint64_t *array) \
+{                                                                 \
+       methoddesc *md;                                               \
+       void       *pv;                                               \
+       type        value;                                            \
+                                                                  \
+       assert(m->code != NULL);                                      \
+                                                                  \
+       md = m->parseddesc;                                           \
+       pv = m->code->entrypoint;                                     \
+                                                                  \
+       STATISTICS(count_calls_native_to_java++);                     \
+                                                                  \
+       value = asm_vm_call_method##name(pv, array, md->memuse);      \
+                                                                  \
+       return value;                                                 \
 }
 
-
-/* vm_call_method_float_valist *************************************************
-
-   Calls a Java method with a variable number of arguments, passed via
-   a va_list, and returns a float.
-
-*******************************************************************************/
-
-float vm_call_method_float_valist(methodinfo *m, java_objectheader *o,
-                                                                 va_list ap)
+static java_handle_t *vm_call_array(methodinfo *m, uint64_t *array)
 {
-       s4      vmargscount;
-       vm_arg *vmargs;
-       float   f;
-       s4      dumpsize;
-
-       /* mark start of dump memory area */
+       methoddesc    *md;
+       void          *pv;
+       java_object_t *o;
 
-       dumpsize = dump_size();
+       assert(m->code != NULL);
 
-       /* get number of Java method arguments */
+       md = m->parseddesc;
+       pv = m->code->entrypoint;
 
-       vmargscount = m->parseddesc->paramcount;
+       STATISTICS(count_calls_native_to_java++);
 
-       /* allocate vm_arg array */
+       o = asm_vm_call_method(pv, array, md->memuse);
 
-       vmargs = DMNEW(vm_arg, vmargscount);
+       if (md->returntype.type == TYPE_VOID)
+               o = NULL;
 
-       /* fill the vm_arg array from a va_list */
+       return LLNI_WRAP(o);
+}
 
-       vm_vmargs_from_valist(m, o, vmargs, ap);
+VM_CALL_ARRAY(_int,    int32_t)
+VM_CALL_ARRAY(_long,   int64_t)
+VM_CALL_ARRAY(_float,  float)
+VM_CALL_ARRAY(_double, double)
 
-       /* call the Java method */
 
-       f = vm_call_method_float_vmarg(m, vmargscount, vmargs);
+/* vm_call_method **************************************************************
 
-       /* release dump area */
+   Calls a Java method with a variable number of arguments.
 
-       dump_release(dumpsize);
+*******************************************************************************/
 
-       return f;
+#define VM_CALL_METHOD(name, type)                                  \
+type vm_call_method##name(methodinfo *m, java_handle_t *o, ...)     \
+{                                                                   \
+       va_list ap;                                                     \
+       type    value;                                                  \
+                                                                    \
+       va_start(ap, o);                                                \
+       value = vm_call_method##name##_valist(m, o, ap);                \
+       va_end(ap);                                                     \
+                                                                    \
+       return value;                                                   \
 }
 
+VM_CALL_METHOD(,        java_handle_t *)
+VM_CALL_METHOD(_int,    int32_t)
+VM_CALL_METHOD(_long,   int64_t)
+VM_CALL_METHOD(_float,  float)
+VM_CALL_METHOD(_double, double)
+
 
-/* vm_call_method_float_jvalue *************************************************
+/* vm_call_method_valist *******************************************************
 
    Calls a Java method with a variable number of arguments, passed via
-   a jvalue array, and returns a float.
+   a va_list.
 
 *******************************************************************************/
 
-float vm_call_method_float_jvalue(methodinfo *m, java_objectheader *o,
-                                                                 jvalue *args)
-{
-       s4      vmargscount;
-       vm_arg *vmargs;
-       float   f;
-       s4      dumpsize;
-
-       /* mark start of dump memory area */
-
-       dumpsize = dump_size();
-
-       /* get number of Java method arguments */
-
-       vmargscount = m->parseddesc->paramcount;
-
-       /* allocate vm_arg array */
-
-       vmargs = DMNEW(vm_arg, vmargscount);
-
-       /* fill the vm_arg array from a va_list */
-
-       vm_vmargs_from_jvalue(m, o, vmargs, args);
-
-       /* call the Java method */
-
-       f = vm_call_method_float_vmarg(m, vmargscount, vmargs);
-
-       /* release dump area */
-
-       dump_release(dumpsize);
-
-       return f;
+#define VM_CALL_METHOD_VALIST(name, type)                               \
+type vm_call_method##name##_valist(methodinfo *m, java_handle_t *o,     \
+                                                                  va_list ap)                          \
+{                                                                       \
+       uint64_t *array;                                                    \
+       type      value;                                                    \
+       int32_t   dumpmarker;                                               \
+                                                                        \
+       if (m->code == NULL)                                                \
+               if (!jit_compile(m))                                            \
+                       return 0;                                                   \
+                                                                        \
+       THREAD_NATIVEWORLD_EXIT;                                            \
+       DMARKER;                                                            \
+                                                                        \
+       array = argument_vmarray_from_valist(m, o, ap);                     \
+       value = vm_call##name##_array(m, array);                            \
+                                                                        \
+       DRELEASE;                                                           \
+       THREAD_NATIVEWORLD_ENTER;                                           \
+                                                                        \
+       return value;                                                       \
 }
 
+VM_CALL_METHOD_VALIST(,        java_handle_t *)
+VM_CALL_METHOD_VALIST(_int,    int32_t)
+VM_CALL_METHOD_VALIST(_long,   int64_t)
+VM_CALL_METHOD_VALIST(_float,  float)
+VM_CALL_METHOD_VALIST(_double, double)
 
-/* vm_call_method_float_vmarg **************************************************
-
-   Calls a Java method with a variable number of arguments and returns
-   an float.
 
-*******************************************************************************/
-
-float vm_call_method_float_vmarg(methodinfo *m, s4 vmargscount, vm_arg *vmargs)
-{
-       float f;
-
-#if defined(ENABLE_JIT)
-# if defined(ENABLE_INTRP)
-       if (opt_intrp)
-               f = intrp_asm_vm_call_method_float(m, vmargscount, vmargs);
-       else
-# endif
-               f = asm_vm_call_method_float(m, vmargscount, vmargs);
-#else
-       f = intrp_asm_vm_call_method_float(m, vmargscount, vmargs);
-#endif
-
-       return f;
-}
-
-
-/* vm_call_method_double *******************************************************
+/* vm_call_method_jvalue *******************************************************
 
-   Calls a Java method with a variable number of arguments and returns
-   a double.
+   Calls a Java method with a variable number of arguments, passed via
+   a jvalue array.
 
 *******************************************************************************/
 
-double vm_call_method_double(methodinfo *m, java_objectheader *o, ...)
-{
-       va_list ap;
-       double  d;
-
-       va_start(ap, o);
-       d = vm_call_method_double_valist(m, o, ap);
-       va_end(ap);
-
-       return d;
+#define VM_CALL_METHOD_JVALUE(name, type)                               \
+type vm_call_method##name##_jvalue(methodinfo *m, java_handle_t *o,     \
+                                                          const jvalue *args)                  \
+{                                                                       \
+       uint64_t *array;                                                    \
+       type      value;                                                    \
+       int32_t   dumpmarker;                                               \
+                                                                        \
+       if (m->code == NULL)                                                \
+               if (!jit_compile(m))                                            \
+                       return 0;                                                   \
+                                                                        \
+       THREAD_NATIVEWORLD_EXIT;                                            \
+       DMARKER;                                                            \
+                                                                        \
+       array = argument_vmarray_from_jvalue(m, o, args);                   \
+       value = vm_call##name##_array(m, array);                            \
+                                                                        \
+       DRELEASE;                                                           \
+       THREAD_NATIVEWORLD_ENTER;                                           \
+                                                                        \
+       return value;                                                       \
 }
 
+VM_CALL_METHOD_JVALUE(,        java_handle_t *)
+VM_CALL_METHOD_JVALUE(_int,    int32_t)
+VM_CALL_METHOD_JVALUE(_long,   int64_t)
+VM_CALL_METHOD_JVALUE(_float,  float)
+VM_CALL_METHOD_JVALUE(_double, double)
 
-/* vm_call_method_double_valist ************************************************
 
-   Calls a Java method with a variable number of arguments, passed via
-   a va_list, and returns a double.
+/* vm_call_method_objectarray **************************************************
+
+   Calls a Java method with a variable number if arguments, passed via
+   an objectarray of boxed values. Returns a boxed value.
 
 *******************************************************************************/
 
-double vm_call_method_double_valist(methodinfo *m, java_objectheader *o,
-                                                                       va_list ap)
+java_handle_t *vm_call_method_objectarray(methodinfo *m, java_handle_t *o,
+                                                                                 java_handle_objectarray_t *params)
 {
-       s4      vmargscount;
-       vm_arg *vmargs;
-       double  d;
-       s4      dumpsize;
-
-       /* mark start of dump memory area */
-
-       dumpsize = dump_size();
+       uint64_t      *array;
+       java_handle_t *xptr;
+       java_handle_t *ro;
+       imm_union      value;
+       int32_t        dumpmarker;
 
-       /* get number of Java method arguments */
+       /* Prevent compiler warnings. */
 
-       vmargscount = m->parseddesc->paramcount;
+       ro = NULL;
 
-       /* allocate vm_arg array */
+       /* compile methods which are not yet compiled */
 
-       vmargs = DMNEW(vm_arg, vmargscount);
+       if (m->code == NULL)
+               if (!jit_compile(m))
+                       return NULL;
 
-       /* fill the vm_arg array from a va_list */
+       /* leave the nativeworld */
 
-       vm_vmargs_from_valist(m, o, vmargs, ap);
+       THREAD_NATIVEWORLD_EXIT;
 
-       /* call the Java method */
+       /* mark start of dump memory area */
 
-       d = vm_call_method_double_vmarg(m, vmargscount, vmargs);
+       DMARKER;
 
-       /* release dump area */
+       /* Fill the argument array from a object-array. */
 
-       dump_release(dumpsize);
+       array = argument_vmarray_from_objectarray(m, o, params);
 
-       return d;
-}
+       if (array == NULL) {
+               /* release dump area */
 
+               DRELEASE;
 
-/* vm_call_method_double_jvalue ************************************************
-
-   Calls a Java method with a variable number of arguments, passed via
-   a jvalue array, and returns a double.
+               /* enter the nativeworld again */
 
-*******************************************************************************/
+               THREAD_NATIVEWORLD_ENTER;
 
-double vm_call_method_double_jvalue(methodinfo *m, java_objectheader *o,
-                                                                       jvalue *args)
-{
-       s4      vmargscount;
-       vm_arg *vmargs;
-       double  d;
-       s4      dumpsize;
+               exceptions_throw_illegalargumentexception();
 
-       /* mark start of dump memory area */
+               return NULL;
+       }
 
-       dumpsize = dump_size();
+       switch (m->parseddesc->returntype.decltype) {
+       case PRIMITIVETYPE_VOID:
+               value.a = vm_call_array(m, array);
+               break;
 
-       /* get number of Java method arguments */
+       case PRIMITIVETYPE_BOOLEAN:
+       case PRIMITIVETYPE_BYTE:
+       case PRIMITIVETYPE_CHAR:
+       case PRIMITIVETYPE_SHORT:
+       case PRIMITIVETYPE_INT:
+               value.i = vm_call_int_array(m, array);
+               break;
 
-       vmargscount = m->parseddesc->paramcount;
+       case PRIMITIVETYPE_LONG:
+               value.l = vm_call_long_array(m, array);
+               break;
 
-       /* allocate vm_arg array */
+       case PRIMITIVETYPE_FLOAT:
+               value.f = vm_call_float_array(m, array);
+               break;
 
-       vmargs = DMNEW(vm_arg, vmargscount);
+       case PRIMITIVETYPE_DOUBLE:
+               value.d = vm_call_double_array(m, array);
+               break;
 
-       /* fill the vm_arg array from a va_list */
+       case TYPE_ADR:
+               ro = vm_call_array(m, array);
+               break;
 
-       vm_vmargs_from_jvalue(m, o, vmargs, args);
+       default:
+               vm_abort("vm_call_method_objectarray: invalid return type %d", m->parseddesc->returntype.decltype);
+       }
 
-       /* call the Java method */
+       /* release dump area */
 
-       d = vm_call_method_double_vmarg(m, vmargscount, vmargs);
+       DRELEASE;
 
-       /* release dump area */
+       /* enter the nativeworld again */
 
-       dump_release(dumpsize);
+       THREAD_NATIVEWORLD_ENTER;
 
-       return d;
-}
+       /* box the return value if necesarry */
 
+       if (m->parseddesc->returntype.decltype != TYPE_ADR)
+               ro = primitive_box(m->parseddesc->returntype.decltype, value);
 
-/* vm_call_method_double_vmarg *************************************************
+       /* check for an exception */
 
-   Calls a Java method with a variable number of arguments and returns
-   a double.
+       xptr = exceptions_get_exception();
 
-*******************************************************************************/
+       if (xptr != NULL) {
+               /* clear exception pointer, we are calling JIT code again */
 
-double vm_call_method_double_vmarg(methodinfo *m, s4 vmargscount,
-                                                                  vm_arg *vmargs)
-{
-       double d;
+               exceptions_clear_exception();
 
-#if defined(ENABLE_JIT)
-# if defined(ENABLE_INTRP)
-       if (opt_intrp)
-               d = intrp_asm_vm_call_method_double(m, vmargscount, vmargs);
-       else
-# endif
-               d = asm_vm_call_method_double(m, vmargscount, vmargs);
-#else
-       d = intrp_asm_vm_call_method_double(m, vmargscount, vmargs);
-#endif
+               exceptions_throw_invocationtargetexception(xptr);
+       }
 
-       return d;
+       return ro;
 }
 
 
@@ -2196,4 +2674,5 @@ double vm_call_method_double_vmarg(methodinfo *m, s4 vmargscount,
  * c-basic-offset: 4
  * tab-width: 4
  * End:
+ * vim:noexpandtab:sw=4:ts=4:
  */