New source tree.

[cacao.git] / src / native / native.h

diff --git a/src/native/native.h b/src/native/native.h
index f26814dc029aba924438f2e25c5fd51346acc7ce..d2e766987204b2426ee9ac895e6a28641fd25643 100644 (file)
--- a/src/native/native.h
+++ b/src/native/native.h
@@ -1,4 +1,4 @@
-/* native.h - table of native functions
+/* native/native.h - table of native functions
 
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
    R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser,
@@ -26,7 +26,7 @@
 
    Authors: Reinhard Grafl
 
-   $Id: native.h 1296 2004-07-10 17:02:15Z stefan $
+   $Id: native.h 1621 2004-11-30 13:06:55Z twisti $
 
 */
 
@@ -35,10 +35,10 @@
 #define _NATIVE_H
 
 
-#include "jni.h"
-#include "nat/java_lang_String.h"
-#include "nat/java_lang_ClassLoader.h"
-#include "nat/java_lang_Throwable.h"
+#include "native/jni.h"
+#include "native/include/java_lang_String.h"
+#include "native/include/java_lang_ClassLoader.h"
+#include "native/include/java_lang_Throwable.h"
 
 
 /* table for locating native methods */
@@ -65,10 +65,6 @@ struct nativecompref {
 };
 
 
-/* searchpath for classfiles */
-
-extern char *classpath;
-
 extern classinfo *class_java_lang_Class;
 extern classinfo *class_java_lang_VMClass;
 extern classinfo *class_java_lang_System;
@@ -84,53 +80,6 @@ extern classinfo *class_java_lang_Character;
 extern classinfo *class_java_lang_Integer;
 
 
-/* system exception classes required in cacao */
-
-extern classinfo *class_java_lang_Throwable;
-extern classinfo *class_java_lang_Exception;
-extern classinfo *class_java_lang_Error;
-
-
-/* exception/error super class */
-
-extern char *string_java_lang_Throwable;
-
-
-/* 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_Exception;
-extern char *string_java_lang_IllegalArgumentException;
-extern char *string_java_lang_IllegalMonitorStateException;
-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_AbstractMethodError;
-extern char *string_java_lang_ClassCircularityError;
-extern char *string_java_lang_ClassFormatError;
-extern char *string_java_lang_Error;
-extern char *string_java_lang_ExceptionInInitializerError;
-extern char *string_java_lang_IncompatibleClassChangeError;
-extern char *string_java_lang_InternalError;
-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;
-extern char *string_java_lang_VerifyError;
-
-
 /* the system classloader object */
 extern java_lang_ClassLoader *SystemClassLoader;
 
@@ -140,35 +89,11 @@ extern java_lang_ClassLoader *SystemClassLoader;
 /* javastring-hashtable */
 extern hashtable string_hash; 
 
-/* load, link and compile exceptions used in the system */
-void init_system_exceptions();
-void compile_all_class_methods(classinfo *c);
-
-/* exception throwing functions */
-void throw_exception();
-void throw_exception_exit();
-
-void throw_main_exception();
-void throw_main_exception_exit();
-
-void throw_cacao_exception_exit(char *exception, char *message);
-
-/* initialize new exceptions */
-java_objectheader *new_exception(char *classname);
-java_objectheader *new_exception_message(char *classname, char *message);
-java_objectheader *new_exception_throwable(char *classname, java_lang_Throwable *cause);
-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);
@@ -199,15 +124,15 @@ java_objectheader *native_new_and_init_int(classinfo *c, s4 i);
    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);
+/* add property to temporary property list -- located in nat/VMRuntime.c */
+void create_property(char *key, char *value);
 
 /* correct vftbl-entries of javastring-hash */
 void stringtable_update();
 
 
 /* make utf symbol from javastring */
-utf *javastring_toutf(struct java_lang_String *string, bool isclassname);
+utf *javastring_toutf(java_lang_String *string, bool isclassname);
 
 /* make utf symbol from u2 array */
 utf *utf_new_u2(u2 *unicodedata, u4 unicodelength, bool isclassname);