fixed loging crash caused by printf
[cacao.git] / src / native / native.c
index 771ec540673f4dda2ab69f6f942ee78d412b30cb..b4b01001fb8752fa7df5bf648440bf4fa7322178 100644 (file)
-/****************************** native.c ***************************************
+/* native.c - table of native functions
 
-       Copyright (c) 1997 A. Krall, R. Grafl, M. Gschwind, M. Probst
+   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
 
-       See file COPYRIGHT for information on usage and disclaimer of warranties
+   This file is part of CACAO.
 
-       Enth"alt die Tabellen f"ur die native-methods.
-       Die vom Headerfile-Generator erzeugten -.hh - Dateien werden hier
-       eingebunden, und ebenso alle C-Funktionen, mit denen diese
-       Methoden implementiert werden.
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2, or (at
+   your option) any later version.
 
-       Authors: Reinhard Grafl      EMAIL: cacao@complang.tuwien.ac.at
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
 
-       Last Change: 1996/11/14
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
 
-*******************************************************************************/
+   Contact: cacao@complang.tuwien.ac.at
+
+   Authors: Reinhard Grafl
+            Roman Obermaisser
+            Andreas Krall
+
+   The .hh files created with the header file generator are all
+   included here as are the C functions implementing these methods.
+
+   $Id: native.c 730 2003-12-11 21:23:31Z edwin $
+
+*/
 
+
+#include <stdlib.h>
 #include <unistd.h>
 #include <time.h>
+#include <math.h>
+#include <string.h>
+#include <assert.h>
+#include <sys/time.h>
+#include <utime.h>
 
-
+#include "config.h"
 #include "global.h"
+#include "jni.h"
 #include "native.h"
-
-#include "builtin.h"
 #include "nativetypes.hh"
+#include "builtin.h"
 #include "asmpart.h"
 #include "tables.h"
 #include "loader.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>
+#include <dirent.h>
+#include <sys/types.h>
+#ifdef _OSF_SOURCE 
+#include <sys/mode.h>
+#endif
+#include <sys/stat.h>
+
+#include "threads/threadio.h"
+
+/* 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_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;
 
+/************* 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);
 
-static char *classpath;
-
-
-/******************** die f"r die native-Methoden n"otigen Systemklassen *****/
-
-static classinfo *class_java_lang_Class;
-static classinfo *class_java_lang_Cloneable;
-static classinfo *class_java_lang_CloneNotSupportedException;
-static classinfo *class_java_lang_Double;
-static classinfo *class_java_lang_Float;
-static classinfo *class_java_io_IOException;
-static classinfo *class_java_lang_ClassNotFoundException;
-static classinfo *class_java_lang_InstantiationException;
+                       if (!vmo) panic("Error while creating instance of java/lang/VMClass");
+                       asm_calljavamethod(method_vmclass_init, vmo, c, NULL, NULL);
+                       c->vmClass = (java_lang_VMClass *) vmo;
+                       /*log_text("VMCLASS has been attached");*/
+               }
+       }
+}
 
 
+/*************************** include native methods ***************************/ 
 
-/************************** alle Funktionen einbinden ************************/ 
+#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
 
-#include "nat/lang.c"
-#include "nat/io.c"
-#include "nat/util.c"
 
+/************************** tables for methods ********************************/
 
-/********************** Tabellen f"ur die Methoden ***************************/
+#undef JOWENN_DEBUG
+#undef JOWENN_DEBUG1
 
+/* table for locating native methods */
 static struct nativeref {
        char *classname;
        char *methodname;
@@ -73,257 +203,919 @@ static struct nativeref {
 
 #define NATIVETABLESIZE  (sizeof(nativetable)/sizeof(struct nativeref))
 
+/* table for fast string comparison */
 static struct nativecompref {
-       unicode *classname;
-       unicode *methodname;
-       unicode *descriptor;
+       utf *classname;
+       utf *methodname;
+       utf *descriptor;
        bool isstatic;
        functionptr func;
-       } nativecomptable [NATIVETABLESIZE];
+} nativecomptable [NATIVETABLESIZE];
 
+/* string comparsion table initialized */
 static bool nativecompdone = false;
 
 
-/*********************** Funktion: native_loadclasses **************************
+/******************************************************************************/
+/******************************************************************************/
+#include "natcalls.h"
+
+/* string call comparison table initialized */
+
+/******************************************************************************/
+/******************************************************************************/
+
+/*--------------- native method calls & classes used -------------------------*/
+
+
+
+
+/*********************** function: native_loadclasses **************************
 
-       L"adt alle Klassen, die die native Methoden zus"atzlich ben"otigen 
+       load classes required for native methods        
 
 *******************************************************************************/
 
 void native_loadclasses()
 {
-       class_java_lang_Cloneable = 
-               loader_load ( unicode_new_char ("java/lang/Cloneable") );
+       static int classesLoaded=0; /*temporary hack JoWenn*/
+       if (classesLoaded) return;
+       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*/
+       /* 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 = 
-               loader_load ( unicode_new_char ("java/lang/CloneNotSupportedException") );
-       class_java_lang_Class =
-               loader_load ( unicode_new_char ("java/lang/Class") );
-       class_java_lang_Double =
-               loader_load ( unicode_new_char ("java/lang/Double") );
-       class_java_lang_Float =
-               loader_load ( unicode_new_char ("java/lang/Float") );
+               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 = 
-               loader_load ( unicode_new_char ("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_ClassNotFoundException =
-               loader_load ( unicode_new_char ("java/lang/ClassNotFoundException") );
-       class_java_lang_InstantiationException=
-               loader_load ( unicode_new_char ("java/lang/InstantiationException") );
+               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"));
+
+       /* 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_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");
+}
+
+
+/*************** adds a class to the vector of loaded classes ****************/
+
+void systemclassloader_addclass(classinfo *c)
+{
+       methodinfo *m;
+
+       /* 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_calljavamethod(m,
+                                          (java_objectheader*) SystemClassLoader, 
+                                          (java_objectheader*) c,
+                                          NULL,  
+                                          NULL
+                                          );
+}
+
+/*************** adds a library to the vector of loaded libraries *************/
+
+void systemclassloader_addlibrary(java_objectheader *o)
+{
+       log_text("systemclassloader_addlibrary");
+}
+
+/*****************************************************************************
+
+       create systemclassloader object and initialize instance fields  
+
+******************************************************************************/
+
+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");
+}
+
+
+/********************* 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_calljavamethod(m,
+                                          GetStaticObjectField(&env,class_java_lang_ClassLoader,id),
+                                          o,
+                                          NULL,  
+                                          NULL
+                                          );       
 }
 
-/********************* Funktion: native_setclasspath ***************************/
+
+/********************* function: native_setclasspath **************************/
  
 void native_setclasspath (char *path)
 {
+       /* set searchpath for classfiles */
        classpath = path;
 }
 
 
-/*********************** Funktion: native_findfunction ************************
+/***************** function: throw_classnotfoundexception *********************/
+
+void throw_classnotfoundexception()
+{
+       dolog("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);
+       dolog("set exceptionptr");
+}
+
+
+void throw_classnotfoundexception2(utf* classname)
+{
+       dolog("throw_classnotfoundexception2");
+       log_plain("Class: "); log_plain_utf(classname); log_nl();
+       
+       if (!class_java_lang_ClassNotFoundException) {
+               panic("java.lang.ClassNotFoundException not found. Maybe wrong classpath?");
+       }
+
+       /* throws a ClassNotFoundException with message */
+       exceptionptr = native_new_and_init_string(class_java_lang_ClassNotFoundException,
+                                                                                         javastring_new(classname));
+       dolog("set exceptionptr");
+}
+
+void throw_linkageerror2(utf* classname)
+{
+       dolog("throw_linkageerror2");
+       log_plain("Class: "); log_plain_utf(classname); log_nl();
+       
+       if (!class_java_lang_LinkageError) {
+               panic("java.lang.LinkageError not found. Maybe wrong classpath?");
+       }
+
+       /* throws a ClassNotFoundException with message */
+       exceptionptr = native_new_and_init_string(class_java_lang_LinkageError,
+                                                                                         javastring_new(classname));
+       dolog("set exceptionptr");
+}
+
 
-       Sucht in der Tabelle die passende Methode (muss mit Klassennamen,
-       Methodennamen, Descriptor und 'static'-Status "ubereinstimmen),
-       und gibt den Funktionszeiger darauf zur"uck.
-       Return: Funktionszeiger oder NULL  (wenn es keine solche Methode gibt)
+/*********************** Function: native_findfunction *************************
 
-       Anmerkung: Zu Beschleunigung des Suchens werden die als C-Strings
-          vorliegenden Namen/Descriptors in entsprechende unicode-Symbole
-          umgewandelt (beim ersten Aufruf dieser Funktion).
+       Looks up a method (must have the same class name, method name, descriptor
+       and 'static'ness) and returns a function pointer to it.
+       Returns: function pointer or NULL (if there is no such method)
+
+       Remark: For faster operation, the names/descriptors are converted from C
+               strings to Unicode the first time this function is called.
 
 *******************************************************************************/
 
-functionptr native_findfunction (unicode *cname, unicode *mname, 
-                                 unicode *desc, bool isstatic)
+functionptr native_findfunction(utf *cname, utf *mname, 
+                                                               utf *desc, bool isstatic)
 {
-       u4 i;
+       int i;
+       /* entry of table for fast string comparison */
        struct nativecompref *n;
+       /* for warning message if no function is found */
+       char *buffer;                   
+       int buffer_len;
 
        isstatic = isstatic ? true : false;
-
+       
        if (!nativecompdone) {
-               for (i=0; i<NATIVETABLESIZE; i++) {
-                       nativecomptable[i].classname   = 
-                                       unicode_new_char(nativetable[i].classname);
-                       nativecomptable[i].methodname  = 
-                                       unicode_new_char(nativetable[i].methodname);
-                       nativecomptable[i].descriptor  = 
-                                       unicode_new_char(nativetable[i].descriptor);
-                       nativecomptable[i].isstatic    = 
-                                       nativetable[i].isstatic;
-                       nativecomptable[i].func        = 
-                                       nativetable[i].func;
-                       }
-               nativecompdone = true;
+               for (i = 0; i < NATIVETABLESIZE; i++) {
+                       nativecomptable[i].classname  = 
+                               utf_new_char(nativetable[i].classname);
+                       nativecomptable[i].methodname = 
+                               utf_new_char(nativetable[i].methodname);
+                       nativecomptable[i].descriptor = 
+                               utf_new_char(nativetable[i].descriptor);
+                       nativecomptable[i].isstatic   = 
+                               nativetable[i].isstatic;
+                       nativecomptable[i].func       = 
+                               nativetable[i].func;
                }
+               nativecompdone = true;
+       }
+
+#ifdef JOWENN_DEBUG
+       buffer_len = 
+         utf_strlen(cname) + utf_strlen(mname) + utf_strlen(desc) + 64;
+       
+       buffer = MNEW(char, buffer_len);
+
+       strcpy(buffer, "searching matching function in native table:");
+        utf_sprint(buffer+strlen(buffer), mname);
+       strcpy(buffer+strlen(buffer), ": ");
+        utf_sprint(buffer+strlen(buffer), desc);
+       strcpy(buffer+strlen(buffer), " for class ");
+        utf_sprint(buffer+strlen(buffer), cname);
 
-       for (i=0; i<NATIVETABLESIZE; i++) {
+       log_text(buffer);       
+
+       MFREE(buffer, char, buffer_len);
+#endif
+               
+       for (i = 0; i < NATIVETABLESIZE; i++) {
                n = &(nativecomptable[i]);
 
-               if (cname==n->classname && mname==n->methodname &&
-                   desc==n->descriptor && isstatic==n->isstatic)  return n->func;
-               }
+               if (cname == n->classname && mname == n->methodname &&
+                   desc == n->descriptor && isstatic == n->isstatic)
+                       return n->func;
+#ifdef JOWENN_DEBUG
+                       else {
+                               if (cname == n->classname && mname == n->methodname )  log_text("static and descriptor mismatch");
+                       
+                               else {
+                                       buffer_len = 
+                                         utf_strlen(n->classname) + utf_strlen(n->methodname) + utf_strlen(n->descriptor) + 64;
+       
+                                       buffer = MNEW(char, buffer_len);
 
+                                       strcpy(buffer, "comparing with:");
+                                       utf_sprint(buffer+strlen(buffer), n->methodname);
+                                       strcpy (buffer+strlen(buffer), ": ");
+                                       utf_sprint(buffer+strlen(buffer), n->descriptor);
+                                       strcpy(buffer+strlen(buffer), " for class ");
+                                       utf_sprint(buffer+strlen(buffer), n->classname);
+
+                                       log_text(buffer);       
+
+                                       MFREE(buffer, char, buffer_len);
+                       
+                               }
+                       } 
+#endif
+       }
+
+               
+       /* no function was found, display warning */
+
+       buffer_len = 
+               utf_strlen(cname) + utf_strlen(mname) + utf_strlen(desc) + 64;
+
+       buffer = MNEW(char, buffer_len);
+
+       strcpy(buffer, "warning: native function ");
+       utf_sprint(buffer + strlen(buffer), mname);
+       strcpy(buffer + strlen(buffer), ": ");
+       utf_sprint(buffer + strlen(buffer), desc);
+       strcpy(buffer + strlen(buffer), " not found in class ");
+       utf_sprint(buffer + strlen(buffer), cname);
+
+       log_text(buffer);       
+
+       MFREE(buffer, char, buffer_len);
+
+
+       exit(1);
+
+       
        return NULL;
 }
 
 
-/********************** Funktion: javastring_new *****************************
+/********************** function: javastring_new *******************************
 
-       Legt ein neues Objekt vom Typ java/lang/String an, und tr"agt als Text
-       das "ubergebene unicode-Symbol ein. 
-       Return: Zeiger auf den String, oder NULL (wenn Speicher aus)
+       creates a new object of type java/lang/String with the text of 
+       the specified utf8-string
 
-*****************************************************************************/
+       return: pointer to the string or NULL if memory is exhausted.   
+
+*******************************************************************************/
 
-java_objectheader *javastring_new (unicode *text)
+java_objectheader *javastring_new (utf *u)
 {
-       u4 i;
-       java_lang_String *s;
+       char *utf_ptr = u->text;        /* current utf character in utf string    */
+       int utflength = utf_strlen(u);  /* 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);
-       a = builtin_newarray_char (text->length);
+       a = builtin_newarray_char (utflength);
 
-       if ( (!a) || (!s) ) return NULL;
+       /* javastring or character-array could not be created */
+       if ((!a) || (!s))
+               return NULL;
 
-       for (i=0; i<text->length; i++) a->data[i] = text->text[i];
-       s -> value = a;
-       s -> offset = 0;
-       s -> count = text->length;
+       /* decompress utf-string */
+       for (i = 0; i < utflength; i++)
+               a->data[i] = utf_nextu2(&utf_ptr);
+       
+       /* set fields of the javastring-object */
+       s->value  = a;
+       s->offset = 0;
+       s->count  = utflength;
 
        return (java_objectheader*) s;
 }
 
+/********************** function: javastring_new_char **************************
 
-/********************** Funktion: javastring_new_char ************************
+       creates a new java/lang/String object which contains the convertet
+       C-string passed via text.
 
-       Legt ein neues Objekt vom Typ java/lang/String an, und tr"agt als Text
-       den "ubergebenen C-String ein. 
-       Return: Zeiger auf den String, oder NULL (wenn Speicher aus)
+       return: the object pointer or NULL if memory is exhausted.
 
-*****************************************************************************/
+*******************************************************************************/
 
 java_objectheader *javastring_new_char (char *text)
 {
-       u4 i;
-       u4 len = strlen(text);
-       java_lang_String *s;
+       s4 i;
+       s4 len = strlen(text); /* 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);
        a = builtin_newarray_char (len);
 
-       if ( (!a) || (!s) ) return NULL;
+       /* javastring or character-array could not be created */
+       if ((!a) || (!s)) return NULL;
 
-       for (i=0; i<len; i++) a->data[i] = text[i];
-       s -> value = a;
-       s -> offset = 0;
-       s -> count = len;
+       /* copy text */
+       for (i = 0; i < len; i++)
+               a->data[i] = text[i];
+       
+       /* set fields of the javastring-object */
+       s->value = a;
+       s->offset = 0;
+       s->count = len;
 
        return (java_objectheader*) s;
 }
 
 
-/************************* Funktion: javastring_tochar *****************************
+/************************* function javastring_tochar **************************
 
-       Macht aus einem java-string einen C-String, und liefert den Zeiger
-       darauf zur"uck. 
-       Achtung: Beim n"achsten Aufruf der Funktion wird der vorige String 
-       "uberschrieben
+       converts a Java string into a C string.
+       
+       return: pointer to C string
        
-***********************************************************************************/
+       Caution: every call of this function overwrites the previous string !!!
+       
+*******************************************************************************/
 
-#define MAXSTRINGSIZE 1000
-char stringbuffer[MAXSTRINGSIZE];
+static char stringbuffer[MAXSTRINGSIZE];
 
 char *javastring_tochar (java_objectheader *so) 
 {
        java_lang_String *s = (java_lang_String*) so;
        java_chararray *a;
-       u4 i;
+       s4 i;
        
-       if (!s) return "";
+       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];
+       if (!a)
+               return "";
+       if (s->count > MAXSTRINGSIZE)
+               return "";
+       for (i = 0; i < s->count; i++)
+               stringbuffer[i] = a->data[s->offset+i];
        stringbuffer[i] = '\0';
        return stringbuffer;
 }
 
 
-/******************** Funktion: native_new_and_init *************************
+/****************** function class_findfield_approx ****************************
+       
+       searches in 'classinfo'-structure for a field with the
+       specified name
+
+*******************************************************************************/
+fieldinfo *class_findfield_approx(classinfo *c, utf *name)
+{
+       s4 i;
+       for (i = 0; i < c->fieldscount; i++) {
+               /* compare field names */
+               if ((c->fields[i].name == name))
+                       return &(c->fields[i]);
+       }
+
+       /* field was not found, raise exception */      
+       exceptionptr = 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;
+}
 
-       Legt ein neues Objekt einer Klasse am Heap an, und ruft automatisch
-       die Initialisierungsmethode auf.
-       Return: Der Zeiger auf das Objekt, oder NULL, wenn kein Speicher
-                       mehr frei ist.
+
+/********************** function: native_new_and_init *************************
+
+       Creates a new object on the heap and calls the initializer.
+       Returns the object pointer or NULL if memory is exhausted.
                        
-*****************************************************************************/
+*******************************************************************************/
 
-java_objectheader *native_new_and_init (classinfo *c)
+java_objectheader *native_new_and_init(classinfo *c)
 {
        methodinfo *m;
-       java_objectheader *o = builtin_new (c);
+       java_objectheader *o;
 
-       if (!o) return NULL;
+       /* if c==NULL it is probebly because loader_load failed */
+       if (!c) return exceptionptr;
+
+       o = builtin_new(c);          /* create object          */
        
-       m = class_findmethod (c, 
-                             unicode_new_char ("<init>"), 
-                             unicode_new_char ("()V"));
-       if (!m) {
-               log_text ("warning: class has no instance-initializer:");
-               unicode_sprint (logtext, c->name);
-               dolog();
-               return o;
+        /*
+       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"));
+                                                     
+       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_calljavamethod(m, o, NULL, NULL, NULL);
 
-       asm_calljavamethod (m, o,NULL,NULL,NULL);
        return o;
 }
 
 
-/********************* Funktion: literalstring_new ****************************
+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;
 
-       erzeugt einen Java-String mit dem angegebenen Text, allerdings nicht
-       auf dem HEAP, sondern in einem anderen Speicherbereich (der String
-       muss dann sp"ater explizit wieder freigegeben werden).
-       Alle Strings, die auf diese Art erzeugt werden, werden in einer
-       gemeinsamen Struktur gespeichert (n"amlich auch "uber die
-       Unicode-Hashtabelle), sodass identische Strings auch wirklich den
-       gleichen Zeiger liefern.
+       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);
+                       log_text(logtext);
+               }
+               return o;
+       }
+
+       /* call initializer */
+
+       asm_calljavamethod(m, o, s, NULL, NULL);
 
-java_objectheader *literalstring_new (unicode *text)
+       return o;
+}
+
+
+/******************** function: stringtable_update ****************************
+
+       traverses the javastring hashtable and sets the vftbl-entries of
+       javastrings which were temporarily set to NULL, because 
+       java.lang.Object was not yet loaded
+
+*******************************************************************************/
+void stringtable_update ()
 {
-       u4 i;
-       java_lang_String *s;
+       java_lang_String *js;   
        java_chararray *a;
+       literalstring *s;       /* hashtable entry */
+       int i;
+
+       for (i = 0; i < string_hash.size; i++) {
+               s = string_hash.ptr[i];
+               if (s) {
+                       while (s) {
+                                                               
+                               js = (java_lang_String *) s->string;
+                               
+                               if (!js || !(a = js->value)) 
+                                       /* error in hashtable found */
+                                       panic("invalid literalstring in hashtable");
+
+                               if (!js->header.vftbl) 
+                                       /* vftbl of javastring is NULL */ 
+                                       js->header.vftbl = class_java_lang_String -> vftbl;
+
+                               if (!a->header.objheader.vftbl) 
+                                       /* vftbl of character-array is NULL */ 
+                                       a->header.objheader.vftbl = primitivetype_table[ARRAYTYPE_CHAR].arrayvftbl;
+
+                               /* follow link in external hash chain */
+                               s = s->hashlink;
+                       }       
+               }               
+       }
+}
 
-       if (text->string) return text->string;
+
+/************************* function: u2_utflength ***************************
+
+       returns the utf length in bytes of a u2 array 
+
+*****************************************************************************/
+
+
+u4 u2_utflength(u2 *text, u4 u2_length)
+{
+       u4 result_len =  0;  /* utf length in bytes  */
+       u2 ch;               /* current unicode character */
+       u4 len;
        
-       a = lit_mem_alloc (sizeof(java_chararray) + sizeof(u2)*(text->length-1) );
-       a -> header.objheader.vftbl = class_array -> vftbl;
-       a -> header.size = text->length;
-       a -> header.arraytype = ARRAYTYPE_CHAR;
-       for (i=0; i<text->length; i++) a->data[i] = text->text[i];
-
-       s = LNEW (java_lang_String);
-       s -> header.vftbl = class_java_lang_String -> vftbl;
-       s -> value = a;
-       s -> offset = 0;
-       s -> count = text->length;
-
-       unicode_setstringlink (text, (java_objectheader*) s);
-       return (java_objectheader*) s;
+        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;    
+       }
+
+    return result_len;
 }
 
+/********************* function: utf_new_u2 ***********************************
+
+       make utf symbol from u2 array, 
+       if isclassname is true '.' is replaced by '/'
 
-/********************** Funktion: literalstring_free **************************
+*******************************************************************************/
+
+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  */
+       utf *result;  /* resulting utf-string */
+       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);
+       /* memory allocation failed */
+       if (!buffer) {
+               printf("length: %d\n",buflength);
+               log_text("utf_new_u2:buffer==NULL");
+       }
+
+       left = buflength;
+       pos  = buffer;
+
+       for (i = 0; i++ < unicode_length; unicode_pos++) {
+               /* next unicode character */
+               u2 c = *unicode_pos;
+               
+               if ((c != 0) && (c < 0x80)) {
+               /* 1 character */       
+               left--;
+               if ((int) left < 0) break;
+               /* convert classname */
+               if (isclassname && c=='.') 
+                 *pos++ = '/';
+               else
+                 *pos++ = (char) c;
+               } else if (c < 0x800) {             
+               /* 2 characters */                              
+               unsigned char high = c >> 6;
+               unsigned char low  = c & 0x3F;
+               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;
+               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);
+       return result;
+}
 
-       L"oscht einen Java-String wieder aus dem Speicher (wird zu Systemende
-       vom Hashtabellen-Verwalter aufgerufen)
+/********************* function: javastring_toutf *****************************
+
+       make utf symbol from javastring
+
+*******************************************************************************/
+
+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);*/
+       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 
+    the string hashtable, if there is no such string a new one is 
+    created 
+
+    if copymode is true a copy of the u2-array is made
+
+*******************************************************************************/
+
+java_objectheader *literalstring_u2 (java_chararray *a, u4 length, 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;  
+    u2 i;
+
+#if JOWENN_DEBUG1
+    printf("literalstring_u2: length: %d\n",length);    
+    log_text("literalstring_u2");
+#endif
+    
+    /* find location in hashtable */
+    key  = unicode_hashkey (a->data, 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));
+#endif
+       return (java_objectheader *) js;
+      }
+
+      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;
+
+    /* 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 */
+      
+      /* 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);
+         
+         s->hashlink = newhash.ptr[slot];
+         newhash.ptr[slot] = s;
+       
+         /* 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;
+}
+
+/******************** Function: literalstring_new *****************************
+
+    creates a new javastring with the text of the utf-symbol
+    and inserts it into the string hashtable
+
+*******************************************************************************/
+
+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 ); 
+    /* convert utf-string to u2-array */
+    for (i=0; i<utflength; i++) a->data[i] = utf_nextu2(&utf_ptr);     
+
+    return literalstring_u2(a, utflength, false);
+}
+
+
+/********************** function: literalstring_free **************************
+
+        removes a javastring from memory                      
 
 ******************************************************************************/
 
@@ -331,10 +1123,341 @@ void literalstring_free (java_objectheader* 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);
-       LFREE (a, sizeof(java_chararray) + sizeof(u2)*(a->header.size-1));
+       /* dispose memory of java-characterarray */
+       LFREE (a, sizeof(java_chararray) + sizeof(u2)*(a->header.size-1)); /* +10 ?? */
 }
 
 
 
+
+void copy_vftbl(vftbl **dest, vftbl *src)
+{
+    *dest = src;
+#if 0
+    /* XXX this kind of copying does not work (in the general
+     * case). The interface tables would have to be copied, too. I
+     * don't see why we should make a copy anyway. -Edwin
+     */
+       *dest = mem_alloc(sizeof(vftbl) + sizeof(methodptr)*(src->vftbllength-1));
+       memcpy(*dest, src, sizeof(vftbl) - sizeof(methodptr));
+       memcpy(&(*dest)->table, &src->table, src->vftbllength * sizeof(methodptr));
+#endif
+}
+
+
+/******************************************************************************************                                                                                                            
+
+       creates method signature (excluding return type) from array of 
+       class-objects representing the parameters of the method 
+
+*******************************************************************************************/
+
+
+utf *create_methodsig(java_objectarray* types, char *retType)
+{
+    char *buffer;       /* buffer for building the desciptor */
+    char *pos;          /* current position in buffer */
+    utf *result;        /* the method signature */
+    u4 buffer_size = 3; /* minimal size=3: room for parenthesis and returntype */
+    u4 i, j;
+    if (!types) return NULL;
+
+    /* determine required buffer-size */    
+    for (i=0;i<types->header.size;i++) {
+      classinfo *c = (classinfo *) types->data[i];
+      buffer_size  = buffer_size + c->name->blength+2;
+    }
+
+    if (retType) buffer_size+=strlen(retType);
+
+    /* allocate buffer */
+    buffer = MNEW(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 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);
+}
+
+
+/*****************************************************************************/
+/*****************************************************************************/
+
+
+/*--------------------------------------------------------*/
+void printNativeCall(nativeCall nc) {
+  int i,j;
+
+  printf("\n%s's Native Methods call:\n",nc.classname); fflush(stdout);
+  for (i=0; i<nc.methCnt; i++) {  
+      printf("\tMethod=%s %s\n",nc.methods[i].methodname, nc.methods[i].descriptor);fflush(stdout);
+
+    for (j=0; j<nc.callCnt[i]; j++) {  
+        printf("\t\t<%i,%i>aCalled = %s %s %s\n",i,j,
+       nc.methods[i].methodCalls[j].classname, 
+       nc.methods[i].methodCalls[j].methodname, 
+       nc.methods[i].methodCalls[j].descriptor);fflush(stdout);
+      }
+    }
+  printf("-+++++--------------------\n");fflush(stdout);
+}
+
+/*--------------------------------------------------------*/
+void printCompNativeCall(nativeCompCall nc) {
+  int i,j;
+  printf("printCompNativeCall BEGIN\n");fflush(stdout); 
+  printf("\n%s's Native Comp Methods call:\n",nc.classname->text);fflush(stdout);
+  utf_display(nc.classname); fflush(stdout);
+  
+  for (i=0; i<nc.methCnt; i++) {  
+    printf("\tMethod=%s %s\n",nc.methods[i].methodname->text,nc.methods[i].descriptor->text);fflush(stdout);
+    utf_display(nc.methods[i].methodname); fflush(stdout);
+    utf_display(nc.methods[i].descriptor);fflush(stdout);
+    printf("\n");fflush(stdout);
+
+    for (j=0; j<nc.callCnt[i]; j++) {  
+      printf("\t\t<%i,%i>bCalled = ",i,j);fflush(stdout);
+       utf_display(nc.methods[i].methodCalls[j].classname);fflush(stdout);
+       utf_display(nc.methods[i].methodCalls[j].methodname); fflush(stdout);
+       utf_display(nc.methods[i].methodCalls[j].descriptor);fflush(stdout);
+       printf("\n");fflush(stdout);
+      }
+    }
+printf("---------------------\n");fflush(stdout);
+}
+
+
+/*--------------------------------------------------------*/
+classMeth findNativeMethodCalls(utf *c, utf *m, utf *d ) 
+{
+    int i = 0;
+    int j = 0;
+    int cnt = 0;
+    classMeth mc;
+    mc.i_class = i;
+    mc.j_method = j;
+    mc.methCnt = cnt;
+
+    return mc;
+}
+
+/*--------------------------------------------------------*/
+nativeCall* findNativeClassCalls(char *aclassname ) {
+int i;
+
+for (i=0;i<NATIVECALLSSIZE; i++) {
+   /* convert table to utf later to speed up search */ 
+   if (strcmp(nativeCalls[i].classname, aclassname) == 0) 
+       return &nativeCalls[i];
+   }
+
+return NULL;
+}
+/*--------------------------------------------------------*/
+/*--------------------------------------------------------*/
+void utfNativeCall(nativeCall nc, nativeCompCall *ncc) {
+  int i,j;
+
+
+  ncc->classname = utf_new_char(nc.classname); 
+  ncc->methCnt = nc.methCnt;
+  
+  for (i=0; i<nc.methCnt; i++) {  
+    ncc->methods[i].methodname = utf_new_char(nc.methods[i].methodname);
+    ncc->methods[i].descriptor = utf_new_char(nc.methods[i].descriptor);
+    ncc->callCnt[i] = nc.callCnt[i];
+
+    for (j=0; j<nc.callCnt[i]; j++) {  
+
+       ncc->methods[i].methodCalls[j].classname  = utf_new_char(nc.methods[i].methodCalls[j].classname);
+
+        if (strcmp("", nc.methods[i].methodCalls[j].methodname) != 0) {
+          ncc->methods[i].methodCalls[j].methodname = utf_new_char(nc.methods[i].methodCalls[j].methodname);
+          ncc->methods[i].methodCalls[j].descriptor = utf_new_char(nc.methods[i].methodCalls[j].descriptor);
+          }
+        else {
+          ncc->methods[i].methodCalls[j].methodname = NULL;
+          ncc->methods[i].methodCalls[j].descriptor = NULL;
+          }
+      }
+    }
+}
+
+
+
+/*--------------------------------------------------------*/
+
+bool natcall2utf(bool natcallcompdone) {
+int i;
+
+if (natcallcompdone) 
+       return true;
+
+for (i=0;i<NATIVECALLSSIZE; i++) {
+   utfNativeCall  (nativeCalls[i], &nativeCompCalls[i]);  
+   }
+
+return true;
+}
+/*--------------------------------------------------------*/
+
+
+/*
+ * These are local overrides for various environment variables in Emacs.
+ * Please do not remove this and leave it at the end of the file, where
+ * Emacs will automagically detect them.
+ * ---------------------------------------------------------------------
+ * Local variables:
+ * mode: c
+ * indent-tabs-mode: t
+ * c-basic-offset: 4
+ * tab-width: 4
+ * End:
+ */