callLongMethod - wrong return type

[cacao.git] / native.h

diff --git a/native.h b/native.h
index a36a4457266b9dbb3d1e3ab0d278d0c38c99ec7d..269c679740d626a8b611ff48741022b89fa3c842 100644 (file)
--- a/native.h
+++ b/native.h
@@ -26,7 +26,7 @@
 
    Authors: Reinhard Grafl
 
-   $Id: native.h 1001 2004-03-30 22:44:28Z twisti $
+   $Id: native.h 1361 2004-07-28 10:51:14Z twisti $
 
 */
 
@@ -38,14 +38,35 @@
 #include "jni.h"
 #include "nat/java_lang_String.h"
 #include "nat/java_lang_ClassLoader.h"
+#include "nat/java_lang_Throwable.h"
 
 
-/* searchpath for classfiles */
-extern char *classpath;
+/* table for locating native methods */
+
+typedef struct nativeref nativeref;
+typedef struct nativecompref nativecompref;
+
+struct nativeref {
+       char       *classname;
+       char       *methodname;
+       char       *descriptor;
+       bool        isstatic;
+       functionptr func;
+};
+
+/* table for fast string comparison */
+
+struct nativecompref {
+       utf        *classname;
+       utf        *methodname;
+       utf        *descriptor;
+       bool        isstatic;
+       functionptr func;
+};
+
 
 extern classinfo *class_java_lang_Class;
 extern classinfo *class_java_lang_VMClass;
-/* extern classinfo *class_java_lang_Cloneable=0; */ /* now in global.h */
 extern classinfo *class_java_lang_System;
 extern classinfo *class_java_lang_ClassLoader;
 extern classinfo *class_java_lang_Double;
@@ -59,34 +80,8 @@ extern classinfo *class_java_lang_Character;
 extern classinfo *class_java_lang_Integer;
 
 
-/* specify some exception strings for code generation */
-
-extern char *string_java_lang_ArithmeticException;
-extern char *string_java_lang_ArithmeticException_message;
-extern char *string_java_lang_ArrayIndexOutOfBoundsException;
-extern char *string_java_lang_ArrayStoreException;
-extern char *string_java_lang_ClassCastException;
-extern char *string_java_lang_ClassNotFoundException;
-extern char *string_java_lang_CloneNotSupportedException;
-extern char *string_java_lang_IllegalArgumentException;
-extern char *string_java_lang_NegativeArraySizeException;
-extern char *string_java_lang_NoSuchFieldException;
-extern char *string_java_lang_NoSuchMethodException;
-extern char *string_java_lang_NullPointerException;
-
-
-/* specify some error strings for code generation */
-
-extern char *string_java_lang_ClassFormatError;
-extern char *string_java_lang_LinkageError;
-extern char *string_java_lang_NoClassDefFoundError;
-extern char *string_java_lang_NoSuchFieldError;
-extern char *string_java_lang_NoSuchMethodError;
-extern char *string_java_lang_OutOfMemoryError;
-
-
 /* the system classloader object */
-extern struct java_lang_ClassLoader *SystemClassLoader;
+extern java_lang_ClassLoader *SystemClassLoader;
 
 /* for raising exceptions from native methods */
 /* extern java_objectheader* exceptionptr; */
@@ -94,24 +89,11 @@ extern struct java_lang_ClassLoader *SystemClassLoader;
 /* javastring-hashtable */
 extern hashtable string_hash; 
 
-/* throw an exception and exit */
-void throw_exception_exit();
-
-/* initialize new exceptions */
-java_objectheader *new_exception(char *classname);
-java_objectheader *new_exception_message(char *classname, char *message);
-java_objectheader *new_exception_utfmessage(char *classname, utf *message);
-java_objectheader *new_exception_javastring(char *classname, java_lang_String *message);
-java_objectheader *new_exception_int(char *classname, s4 i);
-
 void use_class_as_object(classinfo *c);
 
 /* load classes required for native methods */
 void native_loadclasses();
 
-/* set searchpath for classfiles */
-void native_setclasspath(char *path);
-
 /* find native function */
 functionptr native_findfunction(utf *cname, utf *mname, 
                                                                utf *desc, bool isstatic);
@@ -133,10 +115,15 @@ java_objectheader *native_new_and_init(classinfo *c);
 /* create new object on the heap and call the initializer 
    mainly used for exceptions with a message */
 java_objectheader *native_new_and_init_string(classinfo *c, java_lang_String *s);
+
 /* create new object on the heap and call the initializer 
    mainly used for exceptions with an index */
 java_objectheader *native_new_and_init_int(classinfo *c, s4 i);
 
+/* create new object on the heap and call the initializer 
+   mainly used for exceptions with cause */
+java_objectheader *native_new_and_init_throwable(classinfo *c, java_lang_Throwable *t);
+
 /* add property to system-property vector */
 void attach_property(char *name, char *value);
 
@@ -170,10 +157,7 @@ java_objectheader *literalstring_u2(java_chararray *a, u4 length, u4 offset,
 /* dispose a javastring */
 void literalstring_free(java_objectheader*);
 
-void systemclassloader_addlibname(java_objectheader *o);
-void systemclassloader_addlibrary(java_objectheader *o);
-
-void copy_vftbl(vftbl **dest, vftbl *src);
+void copy_vftbl(vftbl_t **dest, vftbl_t *src);
 
 utf *create_methodsig(java_objectarray* types, char *retType);
 classinfo *get_type(char **utf_ptr,char *desc_end, bool skip);