Merge to subtype-trunk (manually: src/vm/linker.hpp, src/vm/vftbl.hpp)

[cacao.git] / src / vm / linker.cpp

diff --git a/src/vm/linker.cpp b/src/vm/linker.cpp
index 5fd4869b6598cbe249a2bcd595e35056b73adebc..701fc4db0d2c0dc5b37ab694bfaa1bafa23c4a05 100644 (file)
--- a/src/vm/linker.cpp
+++ b/src/vm/linker.cpp
@@ -94,6 +94,10 @@ classinfo *resolve_classref_or_classinfo_eager(classref_or_classinfo cls, bool c
 static s4 interfaceindex;       /* sequential numbering of interfaces         */
 static s4 classvalue;
 
+#if !USES_NEW_SUBTYPE
+java_object_t *linker_classrenumber_lock;
+#endif
+
 #if defined(__cplusplus)
 extern "C" {
 #endif
@@ -123,6 +127,14 @@ void linker_preinit(void)
 
        interfaceindex = 0;
 
+#if defined(ENABLE_THREADS) && !USES_NEW_SUBTYPE
+       /* create the global lock object */
+
+       linker_classrenumber_lock = NEW(java_object_t);
+
+       LOCK_INIT_OBJECT_LOCK(linker_classrenumber_lock);
+#endif
+
        /* Link the most basic classes. */
 
        if (!link_class(class_java_lang_Object))
@@ -519,6 +531,7 @@ static bool linker_overwrite_method(methodinfo *mg,
        
 *******************************************************************************/
 
+#if USES_NEW_SUBTYPE
 static int build_display_inner(classinfo *topc, classinfo *c, int i)
 {
        int depth;
@@ -580,6 +593,7 @@ static void build_display(classinfo *c)
                        c->vftbl->subtype_display[i] = NULL;
        }
 }
+#endif
 
 static classinfo *link_class_intern(classinfo *c)
 {
@@ -978,7 +992,9 @@ static classinfo *link_class_intern(classinfo *c)
        /* FIXME: this is completely useless now */
        RT_TIMING_GET_TIME(time_subclasses);
 
+#if USES_NEW_SUBTYPE
        build_display(c);
+#endif
 
        /* revert the linking state and class is linked */
 
@@ -1180,10 +1196,14 @@ static arraydescriptor *link_array(classinfo *c)
 static void linker_compute_subclasses(classinfo *c)
 {
 
+       LOCK_CLASSRENUMBER_LOCK;
+
        if (!(c->flags & ACC_INTERFACE)) {
                c->nextsub = NULL;
                c->sub     = NULL;
+#if USES_NEW_SUBTYPE
                c->vftbl->baseval = 1; /* so it does not look like an interface */
+#endif
        }
 
        if (!(c->flags & ACC_INTERFACE) && (c->super != NULL)) {
@@ -1193,6 +1213,14 @@ static void linker_compute_subclasses(classinfo *c)
 
        classvalue = 0;
 
+#if !USES_NEW_SUBTYPE
+       /* compute class values */
+
+       linker_compute_class_values(class_java_lang_Object);
+#endif
+
+       UNLOCK_CLASSRENUMBER_LOCK;
+
 }