* changed src/vm/jit/m68k/asmpart.S (asm_patcher_wrapper): Removed.

[cacao.git] / src / vm / exceptions.h

diff --git a/src/vm/exceptions.h b/src/vm/exceptions.h
index 9b7968307139866905f9ef81b22c4d9cf724e198..93958851a4027ed9e82badfad239ad296cfb4503 100644 (file)
--- a/src/vm/exceptions.h
+++ b/src/vm/exceptions.h
@@ -22,8 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: exceptions.h 8178 2007-07-05 11:13:20Z michi $
-
 */
 
 
@@ -54,7 +52,7 @@
    a base of NULL which should result in a NullPointerException.
 
    NOTE: In exceptions_init() we have a check whether the offset of
-   java_objectheader.data[0] is greater than the largest displacement
+   java_arrayheader.data[0] is greater than the largest displacement
    defined below.  Otherwise normal array loads/stores could trigger
    an exception.
 
@@ -63,45 +61,44 @@
 #define EXCEPTION_HARDWARE_NULLPOINTER              0
 #define EXCEPTION_HARDWARE_ARITHMETIC               1
 #define EXCEPTION_HARDWARE_ARRAYINDEXOUTOFBOUNDS    2
-#define EXCEPTION_HARDWARE_CLASSCAST                3
+#define EXCEPTION_HARDWARE_ARRAYSTORE               3
 
-#define EXCEPTION_HARDWARE_EXCEPTION                5
-#define EXCEPTION_HARDWARE_PATCHER                  6
-#define EXCEPTION_HARDWARE_COMPILER                 7
+#define EXCEPTION_HARDWARE_CLASSCAST                5
+#define EXCEPTION_HARDWARE_EXCEPTION                6
+#define EXCEPTION_HARDWARE_PATCHER                  7
 
-#define EXCEPTION_HARDWARE_LARGEST                  7
+#define EXCEPTION_HARDWARE_COMPILER                 9
 
+#define EXCEPTION_HARDWARE_LARGEST                  9
 
-/* function prototypes ********************************************************/
 
-bool               exceptions_init(void);
+/* function prototypes ********************************************************/
 
-java_objectheader *exceptions_get_exception(void);
-void               exceptions_set_exception(java_objectheader *o);
-void               exceptions_clear_exception(void);
-java_objectheader *exceptions_get_and_clear_exception(void);
+void           exceptions_init(void);
 
-java_objectheader *new_exception_utfmessage(const char *classname,
-                                                                                       utf *message);
+java_handle_t *exceptions_get_exception(void);
+void           exceptions_set_exception(java_handle_t *o);
+void           exceptions_clear_exception(void);
+java_handle_t *exceptions_get_and_clear_exception(void);
 
 
 /* functions to generate compiler exceptions */
 
-java_objectheader *exceptions_new_abstractmethoderror(void);
-java_objectheader *exceptions_asm_new_abstractmethoderror(u1 *sp, u1 *ra);
-java_objectheader *exceptions_new_arraystoreexception(void);
+java_handle_t *exceptions_new_abstractmethoderror(void);
+java_object_t *exceptions_asm_new_abstractmethoderror(u1 *sp, u1 *ra);
+java_handle_t *exceptions_new_arraystoreexception(void);
 
 void exceptions_throw_abstractmethoderror(void);
 void exceptions_throw_classcircularityerror(classinfo *c);
 void exceptions_throw_classformaterror(classinfo *c, const char *message, ...);
 void exceptions_throw_classnotfoundexception(utf *name);
 void exceptions_throw_noclassdeffounderror(utf *name);
-void exceptions_throw_noclassdeffounderror_cause(java_objectheader *cause);
+void exceptions_throw_noclassdeffounderror_cause(java_handle_t *cause);
 void exceptions_throw_noclassdeffounderror_wrong_name(classinfo *c, utf *name);
 void exceptions_throw_linkageerror(const char *message, classinfo *c);
 void exceptions_throw_nosuchfielderror(classinfo *c, utf *name);
 void exceptions_throw_nosuchmethoderror(classinfo *c, utf *name, utf *desc);
-void exceptions_throw_exceptionininitializererror(java_objectheader *cause);
+void exceptions_throw_exceptionininitializererror(java_handle_t *cause);
 void exceptions_throw_incompatibleclasschangeerror(classinfo *c,
                                                                                                   const char *message);
 void exceptions_throw_instantiationerror(classinfo *c);
@@ -112,13 +109,13 @@ void exceptions_throw_verifyerror_for_stack(methodinfo *m, int type);
 void exceptions_throw_unsatisfiedlinkerror(utf *name);
 void exceptions_throw_unsupportedclassversionerror(classinfo *c, u4 ma, u4 mi);
 
-java_objectheader *exceptions_new_arithmeticexception(void);
+java_handle_t *exceptions_new_arithmeticexception(void);
 
-java_objectheader *exceptions_new_arrayindexoutofboundsexception(s4 index);
+java_handle_t *exceptions_new_arrayindexoutofboundsexception(s4 index);
 void exceptions_throw_arrayindexoutofboundsexception(void);
 void exceptions_throw_arraystoreexception(void);
 
-java_objectheader *exceptions_new_classcastexception(java_objectheader *o);
+java_handle_t *exceptions_new_classcastexception(java_handle_t *o);
 
 void exceptions_throw_clonenotsupportedexception(void);
 void exceptions_throw_illegalaccessexception(utf *message);
@@ -126,21 +123,19 @@ void exceptions_throw_illegalargumentexception(void);
 void exceptions_throw_illegalmonitorstateexception(void);
 void exceptions_throw_interruptedexception(void);
 void exceptions_throw_instantiationexception(classinfo *c);
-void exceptions_throw_invocationtargetexception(java_objectheader *cause);
+void exceptions_throw_invocationtargetexception(java_handle_t *cause);
 void exceptions_throw_negativearraysizeexception(void);
 
-java_objectheader *exceptions_new_nullpointerexception(void);
+java_handle_t *exceptions_new_nullpointerexception(void);
 void exceptions_throw_nullpointerexception(void);
-void exceptions_throw_privilegedactionexception(java_objectheader *cause);
+void exceptions_throw_privilegedactionexception(java_handle_t *cause);
 void exceptions_throw_stringindexoutofboundsexception(void);
 
 void exceptions_classnotfoundexception_to_noclassdeffounderror(void);
 
-java_objectheader *exceptions_fillinstacktrace(void);
-
-java_objectheader *exceptions_new_hardware_exception(u1 *pv, u1 *sp, u1 *ra, u1 *xpc, s4 type, ptrint val, stackframeinfo *sfi);
+java_handle_t *exceptions_fillinstacktrace(void);
 
-void exceptions_print_exception(java_objectheader *xptr);
+void exceptions_print_exception(java_handle_t *xptr);
 void exceptions_print_current_exception(void);
 void exceptions_print_stacktrace(void);