* Removed all Id tags.
[cacao.git] / src / vm / initialize.c
index fbb14f679b94b25ea8be717c690b6217470f2b74..cc847933a6c921c2124d993f1508da4bc74dce61 100644 (file)
@@ -1,9 +1,9 @@
 /* src/vm/initialize.c - static class initializer functions
 
-   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
+   Copyright (C) 1996-2005, 2006, 2007 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.
 
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
-
-   Authors: Reinhard Grafl
+*/
 
-   Changes: Mark Probst
-            Andreas Krall
-            Christian Thalinger
 
-   $Id: initialize.c 2592 2005-06-08 11:03:52Z twisti $
+#include "config.h"
 
-*/
+#include <string.h>
 
+#include "vm/types.h"
 
-#include <string.h>
+#include "threads/lock-common.h"
 
 #include "vm/global.h"
 #include "vm/initialize.h"
 #include "vm/builtin.h"
-#include "vm/class.h"
-#include "vm/loader.h"
 #include "vm/exceptions.h"
-#include "vm/options.h"
-#include "vm/statistics.h"
 #include "vm/stringlocal.h"
+#include "vm/vm.h"
+
 #include "vm/jit/asmpart.h"
 
-#undef JWDEBUG
+#include "vmcore/class.h"
+#include "vmcore/loader.h"
+#include "vmcore/options.h"
+
+#if defined(ENABLE_STATISTICS)
+# include "vmcore/statistics.h"
+#endif
+
 
 /* private functions **********************************************************/
 
@@ -70,54 +71,49 @@ bool initialize_class(classinfo *c)
        if (!makeinitializations)
                return true;
 
-#if defined(USE_THREADS)
-       /* enter a monitor on the class */
-
-       builtin_monitorenter((java_objectheader *) c);
-#endif
+       LOCK_MONITOR_ENTER(c);
 
        /* maybe the class is already initalized or the current thread, which can
           pass the monitor, is currently initalizing this class */
 
-       /* JOWENN: In future we need an additinal flag: initializationfailed,
-               since further access to the class should cause a NoClassDefFound,
-               if the static initializer failed once
-        */
+       if (CLASS_IS_OR_ALMOST_INITIALIZED(c)) {
+               LOCK_MONITOR_EXIT(c);
 
-       if (c->initialized || c->initializing) {
-#if defined(USE_THREADS)
-               builtin_monitorexit((java_objectheader *) c);
-#endif
+               return true;
+       }
+
+       /* if <clinit> throw an Error before, the class was marked with an
+       error and we have to throw a NoClassDefFoundError */
+
+       if (c->state & CLASS_ERROR) {
+               exceptions_throw_noclassdeffounderror(c->name);
+
+               LOCK_MONITOR_EXIT(c);
+
+               /* ...but return true, this is ok (mauve test) */
 
                return true;
        }
 
-#ifdef JWDEBUG
-       printf("preparing to call initialize_class_intern for %s\n",c->name->text);
-#endif
        /* this initalizing run begins NOW */
-       c->initializing = true;
+
+       c->state |= CLASS_INITIALIZING;
 
        /* call the internal function */
+
        r = initialize_class_intern(c);
 
        /* if return value is not NULL everything was ok and the class is
           initialized */
-       if (r)
-               c->initialized = true;
 
-#ifdef JWDEBUG
-       printf("finished to call initialize_class_intern for %s\n",c->name->text);
-#endif
+       if (r)
+               c->state |= CLASS_INITIALIZED;
 
        /* this initalizing run is done */
-       c->initializing = false;
 
-#if defined(USE_THREADS)
-       /* leave the monitor */
+       c->state &= ~CLASS_INITIALIZING;
 
-       builtin_monitorexit((java_objectheader *) c);
-#endif
+       LOCK_MONITOR_EXIT(c);
 
        return r;
 }
@@ -132,20 +128,16 @@ bool initialize_class(classinfo *c)
 
 static bool initialize_class_intern(classinfo *c)
 {
-       methodinfo        *m;
-       java_objectheader *xptr;
-       s4                 i;
-#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
-       int b;
-#endif
+       methodinfo    *m;
+       java_handle_t *xptr;
 
        /* maybe the class is not already linked */
 
-       if (!c->linked)
+       if (!(c->state & CLASS_LINKED))
                if (!link_class(c))
                        return false;
 
-#if defined(STATISTICS)
+#if defined(ENABLE_STATISTICS)
        if (opt_stat)
                count_class_inits++;
 #endif
@@ -153,44 +145,29 @@ static bool initialize_class_intern(classinfo *c)
        /* initialize super class */
 
        if (c->super.cls) {
-               if (!c->super.cls->initialized) {
+               if (!(c->super.cls->state & CLASS_INITIALIZED)) {
+#if !defined(NDEBUG)
                        if (initverbose)
                                log_message_class_message_class("Initialize super class ",
                                                                                                c->super.cls,
                                                                                                " from ",
                                                                                                c);
-
-#ifdef JWDEBUG
-                       printf("preparing to call initialize_class for super  %s\n",c->super.cls->name->text);
 #endif
+
                        if (!initialize_class(c->super.cls))
                                return false;
                }
        }
 
-       /* initialize interface classes */
-
-       for (i = 0; i < c->interfacescount; i++) {
-               if (!c->interfaces[i].cls->initialized) {
-#ifdef JWDEBUG
-                       printf("preparing to call initialize_class for interface  %s\n",c->interfaces[i].cls->name->text);
-#endif
-                       if (initverbose)
-                               log_message_class_message_class("Initialize interface class ",
-                                                                                               c->interfaces[i].cls,
-                                                                                               " from ",
-                                                                                               c);
-                       
-                       if (!initialize_class(c->interfaces[i].cls))
-                               return false;
-               }
-       }
+       /* interfaces implemented need not to be initialized (VM Spec 2.17.4) */
 
        m = class_findmethod(c, utf_clinit, utf_void__void);
 
        if (!m) {
+#if !defined(NDEBUG)
                if (initverbose)
                        log_message_class("Class has no static class initializer: ", c);
+#endif
 
                return true;
        }
@@ -199,51 +176,43 @@ static bool initialize_class_intern(classinfo *c)
 /*     if (!(m->flags & ACC_STATIC)) { */
 /*             log_text("Class initializer is not static!"); */
 
+#if !defined(NDEBUG)
        if (initverbose)
                log_message_class("Starting static class initializer for class: ", c);
-
-#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
-       b = blockInts;
-       blockInts = 0;
 #endif
 
        /* now call the initializer */
 
-       asm_calljavafunction(m, NULL, NULL, NULL, NULL);
-
-#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
-       assert(blockInts == 0);
-       blockInts = b;
-#endif
+       (void) vm_call_method(m, NULL);
 
        /* we have an exception or error */
 
-       xptr = *exceptionptr;
+       xptr = exceptions_get_exception();
 
-       if (xptr) {
-               /* class is NOT initialized */
+       if (xptr != NULL) {
+               /* class is NOT initialized and is marked with error */
 
-               c->initialized = false;
+               c->state |= CLASS_ERROR;
 
                /* is this an exception, than wrap it */
 
                if (builtin_instanceof(xptr, class_java_lang_Exception)) {
                        /* clear exception, because we are calling jit code again */
 
-                       *exceptionptr = NULL;
+                       exceptions_clear_exception();
 
                        /* wrap the exception */
 
-                       *exceptionptr =
-                               new_exception_throwable(string_java_lang_ExceptionInInitializerError,
-                                                                               (java_lang_Throwable *) xptr);
+                       exceptions_throw_exceptionininitializererror(xptr);
                }
 
                return false;
        }
 
+#if !defined(NDEBUG)
        if (initverbose)
                log_message_class("Finished static class initializer for class: ", c);
+#endif
 
        return true;
 }