* src/vm/exceptions.c (exceptions_throw_unsatisfiedlinkerror)
[cacao.git] / src / native / native.c
index 4b4c4d3ad641a524bf70cb9bd83e29b520253de0..a71c7383dcb9aced0ffe47822b26ab0bd54fa61f 100644 (file)
@@ -1,9 +1,9 @@
 /* src/native/native.c - table of native functions
 
-   Copyright (C) 1996-2005 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 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
 
    This file is part of CACAO.
 
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
-
-   Authors: Reinhard Grafl
-            Roman Obermaisser
-            Andreas Krall
-
-   Changes: Christian Thalinger
-
-   $Id: native.c 3160 2005-09-10 14:29:52Z twisti $
+   $Id: native.c 7305 2007-02-09 11:08:14Z twisti $
 
 */
 
 
+#include "config.h"
+
 #include <assert.h>
+#include <ctype.h>
 
-#if !defined(ENABLE_STATICVM)
-# include "libltdl/ltdl.h"
+#if !defined(WITH_STATIC_CLASSPATH)
+# include <ltdl.h>
 #endif
 
-#include "config.h"
-#include "types.h"
-#include "cacao/cacao.h"
+#include "vm/types.h"
+
 #include "mm/memory.h"
 #include "native/jni.h"
 #include "native/native.h"
+#include "native/include/java_lang_String.h"
 #include "native/include/java_lang_Throwable.h"
+
+#if defined(ENABLE_THREADS)
+# include "threads/native/lock.h"
+#else
+# include "threads/none/lock.h"
+#endif
+
+#include "toolbox/hashtable.h"
 #include "toolbox/logging.h"
+
 #include "vm/builtin.h"
 #include "vm/exceptions.h"
 #include "vm/global.h"
-#include "vm/loader.h"
-#include "vm/options.h"
-#include "vm/resolve.h"
 #include "vm/stringlocal.h"
-#include "vm/tables.h"
+#include "vm/vm.h"
+
 #include "vm/jit/asmpart.h"
 #include "vm/jit/jit.h"
 
+#include "vmcore/loader.h"
+#include "vmcore/options.h"
+#include "vmcore/resolve.h"
+
+#if defined(ENABLE_JVMTI)
+#include "native/jvmti/cacaodbg.h"
+#endif
+
 
 /* include table of native functions ******************************************/
 
-#include "native/include/java_lang_Cloneable.h"
-#include "native/include/java_util_Properties.h"
+#if defined(ENABLE_JAVASE)
+
 #include "native/include/java_io_InputStream.h"
 #include "native/include/java_io_PrintStream.h"
 
+#include "native/include/java_lang_Cloneable.h"
+#include "native/include/java_util_Properties.h"
+
+#include "native/include/java_lang_Object.h"
+
 #include "native/include/gnu_classpath_VMStackWalker.h"
 #include "native/include/gnu_classpath_VMSystemProperties.h"
-#include "native/include/java_lang_Class.h"
-#include "native/include/java_lang_Object.h"
+#include "native/include/gnu_java_lang_management_VMClassLoadingMXBeanImpl.h"
+#include "native/include/gnu_java_lang_management_VMMemoryMXBeanImpl.h"
+#include "native/include/gnu_java_lang_management_VMRuntimeMXBeanImpl.h"
 #include "native/include/java_lang_VMClass.h"
+#include "native/include/java_security_ProtectionDomain.h"  /* required by... */
 #include "native/include/java_lang_VMClassLoader.h"
 #include "native/include/java_lang_VMObject.h"
 #include "native/include/java_lang_VMRuntime.h"
 #include "native/include/java_lang_VMSystem.h"
 #include "native/include/java_lang_VMThread.h"
 #include "native/include/java_lang_VMThrowable.h"
+#include "native/include/java_lang_management_VMManagementFactory.h"
 #include "native/include/java_lang_reflect_Constructor.h"
 #include "native/include/java_lang_reflect_Field.h"
 #include "native/include/java_lang_reflect_Method.h"
 #include "native/include/java_lang_reflect_VMProxy.h"
 #include "native/include/java_security_VMAccessController.h"
 
-#if defined(ENABLE_STATICVM)
+#if defined(ENABLE_JVMTI)
+#include "native/include/gnu_classpath_jdwp_event_EventRequest.h"
+#include "native/include/java_nio_ByteBuffer.h"
+#include "native/include/gnu_classpath_jdwp_VMVirtualMachine.h"
+#include "native/include/gnu_classpath_jdwp_VMFrame.h"
+#include "native/include/gnu_classpath_jdwp_VMMethod.h"
+#endif
+
+#elif defined(ENABLE_JAVAME_CLDC1_1)
+
+#include "native/include/com_sun_cldchi_io_ConsoleOutputStream.h"
+#include "native/include/java_lang_Class.h"
+#include "native/include/java_lang_Double.h"
+#include "native/include/java_lang_Float.h"
+#include "native/include/java_lang_Math.h"
+#include "native/include/java_lang_Runtime.h"
+#include "native/include/java_lang_System.h"
+#include "native/include/java_lang_Thread.h"
+
+#endif
+
+#if defined(WITH_STATIC_CLASSPATH)
 
 /* these are required to prevent compiler warnings */
 
 
 #include "native/nativetable.inc"
 
-#else /* defined(ENABLE_STATICVM) */
+#elif !defined(ENABLE_LIBJVM)
+
+/* dummynativetable ************************************************************
+
+   Ensure that symbols for functions implemented within CACAO are used
+   and exported to dlopen.
 
-/* Ensure that symbols for functions implemented within CACAO are used and    */
-/* exported to dlopen.                                                        */
+   ATTENTION: Don't make this table static!!!  Otherwise the compiler
+   may optimize it away!
 
-static functionptr dummynativetable[] = {
+*******************************************************************************/
+
+functionptr dummynativetable[] = {
+#if defined(ENABLE_JAVASE)
        (functionptr) Java_gnu_classpath_VMStackWalker_getClassContext,
+       (functionptr) Java_gnu_classpath_VMStackWalker_getCallingClass,
+       (functionptr) Java_gnu_classpath_VMStackWalker_getCallingClassLoader,
+       (functionptr) Java_gnu_classpath_VMStackWalker_firstNonNullClassLoader,
 
        (functionptr) Java_gnu_classpath_VMSystemProperties_preInit,
 
+       (functionptr) Java_gnu_java_lang_management_VMClassLoadingMXBeanImpl_getLoadedClassCount,
+       (functionptr) Java_gnu_java_lang_management_VMClassLoadingMXBeanImpl_getUnloadedClassCount,
+       (functionptr) Java_gnu_java_lang_management_VMClassLoadingMXBeanImpl_isVerbose,
+       (functionptr) Java_gnu_java_lang_management_VMClassLoadingMXBeanImpl_setVerbose,
+
+       (functionptr) Java_gnu_java_lang_management_VMMemoryMXBeanImpl_getHeapMemoryUsage,
+       (functionptr) Java_gnu_java_lang_management_VMMemoryMXBeanImpl_getNonHeapMemoryUsage,
+       (functionptr) Java_gnu_java_lang_management_VMMemoryMXBeanImpl_getObjectPendingFinalizationCount,
+       (functionptr) Java_gnu_java_lang_management_VMMemoryMXBeanImpl_isVerbose,
+       (functionptr) Java_gnu_java_lang_management_VMMemoryMXBeanImpl_setVerbose,
+
+       (functionptr) Java_gnu_java_lang_management_VMRuntimeMXBeanImpl_getInputArguments,
+       (functionptr) Java_gnu_java_lang_management_VMRuntimeMXBeanImpl_getStartTime,
+
        (functionptr) Java_java_lang_VMClass_isInstance,
        (functionptr) Java_java_lang_VMClass_isAssignableFrom,
        (functionptr) Java_java_lang_VMClass_isInterface,
@@ -184,10 +248,14 @@ static functionptr dummynativetable[] = {
        (functionptr) Java_java_lang_VMThrowable_fillInStackTrace,
        (functionptr) Java_java_lang_VMThrowable_getStackTrace,
 
-       (functionptr) Java_java_lang_reflect_Constructor_getModifiers,
+       (functionptr) Java_java_lang_management_VMManagementFactory_getMemoryPoolNames,
+       (functionptr) Java_java_lang_management_VMManagementFactory_getMemoryManagerNames,
+       (functionptr) Java_java_lang_management_VMManagementFactory_getGarbageCollectorNames,
+
+       (functionptr) Java_java_lang_reflect_Constructor_getModifiersInternal,
        (functionptr) Java_java_lang_reflect_Constructor_constructNative,
 
-       (functionptr) Java_java_lang_reflect_Field_getModifiers,
+       (functionptr) Java_java_lang_reflect_Field_getModifiersInternal,
        (functionptr) Java_java_lang_reflect_Field_getType,
        (functionptr) Java_java_lang_reflect_Field_get,
        (functionptr) Java_java_lang_reflect_Field_getBoolean,
@@ -208,7 +276,7 @@ static functionptr dummynativetable[] = {
        (functionptr) Java_java_lang_reflect_Field_setFloat,
        (functionptr) Java_java_lang_reflect_Field_setDouble,
 
-       (functionptr) Java_java_lang_reflect_Method_getModifiers,
+       (functionptr) Java_java_lang_reflect_Method_getModifiersInternal,
        (functionptr) Java_java_lang_reflect_Method_getReturnType,
        (functionptr) Java_java_lang_reflect_Method_getParameterTypes,
        (functionptr) Java_java_lang_reflect_Method_getExceptionTypes,
@@ -219,110 +287,148 @@ static functionptr dummynativetable[] = {
        (functionptr) Java_java_lang_reflect_VMProxy_generateProxyClass,
 
        (functionptr) Java_java_security_VMAccessController_getStack,
-};
 
-#endif /* defined(ENABLE_STATICVM) */
+#if defined(ENABLE_JVMTI)
+       (functionptr) Java_gnu_classpath_jdwp_VMVirtualMachine_suspendThread,
+       (functionptr) Java_gnu_classpath_jdwp_VMVirtualMachine_resumeThread,
+       (functionptr) Java_gnu_classpath_jdwp_VMVirtualMachine_getSuspendCount,
+       (functionptr) Java_gnu_classpath_jdwp_VMVirtualMachine_getAllLoadedClassesCount,
+       (functionptr) Java_gnu_classpath_jdwp_VMVirtualMachine_getClassStatus,
+       (functionptr) Java_gnu_classpath_jdwp_VMVirtualMachine_getAllClassMethods,
+       (functionptr) Java_gnu_classpath_jdwp_VMVirtualMachine_getClassMethod,
+       (functionptr) Java_gnu_classpath_jdwp_VMVirtualMachine_getFrames,
+       (functionptr) Java_gnu_classpath_jdwp_VMVirtualMachine_getFrame,
+       (functionptr) Java_gnu_classpath_jdwp_VMVirtualMachine_getFrameCount,
+       (functionptr) Java_gnu_classpath_jdwp_VMVirtualMachine_getThreadStatus,
+       (functionptr) Java_gnu_classpath_jdwp_VMVirtualMachine_getLoadRequests,
+       (functionptr) Java_gnu_classpath_jdwp_VMVirtualMachine_executeMethod,
+       (functionptr) Java_gnu_classpath_jdwp_VMVirtualMachine_getSourceFile,
+       (functionptr) Java_gnu_classpath_jdwp_VMVirtualMachine_registerEvent,
+       (functionptr) Java_gnu_classpath_jdwp_VMVirtualMachine_unregisterEvent,
+       (functionptr) Java_gnu_classpath_jdwp_VMVirtualMachine_clearEvents,
+       (functionptr) Java_gnu_classpath_jdwp_VMVirtualMachine_getAllLoadedClasses,
+       (functionptr) Java_gnu_classpath_jdwp_VMFrame_setValue,
+       (functionptr) Java_gnu_classpath_jdwp_VMFrame_getValue,
+       (functionptr) Java_gnu_classpath_jdwp_VMMethod_getName,
+       (functionptr) Java_gnu_classpath_jdwp_VMMethod_getSignature,
+       (functionptr) Java_gnu_classpath_jdwp_VMMethod_getModifiers,
+       (functionptr) Java_gnu_classpath_jdwp_VMMethod_getLineTable,
+       (functionptr) Java_gnu_classpath_jdwp_VMMethod_getVariableTable
+#endif
 
+#elif defined(ENABLE_JAVAME_CLDC1_1)
+       (functionptr) Java_com_sun_cldc_io_ResourceInputStream_open,
 
-/************* use classinfo structure as java.lang.Class object **************/
+       (functionptr) Java_com_sun_cldc_io_j2me_socket_Protocol_open0,
+       (functionptr) Java_com_sun_cldc_io_j2me_socket_Protocol_readBuf,
+       (functionptr) Java_com_sun_cldc_io_j2me_socket_Protocol_writeByte,
 
-bool use_class_as_object(classinfo *c)
-{
-       if (!c->classvftbl) {
-               /* is the class loaded */
-               if (!c->loaded) {
-/*                     if (!class_load(c)) */
-/*                             throw_exception_exit(); */
-                       log_text("use_class_as_object: class_load should not happen");
-                       assert(0);
-               }
+       (functionptr) Java_com_sun_cldchi_io_ConsoleOutputStream_write,
 
-               /* is the class linked */
-               if (!c->linked)
-                       if (!link_class(c))
-                               return false;
+       (functionptr) Java_java_lang_Class_forName,
+       (functionptr) Java_java_lang_Class_newInstance,
+       (functionptr) Java_java_lang_Class_isInstance,
+       (functionptr) Java_java_lang_Class_isAssignableFrom,
+       (functionptr) Java_java_lang_Class_isInterface,
+       (functionptr) Java_java_lang_Class_isArray,
+       (functionptr) Java_java_lang_Class_getName,
 
-               assert(class_java_lang_Class);
+       (functionptr) Java_java_lang_Double_doubleToLongBits,
 
-               c->header.vftbl = class_java_lang_Class->vftbl;
-               c->classvftbl = true;
-       }
+       (functionptr) Java_java_lang_Float_floatToIntBits,
 
-       return true;
-}
+       (functionptr) Java_java_lang_Math_ceil,
+       (functionptr) Java_java_lang_Math_cos,
+       (functionptr) Java_java_lang_Math_floor,
+       (functionptr) Java_java_lang_Math_sin,
+       (functionptr) Java_java_lang_Math_sqrt,
+       (functionptr) Java_java_lang_Math_tan,
 
+       (functionptr) Java_java_lang_Object_hashCode,
+       (functionptr) Java_java_lang_Object_notify,
+       (functionptr) Java_java_lang_Object_wait,
 
-/************************** tables for methods ********************************/
+       (functionptr) Java_java_lang_Runtime_exitInternal,
+       (functionptr) Java_java_lang_Runtime_freeMemory,
+       (functionptr) Java_java_lang_Runtime_totalMemory,
+       (functionptr) Java_java_lang_Runtime_gc,
 
-#undef JOWENN_DEBUG
-#undef JOWENN_DEBUG1
+       (functionptr) Java_java_lang_String_hashCode,
+       (functionptr) Java_java_lang_String_indexOf__I,
+       (functionptr) Java_java_lang_String_indexOf__II,
+       (functionptr) Java_java_lang_String_lastIndexOf__II,
+       (functionptr) Java_java_lang_String_intern,
 
-#ifdef ENABLE_STATICVM
-#define NATIVETABLESIZE  (sizeof(nativetable)/sizeof(struct nativeref))
+       (functionptr) Java_java_lang_System_getProperty0,
 
-/* table for fast string comparison */
-static nativecompref nativecomptable[NATIVETABLESIZE];
+       (functionptr) Java_java_lang_Thread_currentThread,
+       (functionptr) Java_java_lang_Thread_setPriority0,
+       (functionptr) Java_java_lang_Thread_start0,
+       (functionptr) Java_java_lang_Thread_yield,
 
-/* string comparsion table initialized */
-static bool nativecompdone = false;
+       (functionptr) Java_java_lang_Throwable_printStackTrace,
+       (functionptr) Java_java_lang_Throwable_fillInStackTrace
 #endif
+};
 
+#endif /* defined(ENABLE_LIBJVM) */
 
-/* XXX don't define this in a header file!!! */
 
-static struct nativeCall nativeCalls[] =
-{
-#include "nativecalls.inc"
-};
+/* tables for methods *********************************************************/
 
-#define NATIVECALLSSIZE    (sizeof(nativeCalls) / sizeof(struct nativeCall))
+#if defined(WITH_STATIC_CLASSPATH)
+#define NATIVETABLESIZE  (sizeof(nativetable)/sizeof(struct nativeref))
 
-struct nativeCompCall nativeCompCalls[NATIVECALLSSIZE];
+/* table for fast string comparison */
+static nativecompref nativecomptable[NATIVETABLESIZE];
+
+/* string comparsion table initialized */
+static bool nativecompdone = false;
+#endif
 
 
 /* global variables ***********************************************************/
 
-#if !defined(ENABLE_STATICVM)
-static hashtable library_hash;
+#if !defined(WITH_STATIC_CLASSPATH)
+static hashtable *hashtable_library;
 static lt_dlhandle mainhandle;
 #endif
 
 
-/* native_loadclasses **********************************************************
+/* native_init *****************************************************************
 
-   Load classes required for native methods.
+   Initializes the native subsystem.
 
 *******************************************************************************/
 
 bool native_init(void)
 {
-#if !defined(ENABLE_STATICVM)
-       void *p;
-
-       /* We need to access the dummy native table, not only to remove a warning */
-       /* but to be sure that the table is not optimized away (gcc does this     */
-       /* since 3.4).                                                            */
-
-       p = &dummynativetable;
-
+#if !defined(WITH_STATIC_CLASSPATH)
        /* initialize libltdl */
 
-       if (lt_dlinit()) {
-               /* XXX how can we throw an exception here? */
-               log_text(lt_dlerror());
+       if (lt_dlinit())
+               vm_abort("native_init: lt_dlinit failed: %s\n", lt_dlerror());
 
-               return false;
-       }
+       /* Get the handle for the main program or for the libjvm.so,
+          depends on the configuration. */
 
-       /* get the handle for the main program */
+# if defined(ENABLE_LIBJVM)
+       /* First try to open where dlopen searches, e.g. LD_LIBRARY_PATH.
+          If not found, try the absolute path. */
 
+       if (!(mainhandle = lt_dlopenext("libjvm")))
+               if (!(mainhandle = lt_dlopenext(cacao_libjvm)))
+                       vm_abort("native_init: lt_dlopenext failed: %s\n", lt_dlerror());
+# else
        if (!(mainhandle = lt_dlopen(NULL)))
-               return false;
+               vm_abort("native_init: lt_dlopen failed: %s\n", lt_dlerror());
+# endif
 
        /* initialize library hashtable, 10 entries should be enough */
 
-       init_hashtable(&library_hash, 10);
+       hashtable_library = NEW(hashtable);
 
+       hashtable_create(hashtable_library, 10);
 #endif
 
        /* everything's ok */
@@ -331,26 +437,28 @@ bool native_init(void)
 }
 
 
-/* native_library_hash_add *****************************************************
+/* native_hashtable_library_add ************************************************
 
    Adds an entry to the native library hashtable.
 
 *******************************************************************************/
 
-#if !defined(ENABLE_STATICVM)
-void native_library_hash_add(utf *filename, java_objectheader *loader,
-                                                        lt_dlhandle handle)
+#if !defined(WITH_STATIC_CLASSPATH)
+void native_hashtable_library_add(utf *filename, java_objectheader *loader,
+                                                                 lt_dlhandle handle)
 {
-       library_hash_loader_entry *le;
-       library_hash_name_entry   *ne;      /* library name                       */
+       hashtable_library_loader_entry *le;
+       hashtable_library_name_entry   *ne; /* library name                       */
        u4   key;                           /* hashkey                            */
        u4   slot;                          /* slot in hashtable                  */
 
+       LOCK_MONITOR_ENTER(hashtable_library->header);
+
        /* normally addresses are aligned to 4, 8 or 16 bytes */
 
-       key = ((u4) (ptrint) loader) >> 4;         /* align to 16-byte boundaries */
-       slot = key & (library_hash.size - 1);
-       le = library_hash.ptr[slot];
+       key  = ((u4) (ptrint) loader) >> 4;        /* align to 16-byte boundaries */
+       slot = key & (hashtable_library->size - 1);
+       le   = hashtable_library->ptr[slot];
 
        /* search external hash chain for the entry */
 
@@ -363,20 +471,21 @@ void native_library_hash_add(utf *filename, java_objectheader *loader,
 
        /* no loader found? create a new entry */
 
-       if (!le) {
-               le = NEW(library_hash_loader_entry);
+       if (le == NULL) {
+               le = NEW(hashtable_library_loader_entry);
 
-               le->loader = loader;
+               le->loader   = loader;
                le->namelink = NULL;
 
                /* insert entry into hashtable */
 
-               le->hashlink = (library_hash_loader_entry *) library_hash.ptr[slot];
-               library_hash.ptr[slot] = le;
+               le->hashlink =
+                       (hashtable_library_loader_entry *) hashtable_library->ptr[slot];
+               hashtable_library->ptr[slot] = le;
 
                /* update number of hashtable-entries */
 
-               library_hash.entries++;
+               hashtable_library->entries++;
        }
 
 
@@ -385,47 +494,52 @@ void native_library_hash_add(utf *filename, java_objectheader *loader,
        ne = le->namelink;
 
        while (ne) {
-               if (ne->name == filename)
+               if (ne->name == filename) {
+                       LOCK_MONITOR_EXIT(hashtable_library->header);
+
                        return;
+               }
 
                ne = ne->hashlink;                  /* next element in external chain */
        }
 
        /* not found? add the library name to the classloader */
 
-       ne = NEW(library_hash_name_entry);
+       ne = NEW(hashtable_library_name_entry);
 
-       ne->name = filename;
+       ne->name   = filename;
        ne->handle = handle;
 
        /* insert entry into external chain */
 
        ne->hashlink = le->namelink;
        le->namelink = ne;
+
+       LOCK_MONITOR_EXIT(hashtable_library->header);
 }
-#endif /* !defined(ENABLE_STATICVM) */
+#endif /* !defined(WITH_STATIC_CLASSPATH) */
 
 
-/* native_library_hash_find ****************************************************
+/* native_hashtable_library_find ***********************************************
 
    Find an entry in the native library hashtable.
 
 *******************************************************************************/
 
-#if !defined(ENABLE_STATICVM)
-library_hash_name_entry *native_library_hash_find(utf *filename,
-                                                                                                 java_objectheader *loader)
+#if !defined(WITH_STATIC_CLASSPATH)
+hashtable_library_name_entry *native_hashtable_library_find(utf *filename,
+                                                                                                                       java_objectheader *loader)
 {
-       library_hash_loader_entry *le;
-       library_hash_name_entry   *ne;      /* library name                       */
+       hashtable_library_loader_entry *le;
+       hashtable_library_name_entry   *ne; /* library name                       */
        u4   key;                           /* hashkey                            */
        u4   slot;                          /* slot in hashtable                  */
 
        /* normally addresses are aligned to 4, 8 or 16 bytes */
 
        key  = ((u4) (ptrint) loader) >> 4;        /* align to 16-byte boundaries */
-       slot = key & (library_hash.size - 1);
-       le   = library_hash.ptr[slot];
+       slot = key & (hashtable_library->size - 1);
+       le   = hashtable_library->ptr[slot];
 
        /* search external hash chain for the entry */
 
@@ -456,7 +570,7 @@ library_hash_name_entry *native_library_hash_find(utf *filename,
 
        return ne;
 }
-#endif /* !defined(ENABLE_STATICVM) */
+#endif /* !defined(WITH_STATIC_CLASSPATH) */
 
 
 /* native_findfunction *********************************************************
@@ -470,7 +584,7 @@ library_hash_name_entry *native_library_hash_find(utf *filename,
 
 *******************************************************************************/
 
-#if defined(ENABLE_STATICVM)
+#if defined(WITH_STATIC_CLASSPATH)
 functionptr native_findfunction(utf *cname, utf *mname, utf *desc,
                                                                bool isstatic)
 {
@@ -506,7 +620,6 @@ functionptr native_findfunction(utf *cname, utf *mname, utf *desc,
                        return n->func;
        }
 
-               
        /* no function was found, throw exception */
 
        *exceptionptr =
@@ -515,7 +628,7 @@ functionptr native_findfunction(utf *cname, utf *mname, utf *desc,
 
        return NULL;
 }
-#endif /* defined(ENABLE_STATICVM) */
+#endif /* defined(WITH_STATIC_CLASSPATH) */
 
 
 /* native_make_overloaded_function *********************************************
@@ -524,7 +637,7 @@ functionptr native_findfunction(utf *cname, utf *mname, utf *desc,
 
 *******************************************************************************/
 
-#if !defined(ENABLE_STATICVM)
+#if !defined(WITH_STATIC_CLASSPATH)
 static char *native_make_overloaded_function(char *name, utf *desc)
 {
        char *newname;
@@ -622,6 +735,68 @@ static char *native_make_overloaded_function(char *name, utf *desc)
 }
 
 
+/* native_insert_char **********************************************************
+
+   Inserts the passed UTF character into the native method name.  If
+   necessary it is escaped properly.
+
+*******************************************************************************/
+
+static s4 native_insert_char(char *name, u4 pos, u2 c)
+{
+       s4 val;
+       s4 i;
+
+       switch (c) {
+       case '/':
+       case '.':
+               /* replace '/' or '.' with '_' */
+               name[pos] = '_';
+               break;
+
+       case '_':
+               /* escape sequence for '_' is '_1' */
+               name[pos]   = '_';
+               name[++pos] = '1';
+               break;
+
+       case ';':
+               /* escape sequence for ';' is '_2' */
+               name[pos]   = '_';
+               name[++pos] = '2';
+               break;
+
+       case '[':
+               /* escape sequence for '[' is '_1' */
+               name[pos]   = '_';
+               name[++pos] = '3';
+               break;
+
+       default:
+               if (isalnum(c))
+                       name[pos] = c;
+               else {
+                       /* unicode character */
+                       name[pos]   = '_';
+                       name[++pos] = '0';
+
+                       for (i = 0; i < 4; ++i) {
+                               val = c & 0x0f;
+                               name[pos + 4 - i] = (val > 10) ? ('a' + val - 10) : ('0' + val);
+                               c >>= 4;
+                       }
+
+                       pos += 4;
+               }
+               break;
+       }
+
+       /* return the new buffer index */
+
+       return pos;
+}
+
+
 /* native_resolve_function *****************************************************
 
    Resolves a native function, maybe from a dynamic library.
@@ -630,52 +805,39 @@ static char *native_make_overloaded_function(char *name, utf *desc)
 
 functionptr native_resolve_function(methodinfo *m)
 {
-       lt_ptr                     sym;
-       char                      *name;
-       char                      *newname;
-       s4                         namelen;
-       char                      *utf_ptr;
-       char                      *utf_endptr;
-       s4                         dumpsize;
-       library_hash_loader_entry *le;
-       library_hash_name_entry   *ne;
-       u4                         key;     /* hashkey                            */
-       u4                         slot;    /* slot in hashtable                  */
-       u4                         i;
-
+       lt_ptr                          sym;
+       char                           *name;
+       char                           *newname;
+       s4                              namelen;
+       char                           *utf_ptr;
+       char                           *utf_endptr;
+       u2                              c;
+       u4                              pos;
+       s4                              dumpsize;
+       hashtable_library_loader_entry *le;
+       hashtable_library_name_entry   *ne;
+       u4                              key;    /* hashkey                        */
+       u4                              slot;   /* slot in hashtable              */
 
        /* verbose output */
 
        if (opt_verbosejni) {
                printf("[Dynamic-linking native method ");
-               utf_display_classname(m->class->name);
+               utf_display_printable_ascii_classname(m->class->name);
                printf(".");
-               utf_display(m->name);
+               utf_display_printable_ascii(m->name);
                printf(" ... ");
        }
                
-       /* calculate length of native function name */
-
-       namelen = strlen("Java_") + utf_strlen(m->class->name) + strlen("_") +
-               utf_strlen(m->name) + strlen("0");
-
-       /* check for underscores in class name */
-
-       utf_ptr = m->class->name->text;
-       utf_endptr = UTF_END(m->class->name);
-
-       while (utf_ptr < utf_endptr)
-               if (utf_nextu2(&utf_ptr) == '_')
-                       namelen++;
+       /* Calculate length of native function name.  We multiply the
+          class and method name length by 6 as this is the maxium
+          escape-sequence that can be generated (unicode). */
 
-       /* check for underscores in method name */
-
-       utf_ptr = m->name->text;
-       utf_endptr = UTF_END(m->name);
-
-       while (utf_ptr < utf_endptr)
-               if (utf_nextu2(&utf_ptr) == '_')
-                       namelen++;
+       namelen = strlen("Java_") +
+               utf_get_number_of_u2s(m->class->name) * 6 +
+               strlen("_") +
+               utf_get_number_of_u2s(m->name) * 6 +
+               strlen("0");
 
        /* allocate memory */
 
@@ -683,76 +845,65 @@ functionptr native_resolve_function(methodinfo *m)
 
        name = DMNEW(char, namelen);
 
-
        /* generate name of native functions */
 
        strcpy(name, "Java_");
-       i = strlen("Java_");
+       pos = strlen("Java_");
 
-       utf_ptr = m->class->name->text;
+       utf_ptr    = m->class->name->text;
        utf_endptr = UTF_END(m->class->name);
 
-       for (; utf_ptr < utf_endptr; utf_ptr++, i++) {
-               name[i] = *utf_ptr;
-
-               /* escape sequence for '_' is '_1' */
-
-               if (name[i] == '_')
-                       name[++i] = '1';
-
-               /* replace '/' with '_' */
-
-               if (name[i] == '/')
-                       name[i] = '_';
+       for (; utf_ptr < utf_endptr; utf_ptr++, pos++) {
+               c   = *utf_ptr;
+               pos = native_insert_char(name, pos, c);
        }
 
        /* seperator between class and method */
 
-       name[i++] = '_';
+       name[pos++] = '_';
 
-       utf_ptr = m->name->text;
+       utf_ptr    = m->name->text;
        utf_endptr = UTF_END(m->name);
 
-       for (; utf_ptr < utf_endptr; utf_ptr++, i++) {
-               name[i] = *utf_ptr;
-
-               /* escape sequence for '_' is '_1' */
-
-               if (name[i] == '_')
-                       name[++i] = '1';
+       for (; utf_ptr < utf_endptr; utf_ptr++, pos++) {
+               c   = *utf_ptr;
+               pos = native_insert_char(name, pos, c);
        }
 
        /* close string */
 
-       name[i] = '\0';
+       name[pos] = '\0';
 
+       /* check for an buffer overflow */
+
+       assert(pos <= namelen);
 
        /* generate overloaded function (having the types in it's name)           */
 
        newname = native_make_overloaded_function(name, m->descriptor);
 
-       /* check the library hash entries of the classloader of the methods's     */
-       /* class                                                                  */
+       /* check the library hash entries of the classloader of the
+          methods's class  */
 
        sym = NULL;
 
        /* normally addresses are aligned to 4, 8 or 16 bytes */
 
-       key = ((u4) (ptrint) m->class->classloader) >> 4;     /* align to 16-byte */
-       slot = key & (library_hash.size - 1);
-       le = library_hash.ptr[slot];
+       key  = ((u4) (ptrint) m->class->classloader) >> 4;    /* align to 16-byte */
+       slot = key & (hashtable_library->size - 1);
+       le   = hashtable_library->ptr[slot];
 
        /* iterate through loaders in this hash slot */
 
-       while (le && !sym) {
+       while ((le != NULL) && (sym == NULL)) {
                /* iterate through names in this loader */
 
                ne = le->namelink;
                        
-               while (ne && !sym) {
+               while ((ne != NULL) && (sym == NULL)) {
                        sym = lt_dlsym(ne->handle, name);
 
-                       if (!sym)
+                       if (sym == NULL)
                                sym = lt_dlsym(ne->handle, newname);
 
                        ne = ne->hashlink;
@@ -761,32 +912,39 @@ functionptr native_resolve_function(methodinfo *m)
                le = le->hashlink;
        }
 
-       if (sym)
+       if (sym != NULL)
                if (opt_verbosejni)
                        printf("JNI ]\n");
 
 
-       /* if not found, try to find the native function symbol in the main       */
-       /* program                                                                */
+       /* If not found, try to find the native function symbol in the
+          main program. */
 
-       if (!sym) {
+       if (sym == NULL) {
                sym = lt_dlsym(mainhandle, name);
 
-               if (!sym)
+               if (sym == NULL)
                        sym = lt_dlsym(mainhandle, newname);
 
-               if (sym)
+               if (sym != NULL)
                        if (opt_verbosejni)
                                printf("internal ]\n");
        }
 
 
+#if defined(ENABLE_JVMTI)
+       /* fire Native Method Bind event */
+       if (jvmti) jvmti_NativeMethodBind(m, sym, &sym);
+#endif
+
        /* no symbol found? throw exception */
 
-       if (!sym)
-               *exceptionptr =
-                       new_exception_utfmessage(string_java_lang_UnsatisfiedLinkError,
-                                                                        m->name);
+       if (sym == NULL) {
+               if (opt_verbosejni)
+                       printf("failed ]\n");
+
+               exceptions_throw_unsatisfiedlinkerror(m->name);
+       }
 
        /* release memory */
 
@@ -794,48 +952,7 @@ functionptr native_resolve_function(methodinfo *m)
 
        return (functionptr) (ptrint) sym;
 }
-#endif /* !defined(ENABLE_STATICVM) */
-
-
-/****************** function class_findfield_approx ****************************
-       
-       searches in 'classinfo'-structure for a field with the
-       specified name
-
-*******************************************************************************/
-fieldinfo *class_findfield_approx(classinfo *c, utf *name)
-{
-       s4 i;
-
-       for (i = 0; i < c->fieldscount; i++) {
-               /* compare field names */
-               if ((c->fields[i].name == name))
-                       return &(c->fields[i]);
-       }
-
-       /* field was not found, raise exception */      
-       *exceptionptr = new_exception(string_java_lang_NoSuchFieldException);
-
-       return NULL;
-}
-
-
-s4 class_findfield_index_approx(classinfo *c, utf *name)
-{
-       s4 i;
-
-       for (i = 0; i < c->fieldscount; i++) {
-               /* compare field names */
-               if ((c->fields[i].name == name))
-                       return i;
-       }
-
-       /* field was not found, raise exception */      
-       *exceptionptr = new_exception(string_java_lang_NoSuchFieldException);
-
-       return -1;
-}
+#endif /* !defined(WITH_STATIC_CLASSPATH) */
 
 
 /* native_new_and_init *********************************************************
@@ -850,46 +967,47 @@ java_objectheader *native_new_and_init(classinfo *c)
        methodinfo *m;
        java_objectheader *o;
 
-       if (!c)
-               return *exceptionptr;
+       if (c == NULL)
+               vm_abort("native_new_and_init: c == NULL");
 
        /* create object */
 
        o = builtin_new(c);
        
-       if (!o)
+       if (o == NULL)
                return NULL;
 
-       /* find initializer */
+       /* try to find the initializer */
 
        m = class_findmethod(c, utf_init, utf_void__void);
                                                      
-       /* initializer not found */
+       /* ATTENTION: returning the object here is ok, since the class may
+       not have an initializer */
 
-       if (!m)
+       if (m == NULL)
                return o;
 
        /* call initializer */
 
-       asm_calljavafunction(m, o, NULL, NULL, NULL);
+       (void) vm_call_method(m, o);
 
        return o;
 }
 
 
-java_objectheader *native_new_and_init_string(classinfo *c, java_lang_String *s)
+java_objectheader *native_new_and_init_string(classinfo *c, java_objectheader *s)
 {
-       methodinfo *m;
+       methodinfo        *m;
        java_objectheader *o;
 
-       if (!c)
-               return *exceptionptr;
+       if (c == NULL)
+               vm_abort("native_new_and_init_string: c == NULL");
 
        /* create object */
 
        o = builtin_new(c);
 
-       if (!o)
+       if (o == NULL)
                return NULL;
 
        /* find initializer */
@@ -902,12 +1020,12 @@ java_objectheader *native_new_and_init_string(classinfo *c, java_lang_String *s)
 
        /* initializer not found */
 
-       if (!m)
+       if (m == NULL)
                return NULL;
 
        /* call initializer */
 
-       asm_calljavafunction(m, o, s, NULL, NULL);
+       (void) vm_call_method(m, o, s);
 
        return o;
 }
@@ -918,14 +1036,14 @@ java_objectheader *native_new_and_init_int(classinfo *c, s4 i)
        methodinfo *m;
        java_objectheader *o;
 
-       if (!c)
-               return *exceptionptr;
+       if (c == NULL)
+               vm_abort("native_new_and_init_int: c == NULL");
 
        /* create object */
 
        o = builtin_new(c);
        
-       if (!o)
+       if (o == NULL)
                return NULL;
 
        /* find initializer */
@@ -934,30 +1052,30 @@ java_objectheader *native_new_and_init_int(classinfo *c, s4 i)
 
        /* initializer not found  */
 
-       if (!m)
+       if (m == NULL)
                return NULL;
 
        /* call initializer */
 
-       asm_calljavafunction(m, o, (void *) (ptrint) i, NULL, NULL);
+       (void) vm_call_method(m, o, i);
 
        return o;
 }
 
 
-java_objectheader *native_new_and_init_throwable(classinfo *c, java_lang_Throwable *t)
+java_objectheader *native_new_and_init_throwable(classinfo *c, java_objectheader *t)
 {
-       methodinfo *m;
        java_objectheader *o;
+       methodinfo        *m;
 
-       if (!c)
-               return *exceptionptr;
+       if (c == NULL)
+               vm_abort("native_new_and_init_throwable: c == NULL");
 
        /* create object */
 
        o = builtin_new(c);
        
-       if (!o)
+       if (o == NULL)
                return NULL;
 
        /* find initializer */
@@ -966,129 +1084,55 @@ java_objectheader *native_new_and_init_throwable(classinfo *c, java_lang_Throwab
                                                      
        /* initializer not found */
 
-       if (!m)
+       if (m == NULL)
                return NULL;
 
        /* call initializer */
 
-       asm_calljavafunction(m, o, t, NULL, NULL);
+       (void) vm_call_method(m, o, t);
 
        return o;
 }
 
 
-void copy_vftbl(vftbl_t **dest, vftbl_t *src)
-{
-    *dest = src;
-#if 0
-    /* XXX this kind of copying does not work (in the general
-     * case). The interface tables would have to be copied, too. I
-     * don't see why we should make a copy anyway. -Edwin
-     */
-       *dest = mem_alloc(sizeof(vftbl) + sizeof(methodptr)*(src->vftbllength-1));
-       memcpy(*dest, src, sizeof(vftbl) - sizeof(methodptr));
-       memcpy(&(*dest)->table, &src->table, src->vftbllength * sizeof(methodptr));
-#endif
-}
+/* native_class_getdeclaredannotations *****************************************
 
+   Implementation for
+   java.lang.Class.getDeclaredAnnotations(Ljava/lang/Class;)[Ljava/lang/annotation/Annotation;
 
-/******************************************************************************************                                                                                                            
-
-       creates method signature (excluding return type) from array of 
-       class-objects representing the parameters of the method 
-
-*******************************************************************************************/
-
+*******************************************************************************/
 
-utf *create_methodsig(java_objectarray* types, char *retType)
+#if defined(ENABLE_JAVASE)
+java_objectarray *native_class_getdeclaredannotations(classinfo *c)
 {
-    char *buffer;       /* buffer for building the desciptor */
-    char *pos;          /* current position in buffer */
-    utf *result;        /* the method signature */
-    u4 buffer_size = 3; /* minimal size=3: room for parenthesis and returntype */
-    u4 i, j;
-    if (!types) return NULL;
-
-    /* determine required buffer-size */    
-    for (i = 0; i < types->header.size; i++) {
-               classinfo *c = (classinfo *) types->data[i];
-               buffer_size  = buffer_size + c->name->blength + 2;
-    }
-
-    if (retType) buffer_size += strlen(retType);
-
-    /* allocate buffer */
-    buffer = MNEW(char, buffer_size);
-    pos    = buffer;
-    
-    /* method-desciptor starts with parenthesis */
-    *pos++ = '(';
-
-    for (i = 0; i < types->header.size; i++) {
-               char ch;           
-
-               /* current argument */
-           classinfo *c = (classinfo *) types->data[i];
-
-           /* current position in utf-text */
-           char *utf_ptr = c->name->text; 
-           
-           /* determine type of argument */
-           if ((ch = utf_nextu2(&utf_ptr)) == '[') {
-               /* arrayclass */
-               for (utf_ptr--; utf_ptr < UTF_END(c->name); utf_ptr++) {
-                               *pos++ = *utf_ptr; /* copy text */
-                       }
-
-           } else {            
-                       /* check for primitive types */
-                       for (j = 0; j < PRIMITIVETYPE_COUNT; j++) {
-                               char *utf_pos   = utf_ptr - 1;
-                               char *primitive = primitivetype_table[j].wrapname;
-
-                               /* compare text */
-                               while (utf_pos < UTF_END(c->name)) {
-                                       if (*utf_pos++ != *primitive++) goto nomatch;
-                               }
-
-                               /* primitive type found */
-                               *pos++ = primitivetype_table[j].typesig;
-                               goto next_type;
+       java_objectarray *oa;
+       s4                count;
+       s4                i;
 
-                       nomatch:
-                               ;
-                       }
+       classinfo *class_java_lang_annotation_Annotation;
 
-                       /* no primitive type and no arrayclass, so must be object */
-                       *pos++ = 'L';
+       /* create Annotation-array */
 
-                       /* copy text */
-                       for (utf_ptr--; utf_ptr < UTF_END(c->name); utf_ptr++) {
-                               *pos++ = *utf_ptr;
-                       }
+       /* XXX should we cache that class? */
+       if (!(class_java_lang_annotation_Annotation =
+                 load_class_bootstrap(utf_new_char("java/lang/annotation/Annotation"))))
+               return NULL;
 
-                       *pos++ = ';';
+       count = c->runtimevisibleannotationscount;
 
-               next_type:
-                       ;
-               }  
-    }      
+       oa = builtin_anewarray(count, class_java_lang_annotation_Annotation);
 
-    *pos++ = ')';
+       if (oa == NULL)
+               return NULL;
 
-    if (retType) {
-               for (i = 0; i < strlen(retType); i++) {
-                       *pos++ = retType[i];
-               }
-    }
+       /* fill the annotations */
 
-    /* create utf-string */
-    result = utf_new(buffer, (pos - buffer));
-    MFREE(buffer, char, buffer_size);
+       for (i = 0; i < count; i++) {
+       }
 
-    return result;
+       return oa;
 }
+#endif
 
 
 /* native_get_parametertypes ***************************************************
@@ -1133,14 +1177,11 @@ java_objectarray *native_get_parametertypes(methodinfo *m)
 
     /* get classes */
 
-       for (i = 0; i < paramcount; i++) {
+       for (i = 0; i < paramcount; i++)
                if (!resolve_class_from_typedesc(&paramtypes[i], true, false,
                                                                                 (classinfo **) &oa->data[i]))
                        return NULL;
 
-               use_class_as_object((classinfo *) oa->data[i]);
-       }
-
        return oa;
 }
 
@@ -1169,8 +1210,6 @@ java_objectarray *native_get_exceptiontypes(methodinfo *m)
                                                                                   resolveEager, true, false, &c))
                        return NULL;
 
-               use_class_as_object(c);
-
                oa->data[i] = (java_objectheader *) c;
        }
 
@@ -1192,132 +1231,10 @@ classinfo *native_get_returntype(methodinfo *m)
                                                                         &c))
                return NULL;
 
-       use_class_as_object(c);
-
        return c;
 }
 
 
-/*****************************************************************************/
-/*****************************************************************************/
-
-
-/*--------------------------------------------------------*/
-void printNativeCall(nativeCall nc) {
-  int i,j;
-
-  printf("\n%s's Native Methods call:\n",nc.classname); fflush(stdout);
-  for (i=0; i<nc.methCnt; i++) {  
-      printf("\tMethod=%s %s\n",nc.methods[i].methodname, nc.methods[i].descriptor);fflush(stdout);
-
-    for (j=0; j<nc.callCnt[i]; j++) {  
-        printf("\t\t<%i,%i>aCalled = %s %s %s\n",i,j,
-       nc.methods[i].methodCalls[j].classname, 
-       nc.methods[i].methodCalls[j].methodname, 
-       nc.methods[i].methodCalls[j].descriptor);fflush(stdout);
-      }
-    }
-  printf("-+++++--------------------\n");fflush(stdout);
-}
-
-/*--------------------------------------------------------*/
-void printCompNativeCall(nativeCompCall nc) {
-  int i,j;
-  printf("printCompNativeCall BEGIN\n");fflush(stdout); 
-  printf("\n%s's Native Comp Methods call:\n",nc.classname->text);fflush(stdout);
-  utf_display(nc.classname); fflush(stdout);
-  
-  for (i=0; i<nc.methCnt; i++) {  
-    printf("\tMethod=%s %s\n",nc.methods[i].methodname->text,nc.methods[i].descriptor->text);fflush(stdout);
-    utf_display(nc.methods[i].methodname); fflush(stdout);
-    utf_display(nc.methods[i].descriptor);fflush(stdout);
-    printf("\n");fflush(stdout);
-
-    for (j=0; j<nc.callCnt[i]; j++) {  
-      printf("\t\t<%i,%i>bCalled = ",i,j);fflush(stdout);
-       utf_display(nc.methods[i].methodCalls[j].classname);fflush(stdout);
-       utf_display(nc.methods[i].methodCalls[j].methodname); fflush(stdout);
-       utf_display(nc.methods[i].methodCalls[j].descriptor);fflush(stdout);
-       printf("\n");fflush(stdout);
-      }
-    }
-printf("---------------------\n");fflush(stdout);
-}
-
-
-/*--------------------------------------------------------*/
-classMeth findNativeMethodCalls(utf *c, utf *m, utf *d ) 
-{
-    int i = 0;
-    int j = 0;
-    int cnt = 0;
-    classMeth mc;
-    mc.i_class = i;
-    mc.j_method = j;
-    mc.methCnt = cnt;
-
-    return mc;
-}
-
-/*--------------------------------------------------------*/
-nativeCall* findNativeClassCalls(char *aclassname ) {
-int i;
-
-for (i=0;i<NATIVECALLSSIZE; i++) {
-   /* convert table to utf later to speed up search */ 
-   if (strcmp(nativeCalls[i].classname, aclassname) == 0) 
-       return &nativeCalls[i];
-   }
-
-return NULL;
-}
-/*--------------------------------------------------------*/
-/*--------------------------------------------------------*/
-void utfNativeCall(nativeCall nc, nativeCompCall *ncc) {
-  int i,j;
-
-
-  ncc->classname = utf_new_char(nc.classname); 
-  ncc->methCnt = nc.methCnt;
-  
-  for (i=0; i<nc.methCnt; i++) {  
-    ncc->methods[i].methodname = utf_new_char(nc.methods[i].methodname);
-    ncc->methods[i].descriptor = utf_new_char(nc.methods[i].descriptor);
-    ncc->callCnt[i] = nc.callCnt[i];
-
-    for (j=0; j<nc.callCnt[i]; j++) {  
-
-       ncc->methods[i].methodCalls[j].classname  = utf_new_char(nc.methods[i].methodCalls[j].classname);
-
-        if (strcmp("", nc.methods[i].methodCalls[j].methodname) != 0) {
-          ncc->methods[i].methodCalls[j].methodname = utf_new_char(nc.methods[i].methodCalls[j].methodname);
-          ncc->methods[i].methodCalls[j].descriptor = utf_new_char(nc.methods[i].methodCalls[j].descriptor);
-          }
-        else {
-          ncc->methods[i].methodCalls[j].methodname = NULL;
-          ncc->methods[i].methodCalls[j].descriptor = NULL;
-          }
-      }
-    }
-}
-
-
-
-/*--------------------------------------------------------*/
-
-bool natcall2utf(bool natcallcompdone) {
-int i;
-
-if (natcallcompdone) 
-       return true;
-
-for (i=0;i<NATIVECALLSSIZE; i++) {
-   utfNativeCall  (nativeCalls[i], &nativeCompCalls[i]);  
-   }
-
-return true;
-}
-
 /*
  * These are local overrides for various environment variables in Emacs.
  * Please do not remove this and leave it at the end of the file, where