* src/vm/initialize.cpp: Added a required memory barrier.

* src/vm/linker.cpp: Cosmetics.

diff --git a/src/vm/initialize.cpp b/src/vm/initialize.cpp
index f2d5664ecf2655b5ed17544585d168ed06e4670f..f602073acc171c980f98ae5cea4b98ecf3487560 100644 (file)
--- a/src/vm/initialize.cpp
+++ b/src/vm/initialize.cpp
@@ -1,6 +1,6 @@
 /* src/vm/initialize.cpp - static class initializer functions
 
-   Copyright (C) 1996-2005, 2006, 2007, 2008
+   Copyright (C) 1996-2005, 2006, 2007, 2008, 2009
    CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
@@ -145,8 +145,13 @@ bool initialize_class(classinfo *c)
        /* if return value is not NULL everything was ok and the class is
           initialized */
 
-       if (r)
-               c->state |= CLASS_INITIALIZED;
+       if (r) {
+        // Let's make sure that everything is flushed out to memory before
+        // marking the class as initialized.
+        Atomic::write_memory_barrier();
+
+        c->state |= CLASS_INITIALIZED;
+    }
 
        /* this initalizing run is done */
 
@@ -271,7 +276,7 @@ static bool initialize_class_intern(classinfo *c)
  * Emacs will automagically detect them.
  * ---------------------------------------------------------------------
  * Local variables:
- * mode: c
+ * mode: c++
  * indent-tabs-mode: t
  * c-basic-offset: 4
  * tab-width: 4

diff --git a/src/vm/linker.cpp b/src/vm/linker.cpp
index b1bd60a427ca66815990cf6269939f03395e75be..d956341e88bd873662de15b804a2ce9e6ba9e1cf 100644 (file)
--- a/src/vm/linker.cpp
+++ b/src/vm/linker.cpp
@@ -1,4 +1,4 @@
-/* src/vm/linker.c - class linker functions
+/* src/vm/linker.cpp - class linker functions
 
    Copyright (C) 1996-2005, 2006, 2007, 2008
    CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
@@ -1403,7 +1403,7 @@ static s4 class_highestinterface(classinfo *c)
  * Emacs will automagically detect them.
  * ---------------------------------------------------------------------
  * Local variables:
- * mode: c
+ * mode: c++
  * indent-tabs-mode: t
  * c-basic-offset: 4
  * tab-width: 4