nativeLoad remove #ifdef JOWENNDEBUG
[cacao.git] / native.c
index 5878b59865eef759ae01f51fd48f05b80b27d384..68f3714924c78870b3e70e99f213519c8231875d 100644 (file)
--- a/native.c
+++ b/native.c
@@ -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 1173 2004-06-16 14:56:18Z jowenn $
+   $Id: native.c 1429 2004-11-02 08:58:26Z jowenn $
 
 */
 
 #include <utime.h>
 
 #include "config.h"
+#include "exceptions.h"
 #include "global.h"
-#include "main.h"
+#include "options.h"
 #include "jni.h"
 #include "native.h"
-#include "nativetypes.hh"
 #include "builtin.h"
 #include "asmpart.h"
 #include "tables.h"
 
 #include "threads/threadio.h"
 
-/* searchpath for classfiles */
-char *classpath;
+/* include table of native functions */
+
+#include "nativetable.inc"
+
 
 /* for java-string to char conversion */
 #define MAXSTRINGSIZE 1000                          
@@ -105,110 +107,6 @@ classinfo *class_java_lang_Integer;
 methodinfo *method_vmclass_init;
 
 
-/* system exception classes required while compiling */
-
-classinfo *class_java_lang_Throwable;
-
-
-/* exception/error super class */
-
-char *string_java_lang_Throwable =
-    "java/lang/Throwable";
-
-char *string_java_lang_VMThrowable =
-    "java/lang/VMThrowable";
-
-
-/* specify some exception strings for code generation */
-
-char *string_java_lang_ArithmeticException =
-    "java/lang/ArithmeticException";
-
-char *string_java_lang_ArithmeticException_message =
-    "/ by zero";
-
-char *string_java_lang_ArrayIndexOutOfBoundsException =
-    "java/lang/ArrayIndexOutOfBoundsException";
-
-char *string_java_lang_ArrayStoreException =
-    "java/lang/ArrayStoreException";
-
-char *string_java_lang_ClassCastException =
-    "java/lang/ClassCastException";
-
-char *string_java_lang_ClassNotFoundException =
-       "java/lang/ClassNotFoundException";
-
-char *string_java_lang_CloneNotSupportedException =
-    "java/lang/CloneNotSupportedException";
-
-char *string_java_lang_Exception =
-    "java/lang/Exception";
-
-char *string_java_lang_IllegalArgumentException =
-    "java/lang/IllegalArgumentException";
-
-char *string_java_lang_IllegalMonitorStateException =
-    "java/lang/IllegalMonitorStateException";
-
-char *string_java_lang_NegativeArraySizeException =
-    "java/lang/NegativeArraySizeException";
-
-char *string_java_lang_NoSuchFieldException =
-       "java/lang/NoSuchFieldException";
-
-char *string_java_lang_NoSuchMethodException =
-       "java/lang/NoSuchMethodException";
-
-char *string_java_lang_NullPointerException =
-    "java/lang/NullPointerException";
-
-
-/* specify some error strings for code generation */
-
-char *string_java_lang_AbstractMethodError =
-    "java/lang/AbstractMethodError";
-
-char *string_java_lang_ClassCircularityError =
-    "java/lang/ClassCircularityError";
-
-char *string_java_lang_ClassFormatError =
-    "java/lang/ClassFormatError";
-
-char *string_java_lang_Error =
-    "java/lang/Error";
-
-char *string_java_lang_ExceptionInInitializerError =
-    "java/lang/ExceptionInInitializerError";
-
-char *string_java_lang_IncompatibleClassChangeError =
-    "java/lang/IncompatibleClassChangeError";
-
-char *string_java_lang_InternalError =
-    "java/lang/InternalError";
-
-char *string_java_lang_LinkageError =
-    "java/lang/LinkageError";
-
-char *string_java_lang_NoClassDefFoundError =
-    "java/lang/NoClassDefFoundError";
-
-char *string_java_lang_NoSuchFieldError =
-       "java/lang/NoSuchFieldError";
-
-char *string_java_lang_NoSuchMethodError =
-       "java/lang/NoSuchMethodError";
-
-char *string_java_lang_OutOfMemoryError =
-    "java/lang/OutOfMemoryError";
-
-char *string_java_lang_VerifyError =
-    "java/lang/VerifyError";
-
-char *string_java_lang_VirtualMachineError =
-    "java/lang/VirtualMachineError";
-
-
 /* the system classloader object */
 struct java_lang_ClassLoader *SystemClassLoader = NULL;
 
@@ -222,9 +120,8 @@ java_objectheader* _exceptionptr = NULL;
 void use_class_as_object(classinfo *c) 
 {
        if (!c->classvftbl) {
-               c->classvftbl = true;
-
                c->header.vftbl = class_java_lang_Class->vftbl;
+               c->classvftbl = true;
        }
             
 }
@@ -238,7 +135,6 @@ void use_class_as_object(classinfo *c)
 #include "nat/GdkPixbufDecoder.c"
 #include "nat/GtkScrollPanePeer.c"
 #include "nat/GtkFileDialogPeer.c"
-#include "nat/GtkLabelPeer.c"
 #endif
 
 
@@ -247,303 +143,19 @@ void use_class_as_object(classinfo *c)
 #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;
-
-
-/******************************************************************************/
-/******************************************************************************/
-#include "natcalls.h"
-
-/* string call comparison table initialized */
+#endif
 
 /******************************************************************************/
-/******************************************************************************/
-
-/* init_system_exceptions *****************************************************
-
-   load, link and compile exceptions used in the system
-
-*******************************************************************************/
-
-void init_system_exceptions()
-{
-       classinfo *c;
-
-       /* java/lang/Throwable */
-
-       class_java_lang_Throwable =
-               class_new(utf_new_char(string_java_lang_Throwable));
-       class_load(class_java_lang_Throwable);
-       class_link(class_java_lang_Throwable);
-       compile_all_class_methods(class_java_lang_Throwable);
-
-       /* java/lang/VMThrowable */
-
-       c = class_new(utf_new_char(string_java_lang_VMThrowable));
-       class_load(c);
-       class_link(c);
-       compile_all_class_methods(c);
-
-       /* java/lang/ClassFormatError */
-
-       c = class_new(utf_new_char(string_java_lang_ClassFormatError));
-       class_load(c);
-       class_link(c);
-       compile_all_class_methods(c);
-
-       /* java/lang/Error */
-
-       c = class_new(utf_new_char(string_java_lang_Error));
-       class_load(c);
-       class_link(c);
-       compile_all_class_methods(c);
-
-       /* java/lang/Exception */
-
-       c = class_new(utf_new_char(string_java_lang_Exception));
-       class_load(c);
-       class_link(c);
-       compile_all_class_methods(c);
-
-       /* java/lang/IncompatibleClassChangeError */
-
-       c = class_new(utf_new_char(string_java_lang_IncompatibleClassChangeError));
-       class_load(c);
-       class_link(c);
-       compile_all_class_methods(c);
-
-       /* java/lang/LinkageError */
-
-       c = class_new(utf_new_char(string_java_lang_LinkageError));
-       class_load(c);
-       class_link(c);
-       compile_all_class_methods(c);
-
-       /* java/lang/NoClassDefFoundError */
-
-       c = class_new(utf_new_char(string_java_lang_NoClassDefFoundError));
-       class_load(c);
-       class_link(c);
-       compile_all_class_methods(c);
-
-       /* java/lang/NoSuchFieldError */
-
-       c = class_new(utf_new_char(string_java_lang_NoSuchFieldError));
-       class_load(c);
-       class_link(c);
-       compile_all_class_methods(c);
-
-       /* java/lang/NoSuchMethodError */
-
-       c = class_new(utf_new_char(string_java_lang_NoSuchMethodError));
-       class_load(c);
-       class_link(c);
-       compile_all_class_methods(c);
-
-       /* java/lang/OutOfMemoryError */
-
-       c = class_new(utf_new_char(string_java_lang_OutOfMemoryError));
-       class_load(c);
-       class_link(c);
-       compile_all_class_methods(c);
-
-       /* java/lang/VerifyError */
-
-       c = class_new(utf_new_char(string_java_lang_VerifyError));
-       class_load(c);
-       class_link(c);
-       compile_all_class_methods(c);
-
-       /* java/lang/VirtualMachineError */
-
-       c = class_new(utf_new_char(string_java_lang_VirtualMachineError));
-       class_load(c);
-       class_link(c);
-       compile_all_class_methods(c);
-}
-
-
-void compile_all_class_methods(classinfo *c)
-{
-       s4 i;
-
-       for (i = 0; i < c->methodscount; i++) {
-               (void) jit_compile(&(c->methods[i]));
-       }
-}
-
-
-void throw_exception_exit()
-{
-       java_objectheader *xptr;
-       classinfo *c;
-       methodinfo *pss;
 
-       if (*exceptionptr) {
-               xptr = *exceptionptr;
-
-               /* clear exception, because we are calling jit code again */
-               *exceptionptr = NULL;
-
-               fprintf(stderr, "Exception in thread \"main\" ");
-               fflush(stderr);
-
-               c = xptr->vftbl->class;
-
-/*             ts = class_resolveclassmethod(c, */
-/*                                                                       utf_new_char("toString"), */
-/*                                                                       utf_new_char("()Ljava/lang/String;"), */
-/*                                                                       class_java_lang_Object, */
-/*                                                                       false); */
-
-/*             if (!ts) { */
-/*                     panic("internal error"); */
-/*             } */
-
-/*             tostring = asm_calljavafunction(ts, xptr, NULL, NULL, NULL); */
-
-/*             utf_display(javastring_toutf(tostring, false)); */
-
-               pss = class_resolveclassmethod(c,
-                                                                          utf_new_char("printStackTrace"),
-                                                                          utf_new_char("()V"),
-                                                                          class_java_lang_Object,
-                                                                          false);
-
-               /* print the stacktrace */
-               if (pss) {
-                       asm_calljavafunction(pss, xptr, NULL, NULL, NULL);
-
-                       /* this normally means, we are EXTREMLY out of memory, but may be
-                          any other exception */
-                       if (*exceptionptr) {
-                               utf_fprint_classname(stderr, c->name);
-                               fprintf(stderr, "\n");
-                       }
-
-               } else {
-                       utf_fprint_classname(stderr, c->name);
-                       fprintf(stderr, ": printStackTrace()V not found!\n");
-               }
-
-               fflush(stderr);
-
-               /* good bye! */
-               exit(1);
-       }
-}
-
-
-void throw_cacao_exception_exit(char *exception, char *message)
-{
-       s4 i;
-       char *tmp;
-       s4 len;
-
-       len = strlen(exception);
-       tmp = MNEW(char, len);
-       strncpy(tmp, exception, len);
-
-       /* convert to classname */
-
-       for (i = len - 1; i >= 0; i--) {
-               if (tmp[i] == '/') tmp[i] = '.';
-       }
-
-       fprintf(stderr, "Exception in thread \"main\" %s", tmp);
-
-       MFREE(tmp, char, len);
-
-       if (strlen(message) > 0)
-               fprintf(stderr, ": %s", message);
-
-       fprintf(stderr, "\n");
-       fflush(stderr);
-
-       /* good bye! */
-       exit(1);
-}
-
-
-#define CREATENEW_EXCEPTION(ex) \
-       java_objectheader *newEx; \
-       java_objectheader *oldexception=*exceptionptr;\
-       *exceptionptr=0;\
-       newEx=ex;\
-       *exceptionptr=oldexception;\
-       return newEx;
-
-java_objectheader *new_exception(char *classname)
-{
-       classinfo *c = class_new(utf_new_char(classname));
-
-       CREATENEW_EXCEPTION(native_new_and_init(c));
-}
-
-java_objectheader *new_exception_message(char *classname, char *message)
-{
-       classinfo *c = class_new(utf_new_char(classname));
-
-       CREATENEW_EXCEPTION(native_new_and_init_string(c, javastring_new_char(message)));
-}
-
-
-java_objectheader *new_exception_throwable(char *classname, java_lang_Throwable *throwable)
-{
-       classinfo *c = class_new(utf_new_char(classname));
-
-       CREATENEW_EXCEPTION(native_new_and_init_throwable(c, throwable));
-}
-
-
-java_objectheader *new_exception_utfmessage(char *classname, utf *message)
-{
-       classinfo *c = class_new(utf_new_char(classname));
-
-       CREATENEW_EXCEPTION(native_new_and_init_string(c, javastring_new(message)));
-}
-
-
-java_objectheader *new_exception_javastring(char *classname, java_lang_String *message)
-{
-       classinfo *c = class_new(utf_new_char(classname));
-
-       CREATENEW_EXCEPTION(native_new_and_init_string(c, message));
-}
-
-
-java_objectheader *new_exception_int(char *classname, s4 i)
-{
-       classinfo *c = class_new(utf_new_char(classname));
-
-       CREATENEW_EXCEPTION(native_new_and_init_int(c, i));
-}
+#include "natcalls.h"
 
 
 /*********************** function: native_loadclasses **************************
@@ -644,15 +256,6 @@ void init_systemclassloader()
 }
 
 
-/********************* 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
@@ -667,6 +270,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;
@@ -764,6 +368,10 @@ functionptr native_findfunction(utf *cname, utf *mname,
 
        /* keep compiler happy */
        return NULL;
+#else
+/* dynamic classpath */
+  return 0;
+#endif
 }
 
 
@@ -1170,12 +778,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;
 
@@ -1257,8 +859,9 @@ java_objectheader *literalstring_u2(java_chararray *a, u4 length, u4 offset,
     literalstring *s;                /* hashtable element */
     java_lang_String *js;            /* u2-array wrapped in javastring */
     java_chararray *stringdata;      /* copy of u2-array */      
-    u4 key;   
-    u4 slot;  
+       classinfo *c;
+    u4 key;
+    u4 slot;
     u2 i;
 
 //#define DEBUG_LITERALSTRING_U2
@@ -1316,22 +919,41 @@ java_objectheader *literalstring_u2(java_chararray *a, u4 length, u4 offset,
     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 = LNEW(java_lang_String);
-       /* TWISTI */
-/*      js->header.vftbl = class_java_lang_String->vftbl; */
-    js->header.vftbl = class_load(class_new(utf_new_char("java/lang/String")))->vftbl;
+#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 numbe of hashtable entries */
+    /* update number of hashtable entries */
     string_hash.entries++;
 
     /* reorganization of hashtable */       
@@ -1340,7 +962,7 @@ java_objectheader *literalstring_u2(java_chararray *a, u4 length, u4 offset,
          the external chains is approx. 2                */  
 
                u4 i;
-               literalstring *s;     
+               literalstring *s;
                hashtable newhash; /* the new hashtable */
       
                /* create new hashtable, double the size */
@@ -1368,13 +990,6 @@ java_objectheader *literalstring_u2(java_chararray *a, u4 length, u4 offset,
                string_hash = newhash;
     }
 
-#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
-                       
     return (java_objectheader *) js;
 }
 
@@ -1423,7 +1038,7 @@ void literalstring_free(java_objectheader* sobj)
 }
 
 
-void copy_vftbl(vftbl **dest, vftbl *src)
+void copy_vftbl(vftbl_t **dest, vftbl_t *src)
 {
     *dest = src;
 #if 0
@@ -1559,12 +1174,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) 
 {
@@ -1579,33 +1194,31 @@ 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
 
-
-/******************************************************************************************
-
-       get the exceptions which can be thrown by a method      
-
-*******************************************************************************************/
+*******************************************************************************/
 
 java_objectarray* get_exceptiontypes(methodinfo *m) {
     u2 exccount=m->thrownexceptionscount;