* src/vm/jit/powerpc64/linux/md-abi.h: fixed linkage area defines for 64bit abi.
[cacao.git] / src / native / native.c
index 1c9ca6a70e463202899ceda13986a5f28382eafd..2b55c1d7edb66a153e280df302a6c758622762e3 100644 (file)
@@ -1,9 +1,9 @@
-/* native/native.c - table of native functions
+/* 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 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
+   Contact: cacao@cacaojvm.org
 
    Authors: Reinhard Grafl
             Roman Obermaisser
             Andreas Krall
 
-   The .hh files created with the header file generator are all
-   included here as are the C functions implementing these methods.
+   Changes: Christian Thalinger
 
-   $Id: native.c 1920 2005-02-10 10:10:32Z twisti $
+   $Id: native.c 5200 2006-07-31 16:30:33Z twisti $
 
 */
 
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <time.h>
-#include <math.h>
-#include <string.h>
-#include <assert.h>
-#include <sys/time.h>
-#include <utime.h>
+#include "config.h"
 
-/* Include files for IO functions */
+#include <assert.h>
 
-#include <fcntl.h>
-#include <dirent.h>
-#include <sys/types.h>
-#ifdef _OSF_SOURCE 
-#include <sys/mode.h>
+#if !defined(WITH_STATIC_CLASSPATH)
+# include <ltdl.h>
 #endif
-#include <sys/stat.h>
 
-#include "config.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_Throwable.h"
+
+#if defined(ENABLE_THREADS)
+# include "threads/native/lock.h"
+#else
+# include "threads/none/lock.h"
+#endif
+
 #include "toolbox/logging.h"
 #include "vm/builtin.h"
 #include "vm/exceptions.h"
 #include "vm/global.h"
+#include "vm/hashtable.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"
 
+#if defined(ENABLE_JVMTI)
+#include "native/jvmti/cacaodbg.h"
+#endif
+
 
 /* include table of native functions ******************************************/
 
-/* XXX quick hack? */
-#if defined(USE_GTK)
-#include "native/vm/GtkComponentPeer.c"
-#include "native/vm/GtkScrollPanePeer.c"
-#include "native/vm/GtkFileDialogPeer.c"
+#include "native/include/java_lang_Cloneable.h"
+#include "native/include/java_util_Properties.h"
+#include "native/include/java_io_InputStream.h"
+#include "native/include/java_io_PrintStream.h"
+
+#include "native/include/gnu_classpath_VMStackWalker.h"
+#include "native/include/gnu_classpath_VMSystemProperties.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_Class.h"
+#include "native/include/java_lang_Object.h"
+#include "native/include/java_lang_VMClass.h"
+#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_VMString.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_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
 
-#include "nativetable.inc"
-
+#if defined(WITH_STATIC_CLASSPATH)
+
+/* these are required to prevent compiler warnings */
+
+#include "native/include/java_net_DatagramPacket.h"
+#include "native/include/java_net_InetAddress.h"
+#include "native/include/java_net_SocketImpl.h"
+
+#include "native/include/gnu_java_net_PlainDatagramSocketImpl.h"
+#include "native/include/gnu_java_net_PlainSocketImpl.h"
+#include "native/include/gnu_java_nio_PipeImpl.h"
+#include "native/include/gnu_java_nio_channels_FileChannelImpl.h"
+#include "native/include/gnu_java_nio_charset_iconv_IconvEncoder.h"
+#include "native/include/gnu_java_nio_charset_iconv_IconvDecoder.h"
+#include "native/include/java_lang_VMProcess.h"
+#include "native/include/java_nio_MappedByteBufferImpl.h"
+#include "native/include/java_nio_channels_spi_SelectorProvider.h"
+
+/* now include the native table */
+
+#include "native/nativetable.inc"
+
+#else /* defined(WITH_STATIC_CLASSPATH) */
+
+/* Ensure that symbols for functions implemented within CACAO are used
+   and exported to dlopen. */
+
+static functionptr dummynativetable[] = {
+       (functionptr) Java_gnu_classpath_VMStackWalker_getClassContext,
+
+       (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,
+       (functionptr) Java_java_lang_VMClass_isPrimitive,
+       (functionptr) Java_java_lang_VMClass_getName,
+       (functionptr) Java_java_lang_VMClass_getSuperclass,
+       (functionptr) Java_java_lang_VMClass_getInterfaces,
+       (functionptr) Java_java_lang_VMClass_getComponentType,
+       (functionptr) Java_java_lang_VMClass_getModifiers,
+       (functionptr) Java_java_lang_VMClass_getDeclaringClass,
+       (functionptr) Java_java_lang_VMClass_getDeclaredClasses,
+       (functionptr) Java_java_lang_VMClass_getDeclaredFields,
+       (functionptr) Java_java_lang_VMClass_getDeclaredMethods,
+       (functionptr) Java_java_lang_VMClass_getDeclaredConstructors,
+       (functionptr) Java_java_lang_VMClass_getClassLoader,
+       (functionptr) Java_java_lang_VMClass_forName,
+       (functionptr) Java_java_lang_VMClass_isArray,
+       (functionptr) Java_java_lang_VMClass_throwException,
+
+       (functionptr) Java_java_lang_VMClassLoader_defineClass,
+       (functionptr) Java_java_lang_VMClassLoader_resolveClass,
+       (functionptr) Java_java_lang_VMClassLoader_loadClass,
+       (functionptr) Java_java_lang_VMClassLoader_getPrimitiveClass,
+       (functionptr) Java_java_lang_VMClassLoader_nativeGetResources,
+       (functionptr) Java_java_lang_VMClassLoader_findLoadedClass,
+
+       (functionptr) Java_java_lang_VMObject_getClass,
+       (functionptr) Java_java_lang_VMObject_clone,
+       (functionptr) Java_java_lang_VMObject_notify,
+       (functionptr) Java_java_lang_VMObject_notifyAll,
+       (functionptr) Java_java_lang_VMObject_wait,
+
+       (functionptr) Java_java_lang_VMRuntime_availableProcessors,
+       (functionptr) Java_java_lang_VMRuntime_freeMemory,
+       (functionptr) Java_java_lang_VMRuntime_totalMemory,
+       (functionptr) Java_java_lang_VMRuntime_maxMemory,
+       (functionptr) Java_java_lang_VMRuntime_gc,
+       (functionptr) Java_java_lang_VMRuntime_runFinalization,
+       (functionptr) Java_java_lang_VMRuntime_runFinalizationForExit,
+       (functionptr) Java_java_lang_VMRuntime_traceInstructions,
+       (functionptr) Java_java_lang_VMRuntime_traceMethodCalls,
+       (functionptr) Java_java_lang_VMRuntime_runFinalizersOnExit,
+       (functionptr) Java_java_lang_VMRuntime_exit,
+       (functionptr) Java_java_lang_VMRuntime_nativeLoad,
+       (functionptr) Java_java_lang_VMRuntime_mapLibraryName,
+
+       (functionptr) Java_java_lang_VMString_intern,
+
+       (functionptr) Java_java_lang_VMSystem_arraycopy,
+       (functionptr) Java_java_lang_VMSystem_identityHashCode,
+
+       (functionptr) Java_java_lang_VMThread_start,
+       (functionptr) Java_java_lang_VMThread_interrupt,
+       (functionptr) Java_java_lang_VMThread_isInterrupted,
+       (functionptr) Java_java_lang_VMThread_suspend,
+       (functionptr) Java_java_lang_VMThread_resume,
+       (functionptr) Java_java_lang_VMThread_nativeSetPriority,
+       (functionptr) Java_java_lang_VMThread_nativeStop,
+       (functionptr) Java_java_lang_VMThread_currentThread,
+       (functionptr) Java_java_lang_VMThread_yield,
+       (functionptr) Java_java_lang_VMThread_interrupted,
+       (functionptr) Java_java_lang_VMThread_holdsLock,
+
+       (functionptr) Java_java_lang_VMThrowable_fillInStackTrace,
+       (functionptr) Java_java_lang_VMThrowable_getStackTrace,
+
+       (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_getModifiersInternal,
+       (functionptr) Java_java_lang_reflect_Field_getType,
+       (functionptr) Java_java_lang_reflect_Field_get,
+       (functionptr) Java_java_lang_reflect_Field_getBoolean,
+       (functionptr) Java_java_lang_reflect_Field_getByte,
+       (functionptr) Java_java_lang_reflect_Field_getChar,
+       (functionptr) Java_java_lang_reflect_Field_getShort,
+       (functionptr) Java_java_lang_reflect_Field_getInt,
+       (functionptr) Java_java_lang_reflect_Field_getLong,
+       (functionptr) Java_java_lang_reflect_Field_getFloat,
+       (functionptr) Java_java_lang_reflect_Field_getDouble,
+       (functionptr) Java_java_lang_reflect_Field_set,
+       (functionptr) Java_java_lang_reflect_Field_setBoolean,
+       (functionptr) Java_java_lang_reflect_Field_setByte,
+       (functionptr) Java_java_lang_reflect_Field_setChar,
+       (functionptr) Java_java_lang_reflect_Field_setShort,
+       (functionptr) Java_java_lang_reflect_Field_setInt,
+       (functionptr) Java_java_lang_reflect_Field_setLong,
+       (functionptr) Java_java_lang_reflect_Field_setFloat,
+       (functionptr) Java_java_lang_reflect_Field_setDouble,
+
+       (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,
+       (functionptr) Java_java_lang_reflect_Method_invokeNative,
+
+       (functionptr) Java_java_lang_reflect_VMProxy_getProxyClass,
+       (functionptr) Java_java_lang_reflect_VMProxy_getProxyData,
+       (functionptr) Java_java_lang_reflect_VMProxy_generateProxyClass,
+
+       (functionptr) Java_java_security_VMAccessController_getStack,
+
+#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
 
-/******************** systemclasses required for native methods ***************/
+};
 
-classinfo *class_java_lang_Double;
-classinfo *class_java_lang_Float;
-classinfo *class_java_lang_Long;
-classinfo *class_java_lang_Byte;
-classinfo *class_java_lang_Short;
-classinfo *class_java_lang_Boolean;
-classinfo *class_java_lang_Void;
-classinfo *class_java_lang_Character;
-classinfo *class_java_lang_Integer;
+#endif /* defined(WITH_STATIC_CLASSPATH) */
 
-methodinfo *method_vmclass_init;
 
+/* tables for methods *********************************************************/
 
-/* the system classloader object */
-struct java_lang_ClassLoader *SystemClassLoader = NULL;
+#if defined(WITH_STATIC_CLASSPATH)
+#define NATIVETABLESIZE  (sizeof(nativetable)/sizeof(struct nativeref))
 
+/* table for fast string comparison */
+static nativecompref nativecomptable[NATIVETABLESIZE];
 
-/** Create a new ProtectionDomain object for a classpath_info structure. 
-       This object will be used for every java.lang.class object who represents a 
-       class which has been loaded from the location this classpath_info structure 
-       points to. **/
-static inline void create_ProtectionDomain(struct classpath_info *cpi) {
-       jmethodID mid;
-       jobject obj;
+/* string comparsion table initialized */
+static bool nativecompdone = false;
+#endif
 
-       jobject cs;
-       jobject pc;
-       jobject url;
 
-       classinfo *c;  
-       classinfo *classpc;
+/* global variables ***********************************************************/
 
-       /* create a new java.io.File object */ 
-       c = class_new(utf_new_char_classname("java/io/File"));
-       
-       if (!class_load(c) || !class_link(c)) {
-               log_text("unable to find java.io.File");
-               throw_main_exception_exit();
-       }
+#if !defined(WITH_STATIC_CLASSPATH)
+static hashtable *hashtable_library;
+static lt_dlhandle mainhandle;
+#endif
 
-       mid = class_resolvemethod(c, utf_new_char("<init>"), utf_new_char("(Ljava/lang/String;)V"));
 
-       if (mid == NULL) {
-               log_text("unable to find constructor in java.io.File");
-               cacao_exit(1);
-       }
+/* native_loadclasses **********************************************************
 
-       obj = builtin_new (c);
-       asm_calljavafunction(mid,obj,javastring_new(utf_new_char(cpi->path)),NULL,NULL);
+   Load classes required for native methods.
 
-       if (*exceptionptr != NULL) {
-               utf_display((*exceptionptr)->vftbl->class->name);
-               printf ("\n");
-               fflush (stdout);        
-               cacao_exit(1);
-       }
+*******************************************************************************/
 
-       /* get URL of CodeSource from java.io.File object */ 
-       mid = class_resolvemethod(c, utf_new_char("toURL"), utf_new_char("()Ljava/net/URL;"));
+bool native_init(void)
+{
+#if !defined(WITH_STATIC_CLASSPATH)
+       void *p;
 
-       if (mid == NULL) {
-               log_text("unable to find toURL in java.io.File");
-               cacao_exit(1);
-       }
+       /* 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). */
 
-       url = asm_calljavafunction(mid,obj,url,NULL,NULL);
+       p = &dummynativetable;
 
-       if (*exceptionptr != NULL) {
-               utf_display((*exceptionptr)->vftbl->class->name);
-               printf ("\n");
-               fflush (stdout);        
-               cacao_exit(1);
-       }
+       /* initialize libltdl */
 
-       /* create a new java.security.CodeSource object */ 
-       c = class_new(utf_new_char_classname("java/security/CodeSource"));
-       
-       if (!class_load(c) || !class_link(c)) {
-               log_text("unable to find java.security.CodeSource");
-               throw_main_exception_exit();
-       }
-       
-       mid = class_resolvemethod(c, 
-                                                         utf_new_char("<init>"), 
-                                                         utf_new_char("(Ljava/net/URL;[Ljava/security/cert/Certificate;)V"));
+       if (lt_dlinit()) {
+               /* XXX how can we throw an exception here? */
+               log_text(lt_dlerror());
 
-       if (mid == NULL) {
-               log_text("unable to find constructor in java.security.CodeSource");
-               cacao_exit(1);
+               return false;
        }
 
-       cs = builtin_new (c);
-       asm_calljavafunction(mid,cs,url,NULL,NULL);
+       /* get the handle for the main program */
 
-       if (*exceptionptr != NULL) {
-               utf_display((*exceptionptr)->vftbl->class->name);
-               printf ("\n");
-               fflush (stdout);        
-               cacao_exit(1);
-       }
+       if (!(mainhandle = lt_dlopen(NULL)))
+               return false;
 
-       /* create a new java.security.PermissionCollection object */ 
+       /* initialize library hashtable, 10 entries should be enough */
 
+       hashtable_library = NEW(hashtable);
 
-       classpc = class_new(utf_new_char_classname("java/security/PermissionCollection"));
-       
-       if (!class_load(c) || !class_link(c)) {
-               log_text("unable to find java.security.PermissionCollection");
-               throw_main_exception_exit();
-       }
+       hashtable_create(hashtable_library, 10);
+#endif
 
-       mid = class_resolvemethod(classpc, utf_new_char("<init>"), 
-                                                         utf_new_char("()V"));
+       /* everything's ok */
 
-       if (mid == NULL) {
-               log_text("unable to find constructor in java.security.PermissionCollection");
-               cacao_exit(1);
-       }
+       return true;
+}
 
-       pc = builtin_new (classpc);
-       asm_calljavafunction(mid,pc,NULL,NULL,NULL);
 
-       if (*exceptionptr != NULL) {
-               utf_display((*exceptionptr)->vftbl->class->name);
-               printf ("\n");
-               fflush (stdout);        
-               cacao_exit(1);
-       }
+/* native_hashtable_library_add ************************************************
 
-    /* add AllPermission - todo: this should not be the default behaviour */
-       c = class_new(utf_new_char_classname("java/security/AllPermission"));
-       
-       if (!class_load(c) || !class_link(c)) {
-               log_text("unable to find java.security.AllPermission");
-               throw_main_exception_exit();
-       }
+   Adds an entry to the native library hashtable.
 
-       mid = class_resolvemethod(c, 
-                                                         utf_new_char("<init>"), 
-                                                         utf_new_char("()V"));
+*******************************************************************************/
 
-       if (mid == NULL) {
-               log_text("unable to find constructor in java.security.AllPermission");
-               cacao_exit(1);
-       }
+#if !defined(WITH_STATIC_CLASSPATH)
+void native_hashtable_library_add(utf *filename, java_objectheader *loader,
+                                                                 lt_dlhandle handle)
+{
+       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);
 
-       obj = builtin_new (c);
-       asm_calljavafunction(mid,obj,NULL,NULL,NULL);
+       /* normally addresses are aligned to 4, 8 or 16 bytes */
 
-       if (*exceptionptr != NULL) {
-               utf_display((*exceptionptr)->vftbl->class->name);
-               printf ("\n");
-               fflush (stdout);        
-               cacao_exit(1);
-       }
+       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 */
 
-       mid = class_resolvemethod(classpc, 
-                                                         utf_new_char("add"), 
-                                                         utf_new_char("(Ljava/security/Permission;)V"));
+       while (le) {
+               if (le->loader == loader)
+                       break;
 
-       if (mid == NULL) {
-               log_text("unable to find add in java.security.PermissionCollection");
-               cacao_exit(1);
+               le = le->hashlink;                  /* next element in external chain */
        }
 
-       asm_calljavafunction(mid,pc,obj,NULL,NULL);
-       if (*exceptionptr != NULL) {
-               utf_display((*exceptionptr)->vftbl->class->name);
-               printf ("\n");
-               fflush (stdout);        
-               cacao_exit(1);
-       }
+       /* no loader found? create a new entry */
 
-       /* create a new java.security.ProtectionDomain object */ 
-       c = class_new(utf_new_char_classname("java/security/ProtectionDomain"));
-       
-       if (!class_load(c) || !class_link(c)) {
-               log_text("unable to find java.security.ProtectionDomain");
-               throw_main_exception_exit();
-       }
+       if (le == NULL) {
+               le = NEW(hashtable_library_loader_entry);
 
-       mid = class_resolvemethod(c, 
-                                                         utf_new_char("<init>"), 
-                                                         utf_new_char("(Ljava/security/CodeSource;Ljava/security/PermissionCollection;)V"));
+               le->loader   = loader;
+               le->namelink = NULL;
 
-       if (mid == NULL) {
-               log_text("unable to find constructor in java.security.ProtectionDomain");
-               cacao_exit(1);
-       }
-       
-       obj = builtin_new (c);
-       asm_calljavafunction(mid,obj,cs,pc,NULL);
-
-       if (*exceptionptr != NULL) {
-               utf_display((*exceptionptr)->vftbl->class->name);
-               printf ("\n");
-               fflush (stdout);        
-               cacao_exit(1);
-       }
+               /* insert entry into hashtable */
 
-       cpi->pd = (struct java_security_ProtectionDomain*) obj;
-}
+               le->hashlink =
+                       (hashtable_library_loader_entry *) hashtable_library->ptr[slot];
+               hashtable_library->ptr[slot] = le;
 
+               /* update number of hashtable-entries */
 
-/************* use classinfo structure as java.lang.Class object **************/
+               hashtable_library->entries++;
+       }
 
-void use_class_as_object(classinfo *c) 
-{
-       if (!c->classvftbl) {
-               /* is the class loaded */
-               if (!c->loaded)
-                       if (!class_load(c))
-                               panic("Class could not be loaded in use_class_as_object");
-               /* is the class linked */
-               if (!c->linked)
-                       if (!class_link(c))
-                               panic("Class could not be linked in use_class_as_object");
-
-               /*if (class_java_lang_Class ==0) panic("java/lang/Class not loaded in use_class_as_object");
-               if (class_java_lang_Class->vftbl ==0) panic ("vftbl == 0 in use_class_as_object");*/
-               c->header.vftbl = class_java_lang_Class->vftbl;
-               c->classvftbl = true;
-
-
-               /* set a real, java object ProtectionDomain and CodeSource.
-                  Only one ProtectionDomain-object per classpath_info is needed.*/
-               if (c->pd != NULL) { 
-            /* only set ProtectionDomain for non primitive type classes*/
-                       if (((struct classpath_info*)c->pd)->pd == NULL) 
-                               create_ProtectionDomain((struct classpath_info *)c->pd);
-               
-                       c->pd = ((struct classpath_info*)c->pd)->pd;
-               }
-       }
-            
-}
 
+       /* search for library name */
 
-/************************** tables for methods ********************************/
+       ne = le->namelink;
 
-#undef JOWENN_DEBUG
-#undef JOWENN_DEBUG1
+       while (ne) {
+               if (ne->name == filename) {
+                       LOCK_MONITOR_EXIT(hashtable_library->header);
 
-#ifdef STATIC_CLASSPATH
-#define NATIVETABLESIZE  (sizeof(nativetable)/sizeof(struct nativeref))
+                       return;
+               }
 
-/* table for fast string comparison */
-static nativecompref nativecomptable[NATIVETABLESIZE];
+               ne = ne->hashlink;                  /* next element in external chain */
+       }
 
-/* string comparsion table initialized */
-static bool nativecompdone = false;
-#endif
+       /* not found? add the library name to the classloader */
 
+       ne = NEW(hashtable_library_name_entry);
 
-/* XXX don't define this in a header file!!! */
+       ne->name   = filename;
+       ne->handle = handle;
 
-static struct nativeCall nativeCalls[] =
-{
-#include "nativecalls.inc"
-};
+       /* insert entry into external chain */
 
-#define NATIVECALLSSIZE    (sizeof(nativeCalls) / sizeof(struct nativeCall))
+       ne->hashlink = le->namelink;
+       le->namelink = ne;
 
-struct nativeCompCall nativeCompCalls[NATIVECALLSSIZE];
+       LOCK_MONITOR_EXIT(hashtable_library->header);
+}
+#endif /* !defined(WITH_STATIC_CLASSPATH) */
 
 
-/* native_loadclasses **********************************************************
+/* native_hashtable_library_find ***********************************************
 
-   Load classes required for native methods.
+   Find an entry in the native library hashtable.
 
 *******************************************************************************/
 
-bool native_init(void)
+#if !defined(WITH_STATIC_CLASSPATH)
+hashtable_library_name_entry *native_hashtable_library_find(utf *filename,
+                                                                                                                       java_objectheader *loader)
 {
-       static int classesLoaded = 0; /*temporary hack JoWenn*/
-       void *p;
+       hashtable_library_loader_entry *le;
+       hashtable_library_name_entry   *ne; /* library name                       */
+       u4   key;                           /* hashkey                            */
+       u4   slot;                          /* slot in hashtable                  */
 
-       if (classesLoaded)
-               return true;
+       /* normally addresses are aligned to 4, 8 or 16 bytes */
 
-       classesLoaded = 1;
+       key  = ((u4) (ptrint) loader) >> 4;        /* align to 16-byte boundaries */
+       slot = key & (hashtable_library->size - 1);
+       le   = hashtable_library->ptr[slot];
 
-#if !defined(STATIC_CLASSPATH)
-       /* 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;
-#endif
+       /* search external hash chain for the entry */
 
-       /* load classes for wrapping primitive types */
+       while (le) {
+               if (le->loader == loader)
+                       break;
 
-       if (!class_load(class_java_lang_Void) ||
-               !class_link(class_java_lang_Void))
-               return false;
-
-       if (!class_load(class_java_lang_Boolean) ||
-               !class_link(class_java_lang_Boolean))
-               return false;
-
-       if (!class_load(class_java_lang_Byte) ||
-               !class_link(class_java_lang_Byte))
-               return false;
+               le = le->hashlink;                  /* next element in external chain */
+       }
 
-       if (!class_load(class_java_lang_Character) ||
-               !class_link(class_java_lang_Character))
-               return false;
+       /* no loader found? return NULL */
 
-       if (!class_load(class_java_lang_Short) ||
-               !class_link(class_java_lang_Short))
-               return false;
+       if (!le)
+               return NULL;
 
-       if (!class_load(class_java_lang_Integer) ||
-               !class_link(class_java_lang_Integer))
-               return false;
+       /* search for library name */
 
-       if (!class_load(class_java_lang_Long) ||
-               !class_link(class_java_lang_Long))
-               return false;
+       ne = le->namelink;
 
-       if (!class_load(class_java_lang_Float) ||
-               !class_link(class_java_lang_Float))
-               return false;
+       while (ne) {
+               if (ne->name == filename)
+                       return ne;
 
-       if (!class_load(class_java_lang_Double) ||
-               !class_link(class_java_lang_Double))
-               return false;
+               ne = ne->hashlink;                  /* next element in external chain */
+       }
 
-       /* everything's ok */
+       /* return entry, if no entry was found, ne is NULL */
 
-       return true;
+       return ne;
 }
+#endif /* !defined(WITH_STATIC_CLASSPATH) */
 
 
-/*********************** Function: native_findfunction *************************
+/* native_findfunction *********************************************************
 
-       Looks up a method (must have the same class name, method name, descriptor
-       and 'static'ness) and returns a function pointer to it.
-       Returns: function pointer or NULL (if there is no such method)
+   Looks up a method (must have the same class name, method name,
+   descriptor and 'static'ness) and returns a function pointer to it.
+   Returns: function pointer or NULL (if there is no such method)
 
-       Remark: For faster operation, the names/descriptors are converted from C
-               strings to Unicode the first time this function is called.
+   Remark: For faster operation, the names/descriptors are converted
+   from C strings to Unicode the first time this function is called.
 
 *******************************************************************************/
 
-functionptr native_findfunction(utf *cname, utf *mname, 
-                                                               utf *desc, bool isstatic)
+#if defined(WITH_STATIC_CLASSPATH)
+functionptr native_findfunction(utf *cname, utf *mname, utf *desc,
+                                                               bool isstatic)
 {
-#ifdef STATIC_CLASSPATH
-       int i;
        /* entry of table for fast string comparison */
        struct nativecompref *n;
-       /* for warning message if no function is found */
-       char *buffer;                   
-       int buffer_len;
+       s4 i;
 
        isstatic = isstatic ? true : false;
        
@@ -450,136 +522,326 @@ functionptr native_findfunction(utf *cname, utf *mname,
                for (i = 0; i < NATIVETABLESIZE; i++) {
                        nativecomptable[i].classname  = 
                                utf_new_char(nativetable[i].classname);
+
                        nativecomptable[i].methodname = 
                                utf_new_char(nativetable[i].methodname);
-                       nativecomptable[i].descriptor = 
+
+                       nativecomptable[i].descriptor =
                                utf_new_char(nativetable[i].descriptor);
-                       nativecomptable[i].isstatic   = 
-                               nativetable[i].isstatic;
-                       nativecomptable[i].func       = 
-                               nativetable[i].func;
+
+                       nativecomptable[i].isstatic   = nativetable[i].isstatic;
+                       nativecomptable[i].func       = nativetable[i].func;
                }
+
                nativecompdone = true;
        }
 
-#ifdef JOWENN_DEBUG
-       buffer_len = 
-               utf_strlen(cname) + utf_strlen(mname) + utf_strlen(desc) + 64;
-       
-       buffer = MNEW(char, buffer_len);
-
-       strcpy(buffer, "searching matching function in native table:");
-       utf_sprint(buffer+strlen(buffer), mname);
-       strcpy(buffer+strlen(buffer), ": ");
-       utf_sprint(buffer+strlen(buffer), desc);
-       strcpy(buffer+strlen(buffer), " for class ");
-       utf_sprint(buffer+strlen(buffer), cname);
-
-       log_text(buffer);       
-
-       MFREE(buffer, char, buffer_len);
-#endif
-               
        for (i = 0; i < NATIVETABLESIZE; i++) {
                n = &(nativecomptable[i]);
 
                if (cname == n->classname && mname == n->methodname &&
                    desc == n->descriptor && isstatic == n->isstatic)
                        return n->func;
-#ifdef JOWENN_DEBUG
-                       else {
-                               if (cname == n->classname && mname == n->methodname )  log_text("static and descriptor mismatch");
-                       
-                               else {
-                                       buffer_len = 
-                                         utf_strlen(n->classname) + utf_strlen(n->methodname) + utf_strlen(n->descriptor) + 64;
-       
-                                       buffer = MNEW(char, buffer_len);
+       }
 
-                                       strcpy(buffer, "comparing with:");
-                                       utf_sprint(buffer+strlen(buffer), n->methodname);
-                                       strcpy (buffer+strlen(buffer), ": ");
-                                       utf_sprint(buffer+strlen(buffer), n->descriptor);
-                                       strcpy(buffer+strlen(buffer), " for class ");
-                                       utf_sprint(buffer+strlen(buffer), n->classname);
+               
+       /* no function was found, throw exception */
 
-                                       log_text(buffer);       
+       *exceptionptr =
+                       new_exception_utfmessage(string_java_lang_UnsatisfiedLinkError,
+                                                                        mname);
 
-                                       MFREE(buffer, char, buffer_len);
-                               }
-                       } 
-#endif
-       }
+       return NULL;
+}
+#endif /* defined(WITH_STATIC_CLASSPATH) */
 
-               
-       /* no function was found, display warning */
 
-       buffer_len = 
-               utf_strlen(cname) + utf_strlen(mname) + utf_strlen(desc) + 64;
+/* native_make_overloaded_function *********************************************
 
-       buffer = MNEW(char, buffer_len);
+   XXX
 
-       strcpy(buffer, "warning: native function ");
-       utf_sprint(buffer + strlen(buffer), mname);
-       strcpy(buffer + strlen(buffer), ": ");
-       utf_sprint(buffer + strlen(buffer), desc);
-       strcpy(buffer + strlen(buffer), " not found in class ");
-       utf_sprint(buffer + strlen(buffer), cname);
+*******************************************************************************/
 
-       log_text(buffer);       
+#if !defined(WITH_STATIC_CLASSPATH)
+static char *native_make_overloaded_function(char *name, utf *desc)
+{
+       char *newname;
+       s4    namelen;
+       char *utf_ptr;
+       u2    c;
+       s4    i;
+
+       utf_ptr = desc->text;
+       namelen = strlen(name) + strlen("__") + strlen("0");
+
+       /* calculate additional length */
+
+       while ((c = utf_nextu2(&utf_ptr)) != ')') {
+               switch (c) {
+               case 'Z':
+               case 'B':
+               case 'C':
+               case 'S':
+               case 'I':
+               case 'J':
+               case 'F':
+               case 'D':
+                       namelen++;
+                       break;
+               case '[':
+                       namelen += 2;
+                       break;
+               case 'L':
+                       namelen++;
+                       while (utf_nextu2(&utf_ptr) != ';')
+                               namelen++;
+                       namelen += 2;
+                       break;
+               case '(':
+                       break;
+               default:
+                       assert(0);
+               }
+       }
 
-       MFREE(buffer, char, buffer_len);
 
-/*     exit(1); */
+       /* reallocate memory */
+
+       i = strlen(name);
+
+       newname = DMNEW(char, namelen);
+       MCOPY(newname, name, char, i);
+
+       utf_ptr = desc->text;
+
+       newname[i++] = '_';
+       newname[i++] = '_';
+
+       while ((c = utf_nextu2(&utf_ptr)) != ')') {
+               switch (c) {
+               case 'Z':
+               case 'B':
+               case 'C':
+               case 'S':
+               case 'J':
+               case 'I':
+               case 'F':
+               case 'D':
+                       newname[i++] = c;
+                       break;
+               case '[':
+                       newname[i++] = '_';
+                       newname[i++] = '3';
+                       break;
+               case 'L':
+                       newname[i++] = 'L';
+                       while ((c = utf_nextu2(&utf_ptr)) != ';')
+                               if (((c >= 'a') && (c <= 'z')) ||
+                                       ((c >= 'A') && (c <= 'Z')) ||
+                                       ((c >= '0') && (c <= '9')))
+                                       newname[i++] = c;
+                               else
+                                       newname[i++] = '_';
+                       newname[i++] = '_';
+                       newname[i++] = '2';
+                       break;
+               case '(':
+                       break;
+               default:
+                       assert(0);
+               }
+       }
 
-       /* keep compiler happy */
-       return NULL;
-#else
-/* dynamic classpath */
-  return 0;
-#endif
+       /* close string */
+
+       newname[i] = '\0';
+
+       return newname;
 }
 
 
-/****************** function class_findfield_approx ****************************
-       
-       searches in 'classinfo'-structure for a field with the
-       specified name
+/* native_resolve_function *****************************************************
+
+   Resolves a native function, maybe from a dynamic library.
 
 *******************************************************************************/
-fieldinfo *class_findfield_approx(classinfo *c, utf *name)
+
+functionptr native_resolve_function(methodinfo *m)
 {
-       s4 i;
+       lt_ptr                     sym;
+       char                      *name;
+       char                      *newname;
+       s4                         namelen;
+       char                      *utf_ptr;
+       char                      *utf_endptr;
+       s4                         dumpsize;
+       hashtable_library_loader_entry *le;
+       hashtable_library_name_entry   *ne;
+       u4                         key;     /* hashkey                            */
+       u4                         slot;    /* slot in hashtable                  */
+       u4                         i;
+
+
+       /* verbose output */
+
+       if (opt_verbosejni) {
+               printf("[Dynamic-linking native method ");
+               utf_display_printable_ascii_classname(m->class->name);
+               printf(".");
+               utf_display_printable_ascii(m->name);
+               printf(" ... ");
+       }
+               
+       /* calculate length of native function name */
+
+       namelen = strlen("Java_") + utf_get_number_of_u2s(m->class->name) + strlen("_") +
+               utf_get_number_of_u2s(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++;
+
+       /* 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++;
 
-       for (i = 0; i < c->fieldscount; i++) {
-               /* compare field names */
-               if ((c->fields[i].name == name))
-                       return &(c->fields[i]);
+       /* allocate memory */
+
+       dumpsize = dump_size();
+
+       name = DMNEW(char, namelen);
+
+
+       /* generate name of native functions */
+
+       strcpy(name, "Java_");
+       i = strlen("Java_");
+
+       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] = '_';
        }
 
-       /* field was not found, raise exception */      
-       *exceptionptr = new_exception(string_java_lang_NoSuchFieldException);
+       /* seperator between class and method */
 
-       return NULL;
-}
+       name[i++] = '_';
 
+       utf_ptr = m->name->text;
+       utf_endptr = UTF_END(m->name);
 
-s4 class_findfield_index_approx(classinfo *c, utf *name)
-{
-       s4 i;
+       for (; utf_ptr < utf_endptr; utf_ptr++, i++) {
+               name[i] = *utf_ptr;
+
+               /* escape sequence for '_' is '_1' */
+
+               if (name[i] == '_')
+                       name[++i] = '1';
+       }
 
-       for (i = 0; i < c->fieldscount; i++) {
-               /* compare field names */
-               if ((c->fields[i].name == name))
-                       return i;
+       /* close string */
+
+       name[i] = '\0';
+
+
+       /* 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  */
+
+       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 & (hashtable_library->size - 1);
+       le   = hashtable_library->ptr[slot];
+
+       /* iterate through loaders in this hash slot */
+
+       while ((le != NULL) && (sym == NULL)) {
+               /* iterate through names in this loader */
+
+               ne = le->namelink;
+                       
+               while ((ne != NULL) && (sym == NULL)) {
+                       sym = lt_dlsym(ne->handle, name);
+
+                       if (sym == NULL)
+                               sym = lt_dlsym(ne->handle, newname);
+
+                       ne = ne->hashlink;
+               }
+
+               le = le->hashlink;
        }
 
-       /* field was not found, raise exception */      
-       *exceptionptr = new_exception(string_java_lang_NoSuchFieldException);
+       if (sym != NULL)
+               if (opt_verbosejni)
+                       printf("JNI ]\n");
+
+
+       /* If not found, try to find the native function symbol in the
+          main program. */
 
-       return -1;
+       if (sym == NULL) {
+               sym = lt_dlsym(mainhandle, name);
+
+               if (sym == NULL)
+                       sym = lt_dlsym(mainhandle, newname);
+
+               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 == NULL) {
+               if (opt_verbosejni)
+                       printf("failed ]\n");
+
+               *exceptionptr =
+                       new_exception_utfmessage(string_java_lang_UnsatisfiedLinkError,
+                                                                        m->name);
+       }
+
+       /* release memory */
+
+       dump_release(dumpsize);
+
+       return (functionptr) (ptrint) sym;
 }
+#endif /* !defined(WITH_STATIC_CLASSPATH) */
 
 
 /* native_new_and_init *********************************************************
@@ -604,18 +866,19 @@ java_objectheader *native_new_and_init(classinfo *c)
        if (!o)
                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)
                return o;
 
        /* call initializer */
 
-       asm_calljavafunction(m, o, NULL, NULL, NULL);
+       (void) vm_call_method(m, o);
 
        return o;
 }
@@ -651,7 +914,7 @@ java_objectheader *native_new_and_init_string(classinfo *c, java_lang_String *s)
 
        /* call initializer */
 
-       asm_calljavafunction(m, o, s, NULL, NULL);
+       (void) vm_call_method(m, o, s);
 
        return o;
 }
@@ -683,7 +946,7 @@ java_objectheader *native_new_and_init_int(classinfo *c, s4 i)
 
        /* call initializer */
 
-       asm_calljavafunction(m, o, (void *) (ptrint) i, NULL, NULL);
+       (void) vm_call_method(m, o, i);
 
        return o;
 }
@@ -715,453 +978,109 @@ java_objectheader *native_new_and_init_throwable(classinfo *c, java_lang_Throwab
 
        /* 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
-}
-
-
-/******************************************************************************************                                                                                                            
-
-       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)
-{
-    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;
-
-                       nomatch:
-                               ;
-                       }
-
-                       /* no primitive type and no arrayclass, so must be object */
-                       *pos++ = 'L';
-
-                       /* copy text */
-                       for (utf_ptr--; utf_ptr < utf_end(c->name); utf_ptr++) {
-                               *pos++ = *utf_ptr;
-                       }
-
-                       *pos++ = ';';
-
-               next_type:
-                       ;
-               }  
-    }      
-
-    *pos++ = ')';
-
-    if (retType) {
-               for (i = 0; i < strlen(retType); i++) {
-                       *pos++ = retType[i];
-               }
-    }
-
-    /* create utf-string */
-    result = utf_new(buffer, (pos - buffer));
-    MFREE(buffer, char, buffer_size);
-
-    return result;
-}
-
-
-/******************************************************************************************
-
-       retrieve the next argument or returntype from a descriptor
-       and return the corresponding class 
-
-*******************************************************************************************/
-
-classinfo *get_type(char **utf_ptr,char *desc_end, bool skip)
-{
-    classinfo *c = class_from_descriptor(*utf_ptr,desc_end,utf_ptr,
-                                         (skip) ? CLASSLOAD_SKIP : CLASSLOAD_LOAD);
-    if (!c)
-       /* unknown type */
-       panic("illegal descriptor");
-
-    if (skip) return NULL;
-
-    use_class_as_object(c);
-    return c;
-}
-
-
-/* get_parametertypes **********************************************************
-
-   use the descriptor of a method to generate a java/lang/Class array
-   which contains the classes of the parametertypes of the method
-
-*******************************************************************************/
-
-java_objectarray* get_parametertypes(methodinfo *m) 
-{
-    utf  *descr    =  m->descriptor;    /* method-descriptor */ 
-    char *utf_ptr  =  descr->text;      /* current position in utf-text */
-    char *desc_end =  utf_end(descr);   /* points behind utf string     */
-    java_objectarray* result;
-    int parametercount = 0;
-    int i;
-
-    /* skip '(' */
-    utf_nextu2(&utf_ptr);
-  
-    /* determine number of parameters */
-    while (*utf_ptr != ')') {
-       get_type(&utf_ptr, desc_end, true);
-               parametercount++;
-    }
-
-    /* create class-array */
-    result = builtin_anewarray(parametercount, class_java_lang_Class);
-
-    utf_ptr = descr->text;
-    utf_nextu2(&utf_ptr);
-
-    /* get returntype classes */
-    for (i = 0; i < parametercount; i++)
-           result->data[i] =
-                       (java_objectheader *) get_type(&utf_ptr, desc_end, false);
-
-    return result;
-}
-
-
-/* get_exceptiontypes **********************************************************
+/* native_get_parametertypes ***************************************************
 
-   get the exceptions which can be thrown by a method
+   Use the descriptor of a method to generate a java/lang/Class array
+   which contains the classes of the parametertypes of the method.
 
 *******************************************************************************/
 
-java_objectarray* get_exceptiontypes(methodinfo *m)
+java_objectarray *native_get_parametertypes(methodinfo *m)
 {
-    u2 excount;
-    u2 i;
-    java_objectarray *result;
-
-       excount = m->thrownexceptionscount;
+       methoddesc       *md;
+       typedesc         *paramtypes;
+       s4                paramcount;
+    java_objectarray *oa;
+       s4                i;
 
-    /* create class-array */
-    result = builtin_anewarray(excount, class_java_lang_Class);
-
-    for (i = 0; i < excount; i++) {
-               java_objectheader *o = (java_objectheader *) (m->thrownexceptions[i]);
-               use_class_as_object((classinfo *) o);
-               result->data[i] = o;
-    }
-
-    return result;
-}
+       md = m->parseddesc;
 
+       /* is the descriptor fully parsed? */
 
+       if (!m->parseddesc->params)
+               if (!descriptor_params_from_paramtypes(md, m->flags))
+                       return NULL;
 
+       paramtypes = md->paramtypes;
+       paramcount = md->paramcount;
 
+       /* skip `this' pointer */
 
-/******************************************************************************************
+       if (!(m->flags & ACC_STATIC)) {
+               paramtypes++;
+               paramcount--;
+       }
 
-       get the returntype class of a method
+       /* create class-array */
 
-*******************************************************************************************/
+       oa = builtin_anewarray(paramcount, class_java_lang_Class);
 
-classinfo *get_returntype(methodinfo *m) 
-{
-       char *utf_ptr;   /* current position in utf-text */
-       char *desc_end;  /* points behind utf string     */
-        utf *desc = m->descriptor; /* method-descriptor  */
+       if (!oa)
+               return NULL;
 
-       utf_ptr  = desc->text;
-       desc_end = utf_end(desc);
+    /* get classes */
 
-       /* ignore parametertypes */
-        while ((utf_ptr<desc_end) && utf_nextu2(&utf_ptr)!=')')
-               /* skip */ ;
+       for (i = 0; i < paramcount; i++)
+               if (!resolve_class_from_typedesc(&paramtypes[i], true, false,
+                                                                                (classinfo **) &oa->data[i]))
+                       return NULL;
 
-       return get_type(&utf_ptr,desc_end, false);
+       return oa;
 }
 
 
-/*****************************************************************************/
-/*****************************************************************************/
-
-
-/*--------------------------------------------------------*/
-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);
-}
+/* native_get_exceptiontypes ***************************************************
 
-/*--------------------------------------------------------*/
-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);
-}
+   Get the exceptions which can be thrown by a method.
 
+*******************************************************************************/
 
-/*--------------------------------------------------------*/
-classMeth findNativeMethodCalls(utf *c, utf *m, utf *d ) 
+java_objectarray *native_get_exceptiontypes(methodinfo *m)
 {
-    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;
-          }
-      }
-    }
-}
-
+       java_objectarray *oa;
+       classinfo        *c;
+       u2                i;
 
+       /* create class-array */
 
-/*--------------------------------------------------------*/
+       oa = builtin_anewarray(m->thrownexceptionscount, class_java_lang_Class);
 
-bool natcall2utf(bool natcallcompdone) {
-int i;
+       if (!oa)
+               return NULL;
 
-if (natcallcompdone) 
-       return true;
+       for (i = 0; i < m->thrownexceptionscount; i++) {
+               if (!resolve_classref_or_classinfo(NULL, m->thrownexceptions[i],
+                                                                                  resolveEager, true, false, &c))
+                       return NULL;
 
-for (i=0;i<NATIVECALLSSIZE; i++) {
-   utfNativeCall  (nativeCalls[i], &nativeCompCalls[i]);  
-   }
+               oa->data[i] = (java_objectheader *) c;
+       }
 
-return true;
+       return oa;
 }
 
-/*--------------------------------------------------------*/
-
-
-java_objectarray *builtin_asm_createclasscontextarray(classinfo **end, classinfo **start)
-{
-#if defined(__GNUC__)
-#warning platform dependend
-#endif
-       java_objectarray *tmpArray;
-       int i;
-       classinfo **current;
-       classinfo *c;
-       size_t size;
-
-       size = (((size_t) start) - ((size_t) end)) / sizeof(classinfo*);
-
-       /*printf("end %p, start %p, size %ld\n",end,start,size);*/
-       if (!class_java_lang_Class)
-               class_java_lang_Class = class_new(utf_new_char("java/lang/Class"));
-
-       if (!class_java_lang_SecurityManager)
-               class_java_lang_SecurityManager =
-                       class_new(utf_new_char("java/lang/SecurityManager"));
 
-       if (size > 0) {
-               if (start == class_java_lang_SecurityManager) {
-                       size--;
-                       start--;
-               }
-       }
+/* native_get_returntype *******************************************************
 
-       tmpArray =
-               builtin_newarray(size, class_array_of(class_java_lang_Class)->vftbl);
-
-       for(i = 0, current = start; i < size; i++, current--) {
-               c = *current;
-               /*              printf("%d\n",i);
-                utf_display(c->name);*/
-               use_class_as_object(c);
-               tmpArray->data[i] = (java_objectheader *) c;
-       }
-
-       return tmpArray;
-}
+   Get the returntype class of a method.
 
+*******************************************************************************/
 
-java_lang_ClassLoader *builtin_asm_getclassloader(classinfo **end, classinfo **start)
+classinfo *native_get_returntype(methodinfo *m)
 {
-#if defined(__GNUC__)
-#warning platform dependend
-#endif
-       int i;
-       classinfo **current;
        classinfo *c;
-       classinfo *privilegedAction;
-       size_t size;
-
-       size = (((size_t) start) - ((size_t) end)) / sizeof(classinfo*);
-
-       /*      log_text("builtin_asm_getclassloader");
-        printf("end %p, start %p, size %ld\n",end,start,size);*/
-
-       if (!class_java_lang_SecurityManager)
-               class_java_lang_SecurityManager =
-                       class_new(utf_new_char("java/lang/SecurityManager"));
-
-       if (size > 0) {
-               if (start == class_java_lang_SecurityManager) {
-                       size--;
-                       start--;
-               }
-       }
-
-       privilegedAction=class_new(utf_new_char("java/security/PrivilegedAction"));
 
-       for(i = 0, current = start; i < size; i++, current--) {
-               c = *current;
-
-               if (c == privilegedAction)
-                       return NULL;
-
-               if (c->classloader)
-                       return (java_lang_ClassLoader *) c->classloader;
-       }
-
-       return NULL;
-
-       /*
-        log_text("Java_java_lang_VMSecurityManager_currentClassLoader");
-        init_systemclassloader();
+       if (!resolve_class_from_typedesc(&(m->parseddesc->returntype), true, false,
+                                                                        &c))
+               return NULL;
 
-        return SystemClassLoader;*/
+       return c;
 }