* exceptions_new_nosuchmethoderror: Added.

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

diff --git a/src/vm/exceptions.h b/src/vm/exceptions.h
index f8b04cb6fb9569fc45a3c109b59c6171ec8d261f..11de835f0377c46afd95577ef8b8157b23f1c3c8 100644 (file)
--- a/src/vm/exceptions.h
+++ b/src/vm/exceptions.h
@@ -26,9 +26,9 @@
 
    Authors: Christian Thalinger
 
-   Changes:
+   Changes: Edwin Steiner
 
-   $Id: exceptions.h 2490 2005-05-20 23:05:49Z twisti $
+   $Id: exceptions.h 3639 2005-11-08 17:21:37Z twisti $
 
 */
 
@@ -36,6 +36,9 @@
 #ifndef _EXCEPTIONS_H
 #define _EXCEPTIONS_H
 
+#include "config.h"
+#include "vm/types.h"
+
 #include "vm/global.h"
 #include "native/include/java_lang_String.h"
 #include "native/include/java_lang_Throwable.h"
@@ -45,24 +48,14 @@
 
 
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
-
-#define exceptionptr                     builtin_get_exceptionptrptr()
-#define dontfillinexceptionstacktrace    builtin_get_dontfillinexceptionstacktrace()
-#define threadrootmethod                 builtin_get_threadrootmethod()
-
-#else /* defined(USE_THREADS) && defined(NATIVE_THREADS) */
-
-#define exceptionptr        (&_exceptionptr)
-#define dontfillinexceptionstacktrace (&_dontfillinexceptionstacktrace)
-#define threadrootmethod    (&_threadrootmethod)
-
-#endif /* defined(USE_THREADS) && defined(NATIVE_THREADS) */
+#define exceptionptr    builtin_get_exceptionptrptr()
+#else
+#define exceptionptr    &_no_threads_exceptionptr
+#endif
 
 #if !defined(USE_THREADS) || !defined(NATIVE_THREADS)
-extern java_objectheader *_exceptionptr;
-extern u1 _dontfillinexceptionstacktrace;
-extern methodinfo* _threadrootmethod;
-#endif /* !defined(USE_THREADS) || !defined(NATIVE_THREADS) */
+extern java_objectheader *_no_threads_exceptionptr;
+#endif
 
 
 /* global variables ***********************************************************/
@@ -77,13 +70,16 @@ bool exceptions_init(void);
 
 /* exception throwing functions */
 
-void throw_exception();
-void throw_exception_exit();
+void throw_exception(void);
+void throw_exception_exit(void);
+
+void throw_main_exception(void);
+void throw_main_exception_exit(void);
 
-void throw_main_exception();
-void throw_main_exception_exit();
+void throw_cacao_exception_exit(const char *exception,
+                                                               const char *message, ...);
 
-void throw_cacao_exception_exit(const char *exception, const char *message, ...);
+void exceptions_throw_outofmemory_exit(void);
 
 
 /* initialize new exceptions */
@@ -108,17 +104,25 @@ java_objectheader *new_exception_int(const char *classname, s4 i);
 /* functions to generate compiler exceptions */
 
 java_objectheader *new_classformaterror(classinfo *c, const char *message, ...);
+java_objectheader *new_classnotfoundexception(utf *name);
+java_objectheader *new_noclassdeffounderror(utf *name);
+java_objectheader *exceptions_new_nosuchmethoderror(classinfo *c,
+                                                                                                       utf *name, utf *desc);
 java_objectheader *new_internalerror(const char *message, ...);
 java_objectheader *new_verifyerror(methodinfo *m, const char *message, ...);
 java_objectheader *new_unsupportedclassversionerror(classinfo *c,
                                                                                                        const char *message, ...);
 
-java_objectheader *new_arithmeticexception();
+java_objectheader *new_arithmeticexception(void);
 java_objectheader *new_arrayindexoutofboundsexception(s4 index);
-java_objectheader *new_arraystoreexception();
-java_objectheader *new_classcastexception();
-java_objectheader *new_negativearraysizeexception();
-java_objectheader *new_nullpointerexception();
+java_objectheader *new_arraystoreexception(void);
+java_objectheader *new_classcastexception(void);
+java_objectheader *new_illegalargumentexception(void);
+java_objectheader *new_illegalmonitorstateexception(void);
+java_objectheader *new_negativearraysizeexception(void);
+java_objectheader *new_nullpointerexception(void);
+
+void classnotfoundexception_to_noclassdeffounderror(void);
 
 #endif /* _EXCEPTIONS_H */