Safety first.
[cacao.git] / native.c
index a06724a7d16dffed725af7cb4f8468fcbd4096d5..a4452afe7b3f0ce8cb28d506e57fc9799aab906e 100644 (file)
--- a/native.c
+++ b/native.c
    The .hh files created with the header file generator are all
    included here as are the C functions implementing these methods.
 
-   $Id: native.c 664 2003-11-21 18:24:01Z jowenn $
+   $Id: native.c 862 2004-01-06 23:42:01Z stefan $
 
 */
 
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <time.h>
 #include <assert.h>
 #include <sys/time.h>
 #include <utime.h>
-#include <sys/utsname.h>
 
 #include "config.h"
 #include "global.h"
+#include "jni.h"
 #include "native.h"
 #include "nativetypes.hh"
 #include "builtin.h"
 #include "asmpart.h"
 #include "tables.h"
 #include "loader.h"
+#include "jni.h"
 #include "toolbox/loging.h"
+#include "toolbox/memory.h"
 #include "threads/thread.h"
 #include "threads/threadio.h"
 #include "threads/locks.h"
 #endif
 #include <sys/stat.h>
 
-#include "../threads/threadio.h"                    
+#include "threads/threadio.h"
 
 /* searchpath for classfiles */
-static char *classpath;
+char *classpath;
 
 /* for java-string to char conversion */
 #define MAXSTRINGSIZE 1000                          
 
 /******************** systemclasses required for native methods ***************/
 
-static classinfo *class_java_lang_Class;
-static classinfo *class_java_lang_VMClass;
-static methodinfo *method_vmclass_init;
+classinfo *class_java_lang_Class;
+classinfo *class_java_lang_VMClass;
+methodinfo *method_vmclass_init;
 /* static classinfo *class_java_lang_Cloneable=0; */ /* now in global.h */
-static classinfo *class_java_lang_CloneNotSupportedException;
-static classinfo *class_java_lang_System;
-static classinfo *class_java_lang_ClassLoader;
-static classinfo *class_java_lang_ClassNotFoundException;
-static classinfo *class_java_lang_InstantiationException;
-static classinfo *class_java_lang_NoSuchMethodError;   
-static classinfo *class_java_lang_NoSuchFieldError;
-static classinfo *class_java_lang_ClassFormatError;
-static classinfo *class_java_lang_IllegalArgumentException;
-static classinfo *class_java_lang_ArrayIndexOutOfBoundsException;
-static classinfo *class_java_lang_NoSuchFieldException;
-static classinfo *class_java_io_SyncFailedException;
-static classinfo *class_java_io_IOException;
-static classinfo *class_java_io_FileNotFoundException;
-static classinfo *class_java_io_UnixFileSystem;
-static classinfo *class_java_security_PrivilegedActionException;
-static classinfo *class_java_net_UnknownHostException;
-static classinfo *class_java_net_SocketException;
-static classinfo *class_java_lang_NoSuchMethodException;
-static classinfo *class_java_lang_Double;
-static classinfo *class_java_lang_Float;
-static classinfo *class_java_lang_Long;
-static classinfo *class_java_lang_Byte;
-static classinfo *class_java_lang_Short;
-static classinfo *class_java_lang_Boolean;
-static classinfo *class_java_lang_Void;
-static classinfo *class_java_lang_Character;
-static classinfo *class_java_lang_Integer;
+classinfo *class_java_lang_CloneNotSupportedException;
+classinfo *class_java_lang_System;
+classinfo *class_java_lang_ClassLoader;
+classinfo *class_java_lang_NoClassDefFoundError;
+classinfo *class_java_lang_ClassNotFoundException;
+classinfo *class_java_lang_LinkageError;
+classinfo *class_java_lang_InstantiationException;
+classinfo *class_java_lang_NoSuchMethodError;   
+classinfo *class_java_lang_NoSuchFieldError;
+classinfo *class_java_lang_ClassFormatError;
+classinfo *class_java_lang_IllegalArgumentException;
+classinfo *class_java_lang_ArrayIndexOutOfBoundsException;
+classinfo *class_java_lang_NoSuchFieldException;
+classinfo *class_java_io_SyncFailedException;
+classinfo *class_java_io_IOException;
+classinfo *class_java_io_FileNotFoundException;
+classinfo *class_java_io_UnixFileSystem;
+classinfo *class_java_security_PrivilegedActionException;
+classinfo *class_java_net_UnknownHostException;
+classinfo *class_java_net_SocketException;
+classinfo *class_java_lang_NoSuchMethodException;
+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;
 
 /* the system classloader object */
 struct java_lang_ClassLoader *SystemClassLoader = NULL;
 
 /* for raising exceptions from native methods */
-java_objectheader* exceptionptr = NULL;
+THREADSPECIFIC java_objectheader* _exceptionptr = NULL;
 
 /************* use classinfo structure as java.lang.Class object **************/
 
 void use_class_as_object(classinfo *c) 
 {
-        if (!class_java_lang_Class)
-                class_java_lang_Class =
-                        class_new ( utf_new_char ("java/lang/Class") );
-        vftbl *vt = class_java_lang_Class->vftbl;
-        vftbl *newtbl;
-        if (!c->classvftbl) {
-                c->classvftbl = true;
-                copy_vftbl(&newtbl, vt);
-                newtbl->class = c->header.vftbl->class;
-                newtbl->baseval = c->header.vftbl->baseval;
-                newtbl->diffval = c->header.vftbl->diffval;
-                c->header.vftbl = newtbl;
-        }
+       vftbl *vt;
+/*     vftbl *newtbl; */
+
+       if (!class_java_lang_Class)
+               class_java_lang_Class = class_new(utf_new_char ("java/lang/Class"));
+
+       vt = class_java_lang_Class->vftbl;
+
+
+       if (!c->classvftbl) {
+               c->classvftbl = true;
+
+               /*                copy_vftbl(&newtbl, vt);
+                                                 newtbl->class = c->header.vftbl->class;
+                                                 newtbl->baseval = c->header.vftbl->baseval;
+                                                 newtbl->diffval = c->header.vftbl->diffval;
+                                                 c->header.vftbl = newtbl;*/
+               
+               c->header.vftbl = class_java_lang_Class->vftbl;
         
-       if (!class_java_lang_VMClass) {
-               class_java_lang_VMClass =
-                                class_new ( utf_new_char("java/lang/VMClass"));
-                method_vmclass_init = 
-                               class_findmethod(class_java_lang_VMClass,utf_new_char("<init>"),
-                                       utf_new_char("(Lgnu/classpath/RawData;)V"));
-                if (method_vmclass_init==0) {
-                       class_showmethods(class_java_lang_VMClass);
-                        panic("Needed class initializer for VMClass could not be found");
-                }
-        }
-        {
-                java_objectheader *vmo = builtin_new (class_java_lang_VMClass);
-                asm_calljavamethod (method_vmclass_init, vmo, c, NULL, NULL);
-                c->vmClass=(java_lang_VMClass*)vmo;
-        }
-}
+               if (!class_java_lang_VMClass) {
+                       loader_load_sysclass(&class_java_lang_VMClass,
+                                                                utf_new_char("java/lang/VMClass"));
+
+                       method_vmclass_init =
+                               class_findmethod(class_java_lang_VMClass,
+                                                                utf_new_char("<init>"),
+                                                                utf_new_char("(Lgnu/classpath/RawData;)V"));
+
+                       if (method_vmclass_init == 0) {
+                               class_showmethods(class_java_lang_VMClass);
+                               panic("Needed class initializer for VMClass could not be found");
+                       }
+               }
+               {     
+                       java_objectheader *vmo = builtin_new(class_java_lang_VMClass);
 
-/*********************** include Java Native Interface ************************/ 
+                       if (!vmo) panic("Error while creating instance of java/lang/VMClass");
+                       asm_calljavafunction(method_vmclass_init, vmo, c, NULL, NULL);
+                       c->vmClass = (java_lang_VMClass *) vmo;
+                       /*log_text("VMCLASS has been attached");*/
+               }
+       }
+}
 
-#include "jni.c"
 
 /*************************** include native methods ***************************/ 
 
-#include "nat/Runtime.c"
-#include "nat/Thread.c"
-#include "nat/VMClass.c"
-#include "nat/Method.c"
-#include "nat/VMSecurityManager.c"
-#include "nat/VMClassLoader.c"
-#include "nat/VMObject.c"
-#include "nat/Proxy.c"
-#include "nat/Field.c"
-#include "nat/VMSystem.c"
-#include "nat/Constructor.c"
-#include "nat/FileChannelImpl.c"
-#include "nat/VMObjectStreamClass.c"
-#include "nat/JOWENNTest1.c"
-
 #ifdef USE_GTK 
 #include "nat/GdkGraphics.c"
 #include "nat/GtkComponentPeer.c"
@@ -182,6 +182,8 @@ void use_class_as_object(classinfo *c)
 #include "nat/GtkFileDialogPeer.c"
 #include "nat/GtkLabelPeer.c"
 #endif
+
+
 /************************** tables for methods ********************************/
 
 #undef JOWENN_DEBUG
@@ -229,6 +231,31 @@ static bool nativecompdone = false;
 
 
 
+/* throw some loader exceptions */
+
+void throw_noclassdeffounderror_message(utf* classname)
+{
+       if (!class_java_lang_NoClassDefFoundError) {
+               panic("java.lang.NoClassDefFoundError not found. Maybe wrong classpath?");
+       }
+
+       /* throws a NoClassDefFoundError with message */
+       *exceptionptr = native_new_and_init_string(class_java_lang_NoClassDefFoundError,
+                                                                                         javastring_new(classname));
+}
+
+
+void throw_linkageerror_message(utf* classname)
+{
+       if (!class_java_lang_LinkageError) {
+               panic("java.lang.LinkageError not found. Maybe wrong classpath?");
+       }
+
+       /* throws a LinkageError with message */
+       *exceptionptr = native_new_and_init_string(class_java_lang_LinkageError,
+                                                                                         javastring_new(classname));
+}
+
 
 /*********************** function: native_loadclasses **************************
 
@@ -240,29 +267,34 @@ void native_loadclasses()
 {
        static int classesLoaded=0; /*temporary hack JoWenn*/
        if (classesLoaded) return;
-       classesLoaded=1;
+       classesLoaded = 1;
 /*     log_text("loadclasses entered");*/
 
 
        /*class_java_lang_System =*/
-               (void)class_new ( utf_new_char ("java/lang/VMClass") );/*JoWenn*/
-               (void)class_new ( utf_new_char ("java/lang/Class") );/*JoWenn*/
+       (void) class_new(utf_new_char("java/lang/VMClass"));/*JoWenn*/
+       (void) class_new(utf_new_char("java/lang/Class"));/*JoWenn*/
+
        /* class_new adds the class to the list of classes to be loaded */
        if (!class_java_lang_Cloneable)
                class_java_lang_Cloneable = 
-                       class_new ( utf_new_char ("java/lang/Cloneable") );
+                       class_new(utf_new_char("java/lang/Cloneable"));
 /*     log_text("loadclasses: class_java_lang_Cloneable has been initialized");*/
        class_java_lang_CloneNotSupportedException = 
-               class_new ( utf_new_char ("java/lang/CloneNotSupportedException") );
+               class_new(utf_new_char("java/lang/CloneNotSupportedException"));
        if (!class_java_lang_Class)
                class_java_lang_Class =
-                       class_new ( utf_new_char ("java/lang/Class") );
+                       class_new(utf_new_char("java/lang/Class"));
        class_java_io_IOException = 
                class_new(utf_new_char("java/io/IOException"));
        class_java_io_FileNotFoundException = 
                class_new(utf_new_char("java/io/FileNotFoundException"));
+       class_java_lang_NoClassDefFoundError =
+               class_new(utf_new_char("java/lang/NoClassDefFoundError"));
        class_java_lang_ClassNotFoundException =
                class_new(utf_new_char("java/lang/ClassNotFoundException"));
+       class_java_lang_LinkageError =
+               class_new(utf_new_char("java/lang/LinkageError"));
        class_java_lang_InstantiationException =
                class_new(utf_new_char("java/lang/InstantiationException"));
        class_java_lang_NoSuchMethodError =
@@ -272,19 +304,19 @@ void native_loadclasses()
        class_java_lang_ClassFormatError =
                class_new(utf_new_char("java/lang/ClassFormatError"));  
        class_java_io_SyncFailedException =
-               class_new ( utf_new_char ("java/io/SyncFailedException") );
+               class_new(utf_new_char("java/io/SyncFailedException"));
                
 /*     log_text("native_loadclasses: class_new(\"java/lang/ClassLoader\")");           */
        class_java_lang_ClassLoader =
-               class_new ( utf_new_char ("java/lang/ClassLoader") );   
+               class_new(utf_new_char("java/lang/ClassLoader"));       
 /*     log_text("native_loadclasses: class_new(\"java/security/PrivilegedActionException\")");         */
        class_java_security_PrivilegedActionException =
                class_new(utf_new_char("java/security/PrivilegedActionException"));
 
-       class_java_net_UnknownHostException = 
-               loader_load(utf_new_char("java/net/UnknownHostException"));
-       class_java_net_SocketException = 
-               loader_load(utf_new_char("java/net/SocketException"));
+       loader_load_sysclass(&class_java_net_UnknownHostException,
+                                                utf_new_char("java/net/UnknownHostException"));
+       loader_load_sysclass(&class_java_net_SocketException,
+                                                utf_new_char("java/net/SocketException"));
 
        class_java_lang_IllegalArgumentException =
                class_new(utf_new_char("java/lang/IllegalArgumentException"));
@@ -296,37 +328,19 @@ void native_loadclasses()
                class_new(utf_new_char("java/lang/NoSuchMethodException"));
 
        /* load classes for wrapping primitive types */
-       class_java_lang_Double =
-               class_new( utf_new_char ("java/lang/Double") );
+       class_java_lang_Double    = class_new(utf_new_char("java/lang/Double"));
        class_init(class_java_lang_Double);
 
-       class_java_lang_Float =
-               class_new(utf_new_char("java/lang/Float"));
-       class_java_lang_Character =
-               class_new(utf_new_char("java/lang/Character"));
-       class_java_lang_Integer =
-               class_new(utf_new_char("java/lang/Integer"));
-       class_java_lang_Long =
-               class_new(utf_new_char("java/lang/Long"));
-       class_java_lang_Byte =
-               class_new(utf_new_char("java/lang/Byte"));
-       class_java_lang_Short =
-               class_new(utf_new_char("java/lang/Short"));
-       class_java_lang_Boolean =
-               class_new(utf_new_char("java/lang/Boolean"));
-       class_java_lang_Void =
-               class_new(utf_new_char("java/lang/Void"));
-
-       /* load to avoid dynamic classloading */
-/*JoWenn       class_new(utf_new_char("sun/net/www/protocol/file/Handler"));
-       class_new(utf_new_char("sun/net/www/protocol/jar/Handler"));    
-       class_new(utf_new_char("sun/io/CharToByteISO8859_1"));*/
-       
-       /* start classloader */
-/*JoWenn       loader_load(utf_new_char("sun/io/ByteToCharISO8859_1")); */
+       class_java_lang_Float     = class_new(utf_new_char("java/lang/Float"));
+       class_java_lang_Character =     class_new(utf_new_char("java/lang/Character"));
+       class_java_lang_Integer   = class_new(utf_new_char("java/lang/Integer"));
+       class_java_lang_Long      = class_new(utf_new_char("java/lang/Long"));
+       class_java_lang_Byte      = class_new(utf_new_char("java/lang/Byte"));
+       class_java_lang_Short     = class_new(utf_new_char("java/lang/Short"));
+       class_java_lang_Boolean   = class_new(utf_new_char("java/lang/Boolean"));
+       class_java_lang_Void      = class_new(utf_new_char("java/lang/Void"));
 
-       classesLoaded=1;
-       log_text("native_loadclasses finished");
+       classesLoaded = 1;
 }
 
 
@@ -337,26 +351,27 @@ void systemclassloader_addclass(classinfo *c)
        methodinfo *m;
 
        /* find method addClass of java.lang.ClassLoader */
-       m = class_resolvemethod(
-                                                       class_java_lang_ClassLoader, 
+       m = class_resolvemethod(class_java_lang_ClassLoader,
                                                        utf_new_char("addClass"),
                                                        utf_new_char("(Ljava/lang/Class;)")
                                                        );
        
-       if (!m) panic("warning: cannot initialize classloader");
+       if (!m)
+               panic("warning: cannot initialize classloader");
 
        /* prepare class to be passed as argument */
        use_class_as_object (c);
 
        /* call 'addClass' */
-       asm_calljavamethod(m,
-                                          (java_objectheader*) SystemClassLoader, 
-                                          (java_objectheader*) c,
-                                          NULL,  
-                                          NULL
-                                          );
+       asm_calljavafunction(m,
+                                                (java_objectheader*) SystemClassLoader, 
+                                                (java_objectheader*) c,
+                                                NULL,  
+                                                NULL
+                                                );
 }
 
+
 /*************** adds a library to the vector of loaded libraries *************/
 
 void systemclassloader_addlibrary(java_objectheader *o)
@@ -364,6 +379,7 @@ void systemclassloader_addlibrary(java_objectheader *o)
        log_text("systemclassloader_addlibrary");
 }
 
+
 /*****************************************************************************
 
        create systemclassloader object and initialize instance fields  
@@ -372,18 +388,17 @@ void systemclassloader_addlibrary(java_objectheader *o)
 
 void init_systemclassloader() 
 {
-  if (!SystemClassLoader) {
-       native_loadclasses();
-       log_text("Initializing new system class loader");
-       /* create object and call initializer */
-       SystemClassLoader = (java_lang_ClassLoader*) native_new_and_init(class_java_lang_ClassLoader);  
-       heap_addreference((void**) &SystemClassLoader);
-
-       /* systemclassloader has no parent */
-       SystemClassLoader->parent      = NULL;
-       SystemClassLoader->initialized = true;
-  }
-  log_text("leaving system class loader");
+       if (!SystemClassLoader) {
+               native_loadclasses();
+               log_text("Initializing new system class loader");
+               /* create object and call initializer */
+               SystemClassLoader = (java_lang_ClassLoader*) native_new_and_init(class_java_lang_ClassLoader);  
+
+               /* systemclassloader has no parent */
+               SystemClassLoader->parent      = NULL;
+               SystemClassLoader->initialized = true;
+       }
+       log_text("leaving system class loader");
 }
 
 
@@ -394,63 +409,35 @@ void systemclassloader_addlibname(java_objectheader *o)
        methodinfo *m;
        jfieldID id;
 
-       m = class_resolvemethod(loader_load(utf_new_char ("java/util/Vector")),
+       m = class_resolvemethod(loader_load_sysclass(NULL, utf_new_char ("java/util/Vector")),
                                                        utf_new_char("addElement"),
-                                                       utf_new_char("(Ljava/lang/Object;)V")
-                                                       );
+                                                       utf_new_char("(Ljava/lang/Object;)V"));
 
        if (!m) panic("cannot initialize classloader");
 
-       id = envTable.GetStaticFieldID(&env,class_java_lang_ClassLoader,"loadedLibraryNames","Ljava/util/Vector;");
+       id = envTable.GetStaticFieldID(&env,
+                                                                  class_java_lang_ClassLoader,
+                                                                  "loadedLibraryNames",
+                                                                  "Ljava/util/Vector;");
+
        if (!id) panic("can not access ClassLoader");
 
-       asm_calljavamethod(m,
-                                          GetStaticObjectField(&env,class_java_lang_ClassLoader,id),
-                                          o,
-                                          NULL,  
-                                          NULL
-                                          );       
+       asm_calljavafunction(m,
+                                                envTable.GetStaticObjectField(&env, class_java_lang_ClassLoader, id),
+                                                o,
+                                                NULL,  
+                                                NULL);
 }
 
 
 /********************* function: native_setclasspath **************************/
  
-void native_setclasspath (char *path)
+void native_setclasspath(char *path)
 {
        /* set searchpath for classfiles */
        classpath = path;
 }
 
-/***************** function: throw_classnotfoundexception *********************/
-
-void throw_classnotfoundexception()
-{
-    if (!class_java_lang_ClassNotFoundException) {
-        panic("java.lang.ClassNotFoundException not found. Maybe wrong classpath?");
-    }
-
-       /* throws a ClassNotFoundException */
-       exceptionptr = native_new_and_init (class_java_lang_ClassNotFoundException);
-}
-
-
-void throw_classnotfoundexception2(utf* classname)
-{
-       if (!class_java_lang_ClassNotFoundException) {
-               panic("java.lang.ClassNotFoundException not found. Maybe wrong classpath?");
-       }
-
-       /* throws a ClassNotFoundException */
-       exceptionptr = native_new_and_init (class_java_lang_ClassNotFoundException);
-
-        /*
-        sprintf (logtext, "Loading class: ");
-        utf_sprint (logtext+strlen(logtext), classname);
-        dolog();
-        log_text("Class not found");
-        */
-}
-
 
 /*********************** Function: native_findfunction *************************
 
@@ -493,16 +480,16 @@ functionptr native_findfunction(utf *cname, utf *mname,
 
 #ifdef JOWENN_DEBUG
        buffer_len = 
-         utf_strlen(cname) + utf_strlen(mname) + utf_strlen(desc) + 64;
+               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);
+       utf_sprint(buffer+strlen(buffer), mname);
        strcpy(buffer+strlen(buffer), ": ");
-        utf_sprint(buffer+strlen(buffer), desc);
+       utf_sprint(buffer+strlen(buffer), desc);
        strcpy(buffer+strlen(buffer), " for class ");
-        utf_sprint(buffer+strlen(buffer), cname);
+       utf_sprint(buffer+strlen(buffer), cname);
 
        log_text(buffer);       
 
@@ -526,16 +513,15 @@ functionptr native_findfunction(utf *cname, utf *mname,
                                        buffer = MNEW(char, buffer_len);
 
                                        strcpy(buffer, "comparing with:");
-                                       utf_sprint(buffer+strlen(buffer), n->methodname);
+                                       utf_sprint(buffer+strlen(buffer), n->methodname);
                                        strcpy (buffer+strlen(buffer), ": ");
-                                       utf_sprint(buffer+strlen(buffer), n->descriptor);
+                                       utf_sprint(buffer+strlen(buffer), n->descriptor);
                                        strcpy(buffer+strlen(buffer), " for class ");
-                                       utf_sprint(buffer+strlen(buffer), n->classname);
+                                       utf_sprint(buffer+strlen(buffer), n->classname);
 
                                        log_text(buffer);       
 
                                        MFREE(buffer, char, buffer_len);
-                       
                                }
                        } 
 #endif
@@ -560,10 +546,9 @@ functionptr native_findfunction(utf *cname, utf *mname,
 
        MFREE(buffer, char, buffer_len);
 
-
        exit(1);
 
-       
+       /* keep compiler happy */
        return NULL;
 }
 
@@ -577,7 +562,8 @@ functionptr native_findfunction(utf *cname, utf *mname,
 
 *******************************************************************************/
 
-java_objectheader *javastring_new (utf *u)
+/*  java_objectheader *javastring_new(utf *u) */
+java_lang_String *javastring_new(utf *u)
 {
        char *utf_ptr = u->text;        /* current utf character in utf string    */
        int utflength = utf_strlen(u);  /* length of utf-string if uncompressed   */
@@ -587,8 +573,8 @@ java_objectheader *javastring_new (utf *u)
        
 /*     log_text("javastring_new");*/
        
-       s = (java_lang_String*) builtin_new (class_java_lang_String);
-       a = builtin_newarray_char (utflength);
+       s = (java_lang_String*) builtin_new(class_java_lang_String);
+       a = builtin_newarray_char(utflength);
 
        /* javastring or character-array could not be created */
        if ((!a) || (!s))
@@ -603,9 +589,11 @@ java_objectheader *javastring_new (utf *u)
        s->offset = 0;
        s->count  = utflength;
 
-       return (java_objectheader*) s;
+/*     return (java_objectheader*) s; */
+       return s;
 }
 
+
 /********************** function: javastring_new_char **************************
 
        creates a new java/lang/String object which contains the convertet
@@ -615,7 +603,8 @@ java_objectheader *javastring_new (utf *u)
 
 *******************************************************************************/
 
-java_objectheader *javastring_new_char (char *text)
+/*  java_objectheader *javastring_new_char (char *text) */
+java_lang_String *javastring_new_char (char *text)
 {
        s4 i;
        s4 len = strlen(text); /* length of the string */
@@ -623,22 +612,24 @@ java_objectheader *javastring_new_char (char *text)
        java_chararray *a;
        
        /*log_text("javastring_new_char");*/
-       s = (java_lang_String*) builtin_new (class_java_lang_String);
-       a = builtin_newarray_char (len);
+       s = (java_lang_String*) builtin_new(class_java_lang_String);
+       a = builtin_newarray_char(len);
 
        /* javastring or character-array could not be created */
-       if ((!a) || (!s)) return NULL;
+       if ((!a) || (!s))
+               return NULL;
 
        /* copy text */
        for (i = 0; i < len; i++)
                a->data[i] = text[i];
        
        /* set fields of the javastring-object */
-       s->value = a;
+       s->value  = a;
        s->offset = 0;
-       s->count = len;
+       s->count  = len;
 
-       return (java_objectheader*) s;
+/*     return (java_objectheader*) s; */
+       return s;
 }
 
 
@@ -683,20 +674,35 @@ char *javastring_tochar (java_objectheader *so)
 
 *******************************************************************************/
  
-fieldinfo *class_findfield_approx (classinfo *c, utf *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 = native_new_and_init(class_java_lang_NoSuchFieldException);
+       *exceptionptr = native_new_and_init(class_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 = native_new_and_init(class_java_lang_NoSuchFieldException);
+       return -1;
+}
+
 
 /********************** function: native_new_and_init *************************
 
@@ -708,8 +714,13 @@ fieldinfo *class_findfield_approx (classinfo *c, utf *name)
 java_objectheader *native_new_and_init(classinfo *c)
 {
        methodinfo *m;
-       java_objectheader *o = builtin_new(c);          /*          create object */
+       java_objectheader *o;
+
+       /* if c==NULL it is probebly because loader_load failed */
+       if (!c) return *exceptionptr;
 
+       o = builtin_new(c);          /* create object          */
+       
         /*
        printf("native_new_and_init ");
        utf_display(c->name);
@@ -723,20 +734,58 @@ java_objectheader *native_new_and_init(classinfo *c)
                                                      
        if (!m) {                                       /* initializer not found  */
                if (verbose) {
+                       char logtext[MAXLOGTEXT];
+                       sprintf(logtext, "Warning: class has no instance-initializer: ");
+                       utf_sprint(logtext + strlen(logtext), c->name);
+                       log_text(logtext);
+               }
+               return o;
+       }
+
+       /* call initializer */
+
+       asm_calljavafunction(m, o, NULL, NULL, NULL);
+
+       return o;
+}
+
+
+java_objectheader *native_new_and_init_string(classinfo *c, java_lang_String *s)
+{
+       methodinfo *m;
+       java_objectheader *o;
+
+       /* if c==NULL it is probebly because loader_load failed */
+       if (!c) return *exceptionptr;
+
+       o = builtin_new(c);          /* create object          */
+       
+       if (!o) return NULL;
+
+       /* find initializer */
+
+       m = class_findmethod(c,
+                                                utf_new_char("<init>"),
+                                                utf_new_char("(Ljava/lang/String;)V"));
+                                                     
+       if (!m) {                                       /* initializer not found  */
+               if (verbose) {
+                       char logtext[MAXLOGTEXT];
                        sprintf(logtext, "Warning: class has no instance-initializer: ");
                        utf_sprint(logtext + strlen(logtext), c->name);
-                       dolog();
+                       log_text(logtext);
                }
                return o;
        }
 
        /* call initializer */
 
-       asm_calljavamethod(m, o, NULL, NULL, NULL);
+       asm_calljavafunction(m, o, s, NULL, NULL);
 
        return o;
 }
 
+
 /******************** function: stringtable_update ****************************
 
        traverses the javastring hashtable and sets the vftbl-entries of
@@ -759,10 +808,12 @@ void stringtable_update ()
                                                                
                                js = (java_lang_String *) s->string;
                                
-                               if (!js || !(a = js->value)
+                               if (!js || !js->value
                                        /* error in hashtable found */
                                        panic("invalid literalstring in hashtable");
 
+                               a = js->value;
+
                                if (!js->header.vftbl) 
                                        /* vftbl of javastring is NULL */ 
                                        js->header.vftbl = class_java_lang_String -> vftbl;
@@ -785,30 +836,29 @@ void stringtable_update ()
 
 *****************************************************************************/
 
-
 u4 u2_utflength(u2 *text, u4 u2_length)
 {
        u4 result_len =  0;  /* utf length in bytes  */
        u2 ch;               /* current unicode character */
        u4 len;
        
-        for (len = 0; len < u2_length; len++) {
-         
-         /* next unicode character */
-         ch = *text++;
+       for (len = 0; len < u2_length; len++) {
+               /* next unicode character */
+               ch = *text++;
          
-         /* determine bytes required to store unicode character as utf */
-         if (ch && (ch < 0x80)) 
-           result_len++;
-         else if (ch < 0x800)
-           result_len += 2;    
-         else 
-           result_len += 3;    
+               /* determine bytes required to store unicode character as utf */
+               if (ch && (ch < 0x80)) 
+                       result_len++;
+               else if (ch < 0x800)
+                       result_len += 2;        
+               else 
+                       result_len += 3;        
        }
 
     return result_len;
 }
 
+
 /********************* function: utf_new_u2 ***********************************
 
        make utf symbol from u2 array, 
@@ -819,68 +869,71 @@ u4 u2_utflength(u2 *text, u4 u2_length)
 utf *utf_new_u2(u2 *unicode_pos, u4 unicode_length, bool isclassname)
 {
        char *buffer; /* memory buffer for  unicode characters */
-       char *pos;    /* pointer to current position in buffer */
-       u4 left;      /* unicode characters left */
-       u4 buflength; /* utf length in bytes of the u2 array  */
+       char *pos;    /* pointer to current position in buffer */
+       u4 left;      /* unicode characters left */
+       u4 buflength; /* utf length in bytes of the u2 array  */
        utf *result;  /* resulting utf-string */
-       int i;          
+       int i;          
 
        /* determine utf length in bytes and allocate memory */
        /* printf("utf_new_u2: unicode_length=%d\n",unicode_length);            */
        buflength = u2_utflength(unicode_pos, unicode_length); 
-       buffer    = MNEW(char,buflength);
+       buffer    = MNEW(char, buflength);
  
        /* memory allocation failed */
        if (!buffer) {
                printf("length: %d\n",buflength);
                log_text("utf_new_u2:buffer==NULL");
-               return NULL;
        }
 
-       left = buflength;
+       left = buflength;
        pos  = buffer;
 
-       for (i = 0; i++ < unicode_length; unicode_pos++) {
+       for (i = 0; i++ < unicode_length; unicode_pos++) {
                /* next unicode character */
                u2 c = *unicode_pos;
                
                if ((c != 0) && (c < 0x80)) {
-               /* 1 character */       
-               left--;
+                       /* 1 character */       
+                       left--;
                if ((int) left < 0) break;
-               /* convert classname */
-               if (isclassname && c=='.') 
-                 *pos++ = '/';
-               else
-                 *pos++ = (char) c;
+                       /* convert classname */
+                       if (isclassname && c == '.')
+                               *pos++ = '/';
+                       else
+                               *pos++ = (char) c;
+
                } else if (c < 0x800) {             
-               /* 2 characters */                              
+                       /* 2 characters */                              
                unsigned char high = c >> 6;
                unsigned char low  = c & 0x3F;
-               left = left - 2;
+                       left = left - 2;
                if ((int) left < 0) break;
                *pos++ = high | 0xC0; 
                *pos++ = low  | 0x80;     
+
                } else {         
                /* 3 characters */                              
                char low  = c & 0x3f;
                char mid  = (c >> 6) & 0x3F;
                char high = c >> 12;
-               left = left - 3;
+                       left = left - 3;
                if ((int) left < 0) break;
                *pos++ = high | 0xE0; 
                *pos++ = mid  | 0x80;  
                *pos++ = low  | 0x80;   
                }
-       }
+       }
        
        /* insert utf-string into symbol-table */
        result = utf_new(buffer,buflength);
 
-       MFREE(buffer, char, buflength);
+       MFREE(buffer, char, buflength);
+
        return result;
 }
 
+
 /********************* function: javastring_toutf *****************************
 
        make utf symbol from javastring
@@ -889,12 +942,13 @@ utf *utf_new_u2(u2 *unicode_pos, u4 unicode_length, bool isclassname)
 
 utf *javastring_toutf(java_lang_String *string, bool isclassname)
 {
-        java_lang_String *str = (java_lang_String *) string;
+       java_lang_String *str = (java_lang_String *) string;
 /*     printf("javastring_toutf offset: %d, len %d\n",str->offset, str->count);
        fflush(stdout);*/
-       return utf_new_u2(str->value->data+str->offset,str->count, isclassname);
+       return utf_new_u2(str->value->data + str->offset, str->count, isclassname);
 }
 
+
 /********************* function: literalstring_u2 *****************************
 
     searches for the javastring with the specified u2-array in 
@@ -935,7 +989,7 @@ java_objectheader *literalstring_u2 (java_chararray *a, u4 length, bool copymode
                                        
        /* string already in hashtable, free memory */
        if (!copymode)
-         lit_mem_free(a, sizeof(java_chararray) + sizeof(u2)*(length-1)+10);
+               lit_mem_free(a, sizeof(java_chararray) + sizeof(u2) * (length - 1) + 10);
 
 #ifdef JOWENN_DEBUG1
        log_text("literalstring_u2: foundentry");
@@ -1082,6 +1136,205 @@ void copy_vftbl(vftbl **dest, vftbl *src)
 #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(u1, 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, u1, 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;
+}
+
+
+/******************************************************************************************
+
+       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 the exceptions which can be thrown by a method      
+
+*******************************************************************************************/
+
+java_objectarray* get_exceptiontypes(methodinfo *m) 
+{
+}
+
+
+
+
+
+/******************************************************************************************
+
+       get the returntype class of a method
+
+*******************************************************************************************/
+
+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  */
+
+       utf_ptr  = desc->text;
+       desc_end = utf_end(desc);
+
+       /* ignore parametertypes */
+        while ((utf_ptr<desc_end) && utf_nextu2(&utf_ptr)!=')')
+               /* skip */ ;
+
+       return get_type(&utf_ptr,desc_end, false);
+}
+
+
 /*****************************************************************************/
 /*****************************************************************************/