GNU header update.
[cacao.git] / src / native / native.c
index a4452afe7b3f0ce8cb28d506e57fc9799aab906e..1ab67dbe1d4f78ac3fb6227ad82dc8702afe37e0 100644 (file)
@@ -1,9 +1,9 @@
-/* native.c - table of native functions
+/* native/native.c - table of native functions
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser,
-   M. Probst, S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck,
-   P. Tomsich, J. Wenninger
+   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
 
    This file is part of CACAO.
 
@@ -31,7 +31,7 @@
    The .hh files created with the header file generator are all
    included here as are the C functions implementing these methods.
 
-   $Id: native.c 862 2004-01-06 23:42:01Z stefan $
+   $Id: native.c 1735 2004-12-07 14:33:27Z twisti $
 
 */
 
 #include <sys/time.h>
 #include <utime.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"
-
 /* Include files for IO functions */
 
 #include <fcntl.h>
 #endif
 #include <sys/stat.h>
 
+#include "config.h"
+#include "mm/memory.h"
+#include "native/jni.h"
+#include "native/native.h"
+#include "native/include/java_lang_Throwable.h"
+#include "toolbox/logging.h"
+#include "vm/builtin.h"
+#include "vm/exceptions.h"
+#include "vm/global.h"
+#include "vm/loader.h"
+#include "vm/options.h"
+#include "vm/tables.h"
+#include "vm/jit/asmpart.h"
+#include "vm/jit/jit.h"
+#if 0
+#include "threads/thread.h"
 #include "threads/threadio.h"
+#include "threads/locks.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"
+#endif
+
+#include "nativetable.inc"
 
-/* searchpath for classfiles */
-char *classpath;
 
 /* for java-string to char conversion */
 #define MAXSTRINGSIZE 1000                          
 
+
 /******************** systemclasses required for native methods ***************/
 
 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 */
-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_gnu_java_lang_SystemClassLoader;
+classinfo *class_java_lang_SecurityManager;
 classinfo *class_java_lang_Double;
 classinfo *class_java_lang_Float;
 classinfo *class_java_lang_Long;
@@ -116,145 +110,59 @@ classinfo *class_java_lang_Void;
 classinfo *class_java_lang_Character;
 classinfo *class_java_lang_Integer;
 
+methodinfo *method_vmclass_init;
+
+
 /* the system classloader object */
 struct java_lang_ClassLoader *SystemClassLoader = NULL;
 
 /* for raising exceptions from native methods */
-THREADSPECIFIC java_objectheader* _exceptionptr = NULL;
+#if !defined(USE_THREADS) || !defined(NATIVE_THREADS)
+java_objectheader* _exceptionptr = NULL;
+#endif
 
 /************* use classinfo structure as java.lang.Class object **************/
 
 void use_class_as_object(classinfo *c) 
 {
-       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) {
-                       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);
-
-                       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");*/
-               }
-       }
+               c->classvftbl = true;
+       }
+            
 }
 
 
-/*************************** include native methods ***************************/ 
-
-#ifdef USE_GTK 
-#include "nat/GdkGraphics.c"
-#include "nat/GtkComponentPeer.c"
-#include "nat/GdkPixbufDecoder.c"
-#include "nat/GtkScrollPanePeer.c"
-#include "nat/GtkFileDialogPeer.c"
-#include "nat/GtkLabelPeer.c"
-#endif
-
-
 /************************** tables for methods ********************************/
 
 #undef JOWENN_DEBUG
 #undef JOWENN_DEBUG1
 
-/* table for locating native methods */
-static struct nativeref {
-       char *classname;
-       char *methodname;
-       char *descriptor;
-       bool isstatic;
-       functionptr func;
-} nativetable [] = {
-
-#include "nativetable.hh"
-
-};
-
-
+#ifdef STATIC_CLASSPATH
 #define NATIVETABLESIZE  (sizeof(nativetable)/sizeof(struct nativeref))
 
 /* table for fast string comparison */
-static struct nativecompref {
-       utf *classname;
-       utf *methodname;
-       utf *descriptor;
-       bool isstatic;
-       functionptr func;
-} nativecomptable [NATIVETABLESIZE];
+static nativecompref nativecomptable[NATIVETABLESIZE];
 
 /* string comparsion table initialized */
 static bool nativecompdone = false;
+#endif
 
 
-/******************************************************************************/
-/******************************************************************************/
-#include "natcalls.h"
-
-/* string call comparison table initialized */
-
-/******************************************************************************/
-/******************************************************************************/
-
-/*--------------- native method calls & classes used -------------------------*/
-
-
-
-/* throw some loader exceptions */
+/* XXX don't define this in a header file!!! */
 
-void throw_noclassdeffounderror_message(utf* classname)
+static struct nativeCall nativeCalls[] =
 {
-       if (!class_java_lang_NoClassDefFoundError) {
-               panic("java.lang.NoClassDefFoundError not found. Maybe wrong classpath?");
-       }
+#include "nativecalls.inc"
+};
 
-       /* throws a NoClassDefFoundError with message */
-       *exceptionptr = native_new_and_init_string(class_java_lang_NoClassDefFoundError,
-                                                                                         javastring_new(classname));
-}
+#define NATIVECALLSSIZE    (sizeof(nativeCalls) / sizeof(struct nativeCall))
 
+struct nativeCompCall nativeCompCalls[NATIVECALLSSIZE];
 
-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));
-}
+/**include "natcalls.h" **/
 
 
 /*********************** function: native_loadclasses **************************
@@ -265,118 +173,70 @@ void throw_linkageerror_message(utf* classname)
 
 void native_loadclasses()
 {
-       static int classesLoaded=0; /*temporary hack JoWenn*/
-       if (classesLoaded) return;
+       static int classesLoaded = 0; /*temporary hack JoWenn*/
+
+       if (classesLoaded)
+               return;
+
        classesLoaded = 1;
-/*     log_text("loadclasses entered");*/
 
+       class_java_lang_Cloneable =
+               class_new(utf_new_char("java/lang/Cloneable"));
+       class_load(class_java_lang_Cloneable);
+       class_link(class_java_lang_Cloneable);
 
-       /*class_java_lang_System =*/
-       (void) class_new(utf_new_char("java/lang/VMClass"));/*JoWenn*/
-       (void) class_new(utf_new_char("java/lang/Class"));/*JoWenn*/
+       class_java_lang_Class =
+               class_new(utf_new_char("java/lang/Class"));
+       class_load(class_java_lang_Class);
+       class_link(class_java_lang_Class);
+
+       class_java_lang_VMClass =
+               class_new(utf_new_char("java/lang/VMClass"));
+       class_load(class_java_lang_VMClass);
+       class_link(class_java_lang_VMClass);
 
-       /* 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"));
-/*     log_text("loadclasses: class_java_lang_Cloneable has been initialized");*/
-       class_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_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 =
-               class_new(utf_new_char("java/lang/NoSuchMethodError"));
-       class_java_lang_NoSuchFieldError =
-               class_new(utf_new_char("java/lang/NoSuchFieldError"));  
-       class_java_lang_ClassFormatError =
-               class_new(utf_new_char("java/lang/ClassFormatError"));  
-       class_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"));       
-/*     log_text("native_loadclasses: class_new(\"java/security/PrivilegedActionException\")");         */
-       class_java_security_PrivilegedActionException =
-               class_new(utf_new_char("java/security/PrivilegedActionException"));
-
-       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"));
-       class_java_lang_ArrayIndexOutOfBoundsException =
-               class_new(utf_new_char("java/lang/ArrayIndexOutOfBoundsException"));
-       class_java_lang_NoSuchFieldException =
-               class_new(utf_new_char("java/lang/NoSuchFieldException"));
-       class_java_lang_NoSuchMethodException = 
-               class_new(utf_new_char("java/lang/NoSuchMethodException"));
+               class_new(utf_new_char("java/lang/ClassLoader"));
+       class_load(class_java_lang_ClassLoader);
+       class_link(class_java_lang_ClassLoader);
 
        /* load classes for wrapping primitive types */
-       class_java_lang_Double    = class_new(utf_new_char("java/lang/Double"));
-       class_init(class_java_lang_Double);
+       class_java_lang_Double = class_new(utf_new_char("java/lang/Double"));
+       class_load(class_java_lang_Double);
+       class_link(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"));
+       class_java_lang_Float = class_new(utf_new_char("java/lang/Float"));
+       class_load(class_java_lang_Float);
+       class_link(class_java_lang_Float);
 
-       classesLoaded = 1;
-}
+       class_java_lang_Character =     class_new(utf_new_char("java/lang/Character"));
+       class_load(class_java_lang_Character);
+       class_link(class_java_lang_Character);
 
+       class_java_lang_Integer = class_new(utf_new_char("java/lang/Integer"));
+       class_load(class_java_lang_Integer);
+       class_link(class_java_lang_Integer);
 
-/*************** adds a class to the vector of loaded classes ****************/
+       class_java_lang_Long = class_new(utf_new_char("java/lang/Long"));
+       class_load(class_java_lang_Long);
+       class_link(class_java_lang_Long);
 
-void systemclassloader_addclass(classinfo *c)
-{
-       methodinfo *m;
+       class_java_lang_Byte = class_new(utf_new_char("java/lang/Byte"));
+       class_load(class_java_lang_Byte);
+       class_link(class_java_lang_Byte);
 
-       /* find method addClass of 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");
-
-       /* prepare class to be passed as argument */
-       use_class_as_object (c);
-
-       /* call 'addClass' */
-       asm_calljavafunction(m,
-                                                (java_objectheader*) SystemClassLoader, 
-                                                (java_objectheader*) c,
-                                                NULL,  
-                                                NULL
-                                                );
-}
+       class_java_lang_Short = class_new(utf_new_char("java/lang/Short"));
+       class_load(class_java_lang_Short);
+       class_link(class_java_lang_Short);
 
+       class_java_lang_Boolean = class_new(utf_new_char("java/lang/Boolean"));
+       class_load(class_java_lang_Boolean);
+       class_link(class_java_lang_Boolean);
 
-/*************** adds a library to the vector of loaded libraries *************/
+       class_java_lang_Void = class_new(utf_new_char("java/lang/Void"));
+       class_load(class_java_lang_Void);
+       class_link(class_java_lang_Void);
 
-void systemclassloader_addlibrary(java_objectheader *o)
-{
-       log_text("systemclassloader_addlibrary");
 }
 
 
@@ -388,11 +248,12 @@ void systemclassloader_addlibrary(java_objectheader *o)
 
 void init_systemclassloader() 
 {
+       log_text("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);  
+               SystemClassLoader = (java_lang_ClassLoader *) native_new_and_init(class_new(utf_new_char("gnu/java/lang/SystemClassLoader")));
 
                /* systemclassloader has no parent */
                SystemClassLoader->parent      = NULL;
@@ -402,43 +263,6 @@ void init_systemclassloader()
 }
 
 
-/********************* add loaded library name  *******************************/
-
-void systemclassloader_addlibname(java_objectheader *o)
-{
-       methodinfo *m;
-       jfieldID id;
-
-       m = class_resolvemethod(loader_load_sysclass(NULL, utf_new_char ("java/util/Vector")),
-                                                       utf_new_char("addElement"),
-                                                       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;");
-
-       if (!id) panic("can not access ClassLoader");
-
-       asm_calljavafunction(m,
-                                                envTable.GetStaticObjectField(&env, class_java_lang_ClassLoader, id),
-                                                o,
-                                                NULL,  
-                                                NULL);
-}
-
-
-/********************* function: native_setclasspath **************************/
-void native_setclasspath(char *path)
-{
-       /* set searchpath for classfiles */
-       classpath = path;
-}
-
-
 /*********************** Function: native_findfunction *************************
 
        Looks up a method (must have the same class name, method name, descriptor
@@ -453,6 +277,7 @@ void native_setclasspath(char *path)
 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;
@@ -546,10 +371,14 @@ functionptr native_findfunction(utf *cname, utf *mname,
 
        MFREE(buffer, char, buffer_len);
 
-       exit(1);
+/*     exit(1); */
 
        /* keep compiler happy */
        return NULL;
+#else
+/* dynamic classpath */
+  return 0;
+#endif
 }
 
 
@@ -562,22 +391,27 @@ functionptr native_findfunction(utf *cname, utf *mname,
 
 *******************************************************************************/
 
-/*  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   */
+       char *utf_ptr;                  /* current utf character in utf string    */
+       u4 utflength;                   /* length of utf-string if uncompressed   */
        java_lang_String *s;                /* result-string                          */
        java_chararray *a;
        s4 i;
-       
-/*     log_text("javastring_new");*/
-       
-       s = (java_lang_String*) builtin_new(class_java_lang_String);
+
+       if (!u) {
+               *exceptionptr = new_nullpointerexception();
+               return NULL;
+       }
+
+       utf_ptr = u->text;
+       utflength = utf_strlen(u);
+
+       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))
+       if (!a || !s)
                return NULL;
 
        /* decompress utf-string */
@@ -589,7 +423,6 @@ java_lang_String *javastring_new(utf *u)
        s->offset = 0;
        s->count  = utflength;
 
-/*     return (java_objectheader*) s; */
        return s;
 }
 
@@ -603,20 +436,25 @@ java_lang_String *javastring_new(utf *u)
 
 *******************************************************************************/
 
-/*  java_objectheader *javastring_new_char (char *text) */
-java_lang_String *javastring_new_char (char *text)
+java_lang_String *javastring_new_char(char *text)
 {
        s4 i;
-       s4 len = strlen(text); /* length of the string */
+       s4 len;                /* length of the string */
        java_lang_String *s;   /* result-string */
        java_chararray *a;
-       
-       /*log_text("javastring_new_char");*/
-       s = (java_lang_String*) builtin_new(class_java_lang_String);
+
+       if (!text) {
+               *exceptionptr = new_nullpointerexception();
+               return NULL;
+       }
+
+       len = strlen(text);
+
+       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))
+       if (!a || !s)
                return NULL;
 
        /* copy text */
@@ -628,7 +466,6 @@ java_lang_String *javastring_new_char (char *text)
        s->offset = 0;
        s->count  = len;
 
-/*     return (java_objectheader*) s; */
        return s;
 }
 
@@ -645,24 +482,28 @@ java_lang_String *javastring_new_char (char *text)
 
 static char stringbuffer[MAXSTRINGSIZE];
 
-char *javastring_tochar (java_objectheader *so) 
+char *javastring_tochar(java_objectheader *so) 
 {
-       java_lang_String *s = (java_lang_String*) so;
+       java_lang_String *s = (java_lang_String *) so;
        java_chararray *a;
        s4 i;
        
-       log_text("javastring_tochar");
-       
        if (!s)
                return "";
+
        a = s->value;
+
        if (!a)
                return "";
+
        if (s->count > MAXSTRINGSIZE)
                return "";
+
        for (i = 0; i < s->count; i++)
-               stringbuffer[i] = a->data[s->offset+i];
+               stringbuffer[i] = a->data[s->offset + i];
+
        stringbuffer[i] = '\0';
+
        return stringbuffer;
 }
 
@@ -677,6 +518,7 @@ char *javastring_tochar (java_objectheader *so)
 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))
@@ -684,22 +526,25 @@ fieldinfo *class_findfield_approx(classinfo *c, utf *name)
        }
 
        /* field was not found, raise exception */      
-       *exceptionptr = native_new_and_init(class_java_lang_NoSuchFieldException);
+       *exceptionptr = new_exception(string_java_lang_NoSuchFieldException);
 
        return NULL;
 }
 
-s4 class_findfield_index_approx (classinfo *c, utf *name)
+
+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);
+       *exceptionptr = new_exception(string_java_lang_NoSuchFieldException);
+
        return -1;
 }
 
@@ -716,27 +561,98 @@ java_objectheader *native_new_and_init(classinfo *c)
        methodinfo *m;
        java_objectheader *o;
 
-       /* if c==NULL it is probebly because loader_load failed */
-       if (!c) return *exceptionptr;
+       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("()V"));
+                                                     
+       if (!m) {                           /* initializer not found              */
+               if (opt_verbose) {
+                       char logtext[MAXLOGTEXT];
+                       sprintf(logtext, "Warning: class has no instance-initializer: ");
+                       utf_sprint_classname(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)
+               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 (opt_verbose) {
+                       char logtext[MAXLOGTEXT];
+                       sprintf(logtext, "Warning: class has no instance-initializer: ");
+                       utf_sprint_classname(logtext + strlen(logtext), c->name);
+                       log_text(logtext);
+               }
+               return o;
+       }
+
+       /* call initializer */
+
+       asm_calljavafunction(m, o, s, NULL, NULL);
+
+       return o;
+}
+
+
+java_objectheader *native_new_and_init_int(classinfo *c, s4 i)
+{
+       methodinfo *m;
+       java_objectheader *o;
+
+       if (!c)
+               return *exceptionptr;
 
        o = builtin_new(c);          /* create object          */
        
-        /*
-       printf("native_new_and_init ");
-       utf_display(c->name);
-       printf("\n");
-        */
        if (!o) return NULL;
-       /* printf("o!=NULL\n"); */
+
        /* find initializer */
 
-       m = class_findmethod(c, utf_new_char("<init>"), utf_new_char("()V"));
+       m = class_findmethod(c,
+                                                utf_new_char("<init>"),
+                                                utf_new_char("(I)V"));
                                                      
        if (!m) {                                       /* initializer not found  */
-               if (verbose) {
+               if (opt_verbose) {
                        char logtext[MAXLOGTEXT];
                        sprintf(logtext, "Warning: class has no instance-initializer: ");
-                       utf_sprint(logtext + strlen(logtext), c->name);
+                       utf_sprint_classname(logtext + strlen(logtext), c->name);
                        log_text(logtext);
                }
                return o;
@@ -744,19 +660,23 @@ java_objectheader *native_new_and_init(classinfo *c)
 
        /* call initializer */
 
-       asm_calljavafunction(m, o, NULL, NULL, NULL);
+#if defined(__I386__) || defined(__POWERPC__)
+       asm_calljavafunction(m, o, (void *) i, NULL, NULL);
+#else
+       asm_calljavafunction(m, o, (void *) (s8) i, NULL, NULL);
+#endif
 
        return o;
 }
 
 
-java_objectheader *native_new_and_init_string(classinfo *c, java_lang_String *s)
+java_objectheader *native_new_and_init_throwable(classinfo *c, java_lang_Throwable *t)
 {
        methodinfo *m;
        java_objectheader *o;
 
-       /* if c==NULL it is probebly because loader_load failed */
-       if (!c) return *exceptionptr;
+       if (!c)
+               return *exceptionptr;
 
        o = builtin_new(c);          /* create object          */
        
@@ -766,13 +686,13 @@ java_objectheader *native_new_and_init_string(classinfo *c, java_lang_String *s)
 
        m = class_findmethod(c,
                                                 utf_new_char("<init>"),
-                                                utf_new_char("(Ljava/lang/String;)V"));
+                                                utf_new_char("(Ljava/lang/Throwable;)V"));
                                                      
        if (!m) {                                       /* initializer not found  */
-               if (verbose) {
+               if (opt_verbose) {
                        char logtext[MAXLOGTEXT];
                        sprintf(logtext, "Warning: class has no instance-initializer: ");
-                       utf_sprint(logtext + strlen(logtext), c->name);
+                       utf_sprint_classname(logtext + strlen(logtext), c->name);
                        log_text(logtext);
                }
                return o;
@@ -780,7 +700,7 @@ java_objectheader *native_new_and_init_string(classinfo *c, java_lang_String *s)
 
        /* call initializer */
 
-       asm_calljavafunction(m, o, s, NULL, NULL);
+       asm_calljavafunction(m, o, t, NULL, NULL);
 
        return o;
 }
@@ -816,7 +736,7 @@ void stringtable_update ()
 
                                if (!js->header.vftbl) 
                                        /* vftbl of javastring is NULL */ 
-                                       js->header.vftbl = class_java_lang_String -> vftbl;
+                                       js->header.vftbl = class_java_lang_String->vftbl;
 
                                if (!a->header.objheader.vftbl) 
                                        /* vftbl of character-array is NULL */ 
@@ -880,12 +800,6 @@ utf *utf_new_u2(u2 *unicode_pos, u4 unicode_length, bool isclassname)
        buflength = u2_utflength(unicode_pos, unicode_length); 
        buffer    = MNEW(char, buflength);
  
-       /* memory allocation failed */
-       if (!buffer) {
-               printf("length: %d\n",buflength);
-               log_text("utf_new_u2:buffer==NULL");
-       }
-
        left = buflength;
        pos  = buffer;
 
@@ -943,8 +857,10 @@ 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;
-/*     printf("javastring_toutf offset: %d, len %d\n",str->offset, str->count);
-       fflush(stdout);*/
+
+/*     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);
 }
 
@@ -959,121 +875,146 @@ utf *javastring_toutf(java_lang_String *string, bool isclassname)
 
 *******************************************************************************/
 
-java_objectheader *literalstring_u2 (java_chararray *a, u4 length, bool copymode )
+java_objectheader *literalstring_u2(java_chararray *a, u4 length, u4 offset,
+                                                                       bool copymode)
 {
     literalstring *s;                /* hashtable element */
     java_lang_String *js;            /* u2-array wrapped in javastring */
     java_chararray *stringdata;      /* copy of u2-array */      
-    u4 key;   
-    u4 slot;  
+    u4 key;
+    u4 slot;
     u2 i;
 
-#if JOWENN_DEBUG1
-    printf("literalstring_u2: length: %d\n",length);    
-    log_text("literalstring_u2");
+/* #define DEBUG_LITERALSTRING_U2 */
+#ifdef DEBUG_LITERALSTRING_U2
+    printf("literalstring_u2: length=%d, offset=%d\n", length, offset);
+       fflush(stdout);
 #endif
     
     /* find location in hashtable */
-    key  = unicode_hashkey (a->data, length);
-    slot = key & (string_hash.size-1);
+    key  = unicode_hashkey(a->data + offset, length);
+    slot = key & (string_hash.size - 1);
     s    = string_hash.ptr[slot];
 
     while (s) {
-       
-      js = (java_lang_String *) s->string;
-       
-      if (js->count == length) {
-       /* compare text */
-       for (i=0; i<length; i++) 
-         if (js->value->data[i] != a->data[i]) goto nomatch;
-                                       
-       /* string already in hashtable, free memory */
-       if (!copymode)
-               lit_mem_free(a, sizeof(java_chararray) + sizeof(u2) * (length - 1) + 10);
-
-#ifdef JOWENN_DEBUG1
-       log_text("literalstring_u2: foundentry");
-       utf_display(javastring_toutf(js,0));
+               js = (java_lang_String *) s->string;
+
+               if (length == js->count) {
+                       /* compare text */
+                       for (i = 0; i < length; i++) {
+                               if (a->data[offset + i] != js->value->data[i])
+                                       goto nomatch;
+                       }
+
+                       /* string already in hashtable, free memory */
+                       if (!copymode)
+                               mem_free(a, sizeof(java_chararray) + sizeof(u2) * (length - 1) + 10);
+
+#ifdef DEBUG_LITERALSTRING_U2
+                       printf("literalstring_u2: foundentry at %p\n", js);
+                       utf_display(javastring_toutf(js, 0));
+                       printf("\n\n");
+                       fflush(stdout);
 #endif
-       return (java_objectheader *) js;
-      }
+                       return (java_objectheader *) js;
+               }
 
-      nomatch:
-      /* follow link in external hash chain */
-      s = s->hashlink;
+       nomatch:
+               /* follow link in external hash chain */
+               s = s->hashlink;
     }
 
     if (copymode) {
-      /* create copy of u2-array for new javastring */
-      u4 arraysize = sizeof(java_chararray) + sizeof(u2)*(length-1)+10;
-      stringdata = lit_mem_alloc ( arraysize );        
-      memcpy(stringdata, a, arraysize );       
-    }  
-    else
-      stringdata = a;
+               /* create copy of u2-array for new javastring */
+               u4 arraysize = sizeof(java_chararray) + sizeof(u2) * (length - 1) + 10;
+               stringdata = mem_alloc(arraysize);
+/*             memcpy(stringdata, a, arraysize); */
+               memcpy(&(stringdata->header), &(a->header), sizeof(java_arrayheader));
+               memcpy(&(stringdata->data), &(a->data) + offset, sizeof(u2) * (length - 1) + 10);
+
+    } else {
+               stringdata = a;
+       }
 
     /* location in hashtable found, complete arrayheader */
-    stringdata -> header.objheader.vftbl = primitivetype_table[ARRAYTYPE_CHAR].arrayvftbl;
-    stringdata -> header.size = length;        
-
-    /* create new javastring */
-    js = LNEW (java_lang_String);
-    js -> header.vftbl = class_java_lang_String -> vftbl;
-    js -> value  = stringdata;
-    js -> offset = 0;
-    js -> count  = length;
-
-    /* create new literalstring */
-    s = NEW (literalstring);
-    s->hashlink = string_hash.ptr[slot];
-    s->string   = (java_objectheader *) js;
-    string_hash.ptr[slot] = s;
-
-    /* update numbe of hashtable entries */
-    string_hash.entries++;
-
-    /* reorganization of hashtable */       
-    if ( string_hash.entries > (string_hash.size*2)) {
-
-      /* reorganization of hashtable, average length of 
-         the external chains is approx. 2                */  
-
-      u4 i;
-      literalstring *s;     
-      hashtable newhash; /* the new hashtable */
+    stringdata->header.objheader.vftbl = primitivetype_table[ARRAYTYPE_CHAR].arrayvftbl;
+    stringdata->header.size = length;
+
+       /* if we use eager loading, we have to check loaded String class */
+       if (opt_eager) {
+               class_java_lang_String =
+                       class_new_intern(utf_new_char("java/lang/String"));
+
+               if (!class_load(class_java_lang_String))
+                       return NULL;
+
+               list_addfirst(&unlinkedclasses, class_java_lang_String);
+       }
+
+       /* create new javastring */
+       js = NEW(java_lang_String);
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+       initObjectLock(&js->header);
+#endif
+       js->header.vftbl = class_java_lang_String->vftbl;
+       js->value  = stringdata;
+       js->offset = 0;
+       js->count  = length;
+
+#ifdef DEBUG_LITERALSTRING_U2
+       printf("literalstring_u2: newly created at %p\n", js);
+       utf_display(javastring_toutf(js, 0));
+       printf("\n\n");
+       fflush(stdout);
+#endif
+                       
+       /* create new literalstring */
+       s = NEW(literalstring);
+       s->hashlink = string_hash.ptr[slot];
+       s->string   = (java_objectheader *) js;
+       string_hash.ptr[slot] = s;
+
+       /* update number of hashtable entries */
+       string_hash.entries++;
+
+       /* reorganization of hashtable */       
+       if (string_hash.entries > (string_hash.size * 2)) {
+               /* reorganization of hashtable, average length of 
+                  the external chains is approx. 2                */  
+
+               u4 i;
+               literalstring *s;
+               hashtable newhash; /* the new hashtable */
       
-      /* create new hashtable, double the size */
-      init_hashtable(&newhash, string_hash.size*2);
-      newhash.entries=string_hash.entries;
+               /* create new hashtable, double the size */
+               init_hashtable(&newhash, string_hash.size * 2);
+               newhash.entries = string_hash.entries;
       
-      /* transfer elements to new hashtable */
-      for (i=0; i<string_hash.size; i++) {
-       s = string_hash.ptr[i];
-       while (s) {
-         literalstring *nexts = s -> hashlink;  
-         js   = (java_lang_String*) s->string;
-         slot = (unicode_hashkey(js->value->data,js->count)) & (newhash.size-1);
+               /* transfer elements to new hashtable */
+               for (i = 0; i < string_hash.size; i++) {
+                       s = string_hash.ptr[i];
+                       while (s) {
+                               literalstring *nexts = s->hashlink;
+                               js   = (java_lang_String *) s->string;
+                               slot = unicode_hashkey(js->value->data, js->count) & (newhash.size - 1);
          
-         s->hashlink = newhash.ptr[slot];
-         newhash.ptr[slot] = s;
+                               s->hashlink = newhash.ptr[slot];
+                               newhash.ptr[slot] = s;
        
-         /* follow link in external hash chain */  
-         s = nexts;
-       }
-      }
+                               /* follow link in external hash chain */  
+                               s = nexts;
+                       }
+               }
        
-      /* dispose old table */  
-      MFREE (string_hash.ptr, void*, string_hash.size);
-      string_hash = newhash;
-    }
-#ifdef JOWENN_DEBUG1
-       log_text("literalstring_u2: newly created");
-/*     utf_display(javastring_toutf(js,0));*/
-#endif
-                       
-    return (java_objectheader *) js;
+               /* dispose old table */ 
+               MFREE(string_hash.ptr, void*, string_hash.size);
+               string_hash = newhash;
+       }
+
+       return (java_objectheader *) js;
 }
 
+
 /******************** Function: literalstring_new *****************************
 
     creates a new javastring with the text of the utf-symbol
@@ -1081,22 +1022,21 @@ java_objectheader *literalstring_u2 (java_chararray *a, u4 length, bool copymode
 
 *******************************************************************************/
 
-java_objectheader *literalstring_new (utf *u)
+java_objectheader *literalstring_new(utf *u)
 {
     char *utf_ptr = u->text;         /* pointer to current unicode character in utf string */
     u4 utflength  = utf_strlen(u);   /* length of utf-string if uncompressed */
     java_chararray *a;               /* u2-array constructed from utf string */
     u4 i;
-/*    log_text("literalstring_new"); */
-/*    utf_display(u);*/
-    /*if (utflength==0) while (1) sleep(60);*/
-/*    log_text("------------------");    */
+
     /* allocate memory */ 
-    a = lit_mem_alloc (sizeof(java_chararray) + sizeof(u2)*(utflength-1)+10 ); 
+    a = mem_alloc(sizeof(java_chararray) + sizeof(u2) * (utflength - 1) + 10);
+
     /* convert utf-string to u2-array */
-    for (i=0; i<utflength; i++) a->data[i] = utf_nextu2(&utf_ptr);     
+    for (i = 0; i < utflength; i++)
+               a->data[i] = utf_nextu2(&utf_ptr);
 
-    return literalstring_u2(a, utflength, false);
+    return literalstring_u2(a, utflength, 0, false);
 }
 
 
@@ -1106,23 +1046,20 @@ java_objectheader *literalstring_new (utf *u)
 
 ******************************************************************************/
 
-void literalstring_free (java_objectheader* sobj)
+void literalstring_free(java_objectheader* sobj)
 {
-       java_lang_String *s = (java_lang_String*) sobj;
+       java_lang_String *s = (java_lang_String *) sobj;
        java_chararray *a = s->value;
 
-       log_text("literalstring_free called");
-       
        /* dispose memory of java.lang.String object */
-       LFREE (s, java_lang_String);
+       FREE(s, java_lang_String);
+
        /* dispose memory of java-characterarray */
-       LFREE (a, sizeof(java_chararray) + sizeof(u2)*(a->header.size-1)); /* +10 ?? */
+       FREE(a, sizeof(java_chararray) + sizeof(u2) * (a->header.size - 1)); /* +10 ?? */
 }
 
 
-
-
-void copy_vftbl(vftbl **dest, vftbl *src)
+void copy_vftbl(vftbl_t **dest, vftbl_t *src)
 {
     *dest = src;
 #if 0
@@ -1164,7 +1101,7 @@ utf *create_methodsig(java_objectarray* types, char *retType)
     if (retType) buffer_size += strlen(retType);
 
     /* allocate buffer */
-    buffer = MNEW(u1, buffer_size);
+    buffer = MNEW(char, buffer_size);
     pos    = buffer;
     
     /* method-desciptor starts with parenthesis */
@@ -1202,6 +1139,7 @@ utf *create_methodsig(java_objectarray* types, char *retType)
                                goto next_type;
 
                        nomatch:
+                               ;
                        }
 
                        /* no primitive type and no arrayclass, so must be object */
@@ -1215,6 +1153,7 @@ utf *create_methodsig(java_objectarray* types, char *retType)
                        *pos++ = ';';
 
                next_type:
+                       ;
                }  
     }      
 
@@ -1228,7 +1167,7 @@ utf *create_methodsig(java_objectarray* types, char *retType)
 
     /* create utf-string */
     result = utf_new(buffer, (pos - buffer));
-    MFREE(buffer, u1, buffer_size);
+    MFREE(buffer, char, buffer_size);
 
     return result;
 }
@@ -1256,12 +1195,12 @@ classinfo *get_type(char **utf_ptr,char *desc_end, bool skip)
 }
 
 
-/******************************************************************************************
+/* 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
+   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) 
 {
@@ -1276,36 +1215,50 @@ java_objectarray* get_parametertypes(methodinfo *m)
     utf_nextu2(&utf_ptr);
   
     /* determine number of parameters */
-    while ( *utf_ptr != ')' ) {
-       get_type(&utf_ptr,desc_end,true);
-       parametercount++;
+    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_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);
+           result->data[i] =
+                       (java_objectheader *) get_type(&utf_ptr, desc_end, false);
 
     return result;
 }
 
 
+/* get_exceptiontypes **********************************************************
 
+   get the exceptions which can be thrown by a method
 
+*******************************************************************************/
 
-/******************************************************************************************
+java_objectarray* get_exceptiontypes(methodinfo *m)
+{
+    u2 excount;
+    u2 i;
+    java_objectarray *result;
 
-       get the exceptions which can be thrown by a method      
+       excount = m->thrownexceptionscount;
 
-*******************************************************************************************/
+    /* create class-array */
+    result = builtin_anewarray(excount, class_java_lang_Class);
 
-java_objectarray* get_exceptiontypes(methodinfo *m) 
-{
+    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;
 }
 
 
@@ -1454,9 +1407,102 @@ for (i=0;i<NATIVECALLSSIZE; i++) {
 
 return true;
 }
+
 /*--------------------------------------------------------*/
 
 
+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--;
+               }
+       }
+
+       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;
+}
+
+
+java_lang_ClassLoader *builtin_asm_getclassloader(classinfo **end, classinfo **start)
+{
+#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();
+
+        return SystemClassLoader;*/
+}
+
+
 /*
  * These are local overrides for various environment variables in Emacs.
  * Please do not remove this and leave it at the end of the file, where