GNU header update.

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

diff --git a/src/vm/exceptions.c b/src/vm/exceptions.c
index 85f49c1a7e0ad2d10aecc4e825b19bb7b2e59ca5..bfc8ce68752c11129d106bcd6c9b453b207893d7 100644 (file)
--- a/src/vm/exceptions.c
+++ b/src/vm/exceptions.c
@@ -1,9 +1,9 @@
-/* exceptions.c - exception related functions
+/* vm/exceptions.c - exception related functions
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser,
-   M. Probst, S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck,
-   P. Tomsich, J. Wenninger
+   Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
+   R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
+   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
+   Institut f. Computersprachen - TU Wien
 
    This file is part of CACAO.
 
@@ -26,7 +26,7 @@
 
    Authors: Christian Thalinger
 
-   $Id: exceptions.c 1435 2004-11-05 09:48:33Z twisti $
+   $Id: exceptions.c 1735 2004-12-07 14:33:27Z twisti $
 
 */
 
@@ -34,16 +34,18 @@
 #include <string.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include "asmpart.h"
-#include "global.h"
-#include "loader.h"
-#include "native.h"
-#include "tables.h"
-#include "jit/jit.h"
+
+#include "mm/memory.h"
+#include "native/native.h"
+#include "native/include/java_lang_String.h"
+#include "native/include/java_lang_Throwable.h"
 #include "toolbox/logging.h"
-#include "toolbox/memory.h"
-#include "nat/java_lang_String.h"
-#include "nat/java_lang_Throwable.h"
+#include "vm/global.h"
+#include "vm/loader.h"
+#include "vm/tables.h"
+#include "vm/jit/asmpart.h"
+#include "vm/jit/jit.h"
+#include "vm/options.h"
 
 
 /* system exception classes required in cacao */
@@ -168,35 +170,56 @@ char *string_java_lang_VirtualMachineError =
 
 *******************************************************************************/
 
-void init_system_exceptions()
+bool init_system_exceptions(void)
 {
        /* java/lang/Throwable */
 
        class_java_lang_Throwable =
                class_new(utf_new_char(string_java_lang_Throwable));
-       class_load(class_java_lang_Throwable);
-       class_link(class_java_lang_Throwable);
+
+       if (!class_load(class_java_lang_Throwable))
+               return false;
+
+       if (!class_link(class_java_lang_Throwable))
+               return false;
+
 
        /* java/lang/Exception */
 
        class_java_lang_Exception =
                class_new(utf_new_char(string_java_lang_Exception));
-       class_load(class_java_lang_Exception);
-       class_link(class_java_lang_Exception);
+
+       if (!class_load(class_java_lang_Exception))
+               return false;
+
+       if (!class_link(class_java_lang_Exception))
+               return false;
+
 
        /* java/lang/Error */
 
        class_java_lang_Error =
                class_new(utf_new_char(string_java_lang_Error));
-       class_load(class_java_lang_Error);
-       class_link(class_java_lang_Error);
+
+       if (!class_load(class_java_lang_Error))
+               return false;
+
+       if (!class_link(class_java_lang_Error))
+               return false;
+
 
        /* java/lang/OutOfMemoryError */
 
        class_java_lang_OutOfMemoryError =
                class_new(utf_new_char(string_java_lang_OutOfMemoryError));
-       class_load(class_java_lang_OutOfMemoryError);
-       class_link(class_java_lang_OutOfMemoryError);
+
+       if (!class_load(class_java_lang_OutOfMemoryError))
+               return false;
+
+       if (!class_link(class_java_lang_OutOfMemoryError))
+               return false;
+
+       return true;
 }
 
 
@@ -206,9 +229,9 @@ static void throw_exception_exit_intern(bool doexit)
        classinfo *c;
        methodinfo *pss;
 
-       if (*exceptionptr) {
-               xptr = *exceptionptr;
+       xptr = *exceptionptr;
 
+       if (xptr) {
                /* clear exception, because we are calling jit code again */
                *exceptionptr = NULL;
 
@@ -276,7 +299,7 @@ void throw_main_exception_exit()
 }
 
 
-void throw_cacao_exception_exit(char *exception, char *message, ...)
+void throw_cacao_exception_exit(const char *exception, const char *message, ...)
 {
        s4 i;
        char *tmp;
@@ -284,9 +307,9 @@ void throw_cacao_exception_exit(char *exception, char *message, ...)
        va_list ap;
 
        len = strlen(exception);
-       tmp = MNEW(char, len+1);
+       tmp = MNEW(char, len + 1);
        strncpy(tmp, exception, len);
-        tmp[len]='\0';
+       tmp[len] = '\0';
 
        /* convert to classname */
 
@@ -302,7 +325,7 @@ void throw_cacao_exception_exit(char *exception, char *message, ...)
                fprintf(stderr, ": ");
 
                va_start(ap, message);
-               fprintf(stderr, message, ap);
+               vfprintf(stderr, message, ap);
                va_end(ap);
        }
 
@@ -437,6 +460,7 @@ java_objectheader *new_verifyerror(methodinfo *m, char *message)
        char *msg;
        s4 len;
 
+       useinlining = false; /* at least until sure inlining works with exceptions*/
        len = 8 + utf_strlen(m->class->name) +
                10 + utf_strlen(m->name) +
                13 + utf_strlen(m->descriptor) +
@@ -504,7 +528,11 @@ java_objectheader *new_arrayindexoutofboundsexception(s4 index)
                return *exceptionptr;
 
        s = (java_lang_String *) asm_calljavafunction(m,
+#if POINTERSIZE == 8
+                                                                                                 (void *) (s8) index,
+#else
                                                                                                  (void *) index,
+#endif
                                                                                                  NULL,
                                                                                                  NULL,
                                                                                                  NULL);
@@ -522,6 +550,25 @@ java_objectheader *new_arrayindexoutofboundsexception(s4 index)
 }
 
 
+/* new_arraystoreexception *****************************************************
+
+   generates a java.lang.ArrayStoreException for the jit compiler
+
+*******************************************************************************/
+
+java_objectheader *new_arraystoreexception()
+{
+       java_objectheader *e;
+
+       e = new_exception(string_java_lang_ArrayStoreException);
+
+       if (!e)
+               return *exceptionptr;
+
+       return e;
+}
+
+
 /* new_classcastexception ******************************************************
 
    generates a java.lang.ClassCastException for the jit compiler