correct exception handler range checks

[cacao.git] / native.h

diff --git a/native.h b/native.h
index 00f4b2b24a3190c4c8329e16bfc4c4c7b85e30fa..269c679740d626a8b611ff48741022b89fa3c842 100644 (file)
--- a/native.h
+++ b/native.h
@@ -26,7 +26,7 @@
 
    Authors: Reinhard Grafl
 
-   $Id: native.h 833 2004-01-04 22:10:24Z jowenn $
+   $Id: native.h 1361 2004-07-28 10:51:14Z twisti $
 
 */
 
@@ -37,36 +37,38 @@
 
 #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 methodinfo *method_vmclass_init;
-/* extern classinfo *class_java_lang_Cloneable=0; */ /* now in global.h */
-extern classinfo *class_java_lang_CloneNotSupportedException;
 extern classinfo *class_java_lang_System;
 extern classinfo *class_java_lang_ClassLoader;
-extern classinfo *class_java_lang_NoClassDefFoundError;
-extern classinfo *class_java_lang_ClassNotFoundException;
-extern classinfo *class_java_lang_LinkageError;
-extern classinfo *class_java_lang_InstantiationException;
-extern classinfo *class_java_lang_NoSuchMethodError;   
-extern classinfo *class_java_lang_NoSuchFieldError;
-extern classinfo *class_java_lang_ClassFormatError;
-extern classinfo *class_java_lang_IllegalArgumentException;
-extern classinfo *class_java_lang_ArrayIndexOutOfBoundsException;
-extern classinfo *class_java_lang_NoSuchFieldException;
-extern classinfo *class_java_io_SyncFailedException;
-extern classinfo *class_java_io_IOException;
-extern classinfo *class_java_io_FileNotFoundException;
-extern classinfo *class_java_io_UnixFileSystem;
-extern classinfo *class_java_security_PrivilegedActionException;
-extern classinfo *class_java_net_UnknownHostException;
-extern classinfo *class_java_net_SocketException;
-extern classinfo *class_java_lang_NoSuchMethodException;
 extern classinfo *class_java_lang_Double;
 extern classinfo *class_java_lang_Float;
 extern classinfo *class_java_lang_Long;
@@ -77,30 +79,21 @@ extern classinfo *class_java_lang_Void;
 extern classinfo *class_java_lang_Character;
 extern classinfo *class_java_lang_Integer;
 
+
 /* 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;
+/* extern java_objectheader* exceptionptr; */
 
 /* javastring-hashtable */
 extern hashtable string_hash; 
 
-
-/* throw classnotfoundexcetion with detail message */
-void throw_noclassdeffounderror_message(utf* classname);
-
-/* throw linkageerror with detail message */
-void throw_linkageerror_message(utf* classname);
-
 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);
@@ -119,12 +112,18 @@ char *javastring_tochar(java_objectheader *s);
 /* create new object on the heap and call the initializer */
 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
-*/
+/* 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);
 
@@ -152,15 +151,13 @@ s4 class_findfield_index_approx(classinfo *c, utf *name);
 java_objectheader *literalstring_new(utf *u);
 
 /* creates a new javastring with the text of the u2-array */
-java_objectheader *literalstring_u2(java_chararray *a, u4 length, bool copymode);
+java_objectheader *literalstring_u2(java_chararray *a, u4 length, u4 offset,
+                                                                       bool copymode);
 
 /* 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);
@@ -168,6 +165,12 @@ java_objectarray* get_parametertypes(methodinfo *m);
 java_objectarray* get_exceptiontypes(methodinfo *m);
 classinfo *get_returntype(methodinfo *m);
 
+
+
+
+java_objectarray *builtin_asm_createclasscontextarray(classinfo **end,classinfo **start);
+java_lang_ClassLoader *builtin_asm_getclassloader(classinfo **end,classinfo **start);
+
 #endif /* _NATIVE_H */