merge branch
[cacao.git] / src / vmcore / linker.c
index 6a14ab19c119a4d6c2495e019ffc4d2cc5fdb0d3..12a7debfa9869f83b42dd923d6a28b9269324a2a 100644 (file)
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: linker.c 7868 2007-05-04 10:13:20Z tbfg $
-
 */
 
 
 #include "config.h"
 
 #include <assert.h>
+#include <stdint.h>
 
 #include "vm/types.h"
 
@@ -42,7 +41,9 @@
 #include "toolbox/logging.h"
 
 #include "vm/access.h"
+#include "vm/array.h"
 #include "vm/exceptions.h"
+#include "vm/primitive.h"
 #include "vm/stringlocal.h"
 #include "vm/vm.h"
 
@@ -74,43 +75,11 @@ classinfo *resolve_classref_or_classinfo_eager(classref_or_classinfo cls, bool c
 static s4 interfaceindex;       /* sequential numbering of interfaces         */
 static s4 classvalue;
 
-java_objectheader *linker_classrenumber_lock;
-
-
-/* primitivetype_table *********************************************************
-
-   Structure for primitive classes: contains the class for wrapping
-   the primitive type, the primitive class, the name of the class for
-   wrapping, the one character type signature and the name of the
-   primitive class.
-   CAUTION: Don't change the order of the types. This table is indexed
-   by the ARRAYTYPE_ constants (except ARRAYTYPE_OBJECT).
-
-*******************************************************************************/
-
-primitivetypeinfo primitivetype_table[PRIMITIVETYPE_COUNT] = {
-       { NULL, NULL, "java/lang/Integer",   'I', "int"     , "[I", NULL, NULL },
-       { NULL, NULL, "java/lang/Long",      'J', "long"    , "[J", NULL, NULL },
-       { NULL, NULL, "java/lang/Float",     'F', "float"   , "[F", NULL, NULL },
-       { NULL, NULL, "java/lang/Double",    'D', "double"  , "[D", NULL, NULL },
-       { NULL, NULL, NULL,                   0 , NULL      , NULL, NULL, NULL },
-       { NULL, NULL, "java/lang/Byte",      'B', "byte"    , "[B", NULL, NULL },
-       { NULL, NULL, "java/lang/Character", 'C', "char"    , "[C", NULL, NULL },
-       { NULL, NULL, "java/lang/Short",     'S', "short"   , "[S", NULL, NULL },
-       { NULL, NULL, "java/lang/Boolean",   'Z', "boolean" , "[Z", NULL, NULL },
-       { NULL, NULL, NULL,                   0 , NULL      , NULL, NULL, NULL },
-#if defined(ENABLE_JAVASE)
-       { NULL, NULL, "java/lang/Void",      'V', "void"    , NULL, NULL, NULL }
-#else
-       { NULL, NULL, NULL,                   0 , NULL      , NULL, NULL, NULL },
-#endif
-};
+java_object_t *linker_classrenumber_lock;
 
 
 /* private functions **********************************************************/
 
-static bool link_primitivetype_table(void);
 static classinfo *link_class_intern(classinfo *c);
 static arraydescriptor *link_array(classinfo *c);
 static void linker_compute_class_values(classinfo *c);
@@ -119,115 +88,160 @@ static bool linker_addinterface(classinfo *c, classinfo *ic);
 static s4 class_highestinterface(classinfo *c);
 
 
+/* dummy structures for alinment checks ***************************************/
+
+typedef struct dummy_alignment_long_t   dummy_alignment_long_t;
+typedef struct dummy_alignment_double_t dummy_alignment_double_t;
+
+struct dummy_alignment_long_t {
+       int32_t i;
+       int64_t l;
+};
+
+struct dummy_alignment_double_t {
+       int32_t i;
+       double  d;
+};
+
+
 /* linker_init *****************************************************************
 
-   Initializes the linker subsystem.
+   Initializes the linker subsystem and links classes required for the
+   primitive table.
 
 *******************************************************************************/
 
-bool linker_init(void)
+void linker_preinit(void)
 {
-       /* reset interface index */
+       /* Check for if alignment for long and double matches what we
+          assume for the current architecture. */
+
+#if defined(__I386__) || (defined(__ARM__) && !defined(__ARM_EABI__)) || (defined(__POWERPC__) && defined(__DARWIN__))
+       if (OFFSET(dummy_alignment_long_t, l) != 4)
+               vm_abort("linker_preinit: long alignment is different from what assumed: %d != %d",
+                                OFFSET(dummy_alignment_long_t, l), 4);
+
+       if (OFFSET(dummy_alignment_double_t, d) != 4)
+               vm_abort("linker_preinit: double alignment is different from what assumed: %d != %d",
+                                OFFSET(dummy_alignment_double_t, d), 4);
+#else
+       if (OFFSET(dummy_alignment_long_t, l) != 8)
+               vm_abort("linker_preinit: long alignment is different from what assumed: %d != %d",
+                                OFFSET(dummy_alignment_long_t, l), 8);
+
+       if (OFFSET(dummy_alignment_double_t, d) != 8)
+               vm_abort("linker_preinit: double alignment is different from what assumed: %d != %d",
+                                OFFSET(dummy_alignment_double_t, d), 8);
+#endif
+
+       /* Reset interface index. */
 
        interfaceindex = 0;
 
 #if defined(ENABLE_THREADS)
        /* create the global lock object */
 
-       linker_classrenumber_lock = NEW(java_objectheader);
+       linker_classrenumber_lock = NEW(java_object_t);
 
        LOCK_INIT_OBJECT_LOCK(linker_classrenumber_lock);
 #endif
 
-       /* link java.lang.Class as first class of the system, because we
-       need it's vftbl for all other classes so we can use a class as
-       object */
+       /* Link the most basic classes. */
 
-       if (!link_class(class_java_lang_Class))
-               return false;
+       if (!link_class(class_java_lang_Object))
+               vm_abort("linker_preinit: linking java/lang/Object failed");
 
-       /* now set the header.vftbl of all classes which were created
-       before java.lang.Class was linked */
+#if defined(ENABLE_JAVASE)
+       if (!link_class(class_java_lang_Cloneable))
+               vm_abort("linker_preinit: linking java/lang/Cloneable failed");
 
-       class_postset_header_vftbl();
+       if (!link_class(class_java_io_Serializable))
+               vm_abort("linker_preinit: linking java/io/Serializable failed");
+#endif
+}
 
 
-       /* link important system classes */
+/* linker_init *****************************************************************
 
-       if (!link_class(class_java_lang_Object))
-               return false;
+   Links all classes required in the VM.
 
-       if (!link_class(class_java_lang_String))
-               return false;
+*******************************************************************************/
 
-#if defined(ENABLE_JAVASE)
-       if (!link_class(class_java_lang_Cloneable))
-               return false;
+void linker_init(void)
+{
+       /* Link java.lang.Class as first class of the system, because we
+       need it's vftbl for all other classes so we can use a class as
+       object. */
 
-       if (!link_class(class_java_io_Serializable))
-               return false;
-#endif
+       if (!link_class(class_java_lang_Class))
+               vm_abort("linker_init: linking java/lang/Class failed");
 
+       /* Now set the header.vftbl of all classes which were created
+       before java.lang.Class was linked. */
+
+       class_postset_header_vftbl();
 
-       /* link classes for wrapping primitive types */
+       /* Link primitive-type wrapping classes. */
 
 #if defined(ENABLE_JAVASE)
        if (!link_class(class_java_lang_Void))
-               return false;
+               vm_abort("linker_init: linking failed");
 #endif
 
        if (!link_class(class_java_lang_Boolean))
-               return false;
+               vm_abort("linker_init: linking failed");
 
        if (!link_class(class_java_lang_Byte))
-               return false;
+               vm_abort("linker_init: linking failed");
 
        if (!link_class(class_java_lang_Character))
-               return false;
+               vm_abort("linker_init: linking failed");
 
        if (!link_class(class_java_lang_Short))
-               return false;
+               vm_abort("linker_init: linking failed");
 
        if (!link_class(class_java_lang_Integer))
-               return false;
+               vm_abort("linker_init: linking failed");
 
        if (!link_class(class_java_lang_Long))
-               return false;
+               vm_abort("linker_init: linking failed");
 
        if (!link_class(class_java_lang_Float))
-               return false;
+               vm_abort("linker_init: linking failed");
 
        if (!link_class(class_java_lang_Double))
-               return false;
+               vm_abort("linker_init: linking failed");
 
+       /* Link important system classes. */
 
-       /* load some other important classes */
+       if (!link_class(class_java_lang_String))
+               vm_abort("linker_init: linking java/lang/String failed");
 
 #if defined(ENABLE_JAVASE)
        if (!link_class(class_java_lang_ClassLoader))
-               return false;
+               vm_abort("linker_init: linking failed");
 
        if (!link_class(class_java_lang_SecurityManager))
-               return false;
+               vm_abort("linker_init: linking failed");
 #endif
 
        if (!link_class(class_java_lang_System))
-               return false;
+               vm_abort("linker_init: linking failed");
 
        if (!link_class(class_java_lang_Thread))
-               return false;
+               vm_abort("linker_init: linking failed");
 
 #if defined(ENABLE_JAVASE)
        if (!link_class(class_java_lang_ThreadGroup))
-               return false;
+               vm_abort("linker_init: linking failed");
 #endif
 
 #if defined(WITH_CLASSPATH_GNU)
        if (!link_class(class_java_lang_VMSystem))
-               return false;
+               vm_abort("linker_init: linking failed");
 
        if (!link_class(class_java_lang_VMThread))
-               return false;
+               vm_abort("linker_init: linking failed");
 #endif
 
 
@@ -235,25 +249,30 @@ bool linker_init(void)
 
 #if defined(ENABLE_JAVASE)
        if (!link_class(class_java_lang_StackTraceElement))
-               return false;
+               vm_abort("linker_init: linking failed");
 
        if (!link_class(class_java_lang_reflect_Constructor))
-               return false;
+               vm_abort("linker_init: linking failed");
 
        if (!link_class(class_java_lang_reflect_Field))
-               return false;
+               vm_abort("linker_init: linking failed");
 
        if (!link_class(class_java_lang_reflect_Method))
-               return false;
+               vm_abort("linker_init: linking failed");
 
        if (!link_class(class_java_security_PrivilegedAction))
-               return false;
+               vm_abort("linker_init: linking failed");
 
        if (!link_class(class_java_util_Vector))
-               return false;
+               vm_abort("linker_init: linking failed");
+
+# if defined(WITH_CLASSPATH_SUN)
+       if (!link_class(class_sun_reflect_MagicAccessorImpl))
+               vm_abort("linker_init: linking failed");
+# endif
 
        if (!link_class(arrayclass_java_lang_Object))
-               return false;
+               vm_abort("linker_init: linking failed");
 #endif
 
 
@@ -267,22 +286,26 @@ bool linker_init(void)
        pseudo_class_Arraystub->super.cls         = class_java_lang_Object;
 
 #if defined(ENABLE_JAVASE)
+
        pseudo_class_Arraystub->interfacescount   = 2;
        pseudo_class_Arraystub->interfaces        = MNEW(classref_or_classinfo, 2);
        pseudo_class_Arraystub->interfaces[0].cls = class_java_lang_Cloneable;
        pseudo_class_Arraystub->interfaces[1].cls = class_java_io_Serializable;
+
 #elif defined(ENABLE_JAVAME_CLDC1_1)
+
        pseudo_class_Arraystub->interfacescount   = 0;
        pseudo_class_Arraystub->interfaces        = NULL;
+
+#else
+# error unknown Java configuration
 #endif
 
-       if (!classcache_store_unique(pseudo_class_Arraystub)) {
-               log_text("could not cache pseudo_class_Arraystub");
-               assert(0);
-       }
+       if (!classcache_store_unique(pseudo_class_Arraystub))
+               vm_abort("linker_init: could not cache pseudo_class_Arraystub");
 
        if (!link_class(pseudo_class_Arraystub))
-               return false;
+               vm_abort("linker_init: linking pseudo_class_Arraystub failed");
 
        /* pseudo class representing the null type */
 
@@ -294,7 +317,7 @@ bool linker_init(void)
                vm_abort("linker_init: could not cache pseudo_class_Null");
 
        if (!link_class(pseudo_class_Null))
-               return false;
+               vm_abort("linker_init: linking failed");
 
        /* pseudo class representing new uninitialized objects */
     
@@ -306,95 +329,10 @@ bool linker_init(void)
        if (!classcache_store_unique(pseudo_class_New))
                vm_abort("linker_init: could not cache pseudo_class_New");
 
-       /* create classes representing primitive types */
-
-       if (!link_primitivetype_table())
-               return false;
-
-
        /* Correct vftbl-entries (retarded loading and linking of class
           java/lang/String). */
 
        stringtable_update();
-
-       return true;
-}
-
-
-/* link_primitivetype_table ****************************************************
-
-   Create classes representing primitive types.
-
-*******************************************************************************/
-
-static bool link_primitivetype_table(void)
-{  
-       classinfo *c;
-       utf       *u;
-       s4         i;
-
-       for (i = 0; i < PRIMITIVETYPE_COUNT; i++) {
-               /* skip dummies */
-
-               if (!primitivetype_table[i].name)
-                       continue;
-               
-               /* create primitive class */
-
-               c = class_create_classinfo(utf_new_char(primitivetype_table[i].name));
-
-               /* primitive classes don't have a super class */
-
-               c->super.any = NULL;
-
-               /* set flags and mark it as primitive class */
-
-               c->flags = ACC_PUBLIC | ACC_FINAL | ACC_ABSTRACT | ACC_CLASS_PRIMITIVE;
-               
-               /* prevent loader from loading primitive class */
-
-               c->state |= CLASS_LOADED;
-
-               /* INFO: don't put primitive classes into the classcache */
-
-               if (!link_class(c))
-                       return false;
-
-               primitivetype_table[i].class_primitive = c;
-
-               /* create class for wrapping the primitive type */
-
-               u = utf_new_char(primitivetype_table[i].wrapname);
-               c = load_class_bootstrap(u);
-
-               if (c == NULL)
-                       return false;
-
-               primitivetype_table[i].class_wrap = c;
-
-               /* create the primitive array class */
-
-               if (primitivetype_table[i].arrayname) {
-                       u = utf_new_char(primitivetype_table[i].arrayname);
-                       c = class_create_classinfo(u);
-                       c = load_newly_created_array(c, NULL);
-
-                       if (c == NULL)
-                               return false;
-
-                       primitivetype_table[i].arrayclass = c;
-
-                       assert(c->state & CLASS_LOADED);
-
-                       if (!(c->state & CLASS_LINKED))
-                               if (!link_class(c))
-                                       return false;
-
-                       primitivetype_table[i].arrayvftbl = c->vftbl;
-               }
-       }
-
-       return true;
 }
 
 
@@ -421,9 +359,9 @@ classinfo *link_class(classinfo *c)
 
        LOCK_MONITOR_ENTER(c);
 
-       /* maybe the class is already linked */
+       /* Maybe the class is currently linking or is already linked.*/
 
-       if (c->state & CLASS_LINKED) {
+       if ((c->state & CLASS_LINKING) || (c->state & CLASS_LINKED)) {
                LOCK_MONITOR_EXIT(c);
 
                return c;
@@ -443,9 +381,10 @@ classinfo *link_class(classinfo *c)
 
        r = link_class_intern(c);
 
-       /* if return value is NULL, we had a problem and the class is not linked */
+       /* If return value is NULL, we had a problem and the class is not
+          linked. */
 
-       if (!r)
+       if (r == NULL)
                c->state &= ~CLASS_LINKING;
 
 #if defined(ENABLE_STATISTICS)
@@ -579,11 +518,6 @@ static classinfo *link_class_intern(classinfo *c)
 
        RT_TIMING_GET_TIME(time_start);
 
-       /* the class is already linked */
-
-       if (c->state & CLASS_LINKED)
-               return c;
-
 #if !defined(NDEBUG)
        if (linkverbose)
                log_message_class("Linking class: ", c);
@@ -594,6 +528,10 @@ static classinfo *link_class_intern(classinfo *c)
        /* XXX should this be a specific exception? */
        assert(c->state & CLASS_LOADED);
 
+       /* This is check in link_class. */
+
+       assert(!(c->state & CLASS_LINKED));
+
        /* cache the self-reference of this class                          */
        /* we do this for cases where the defining loader of the class     */
        /* has not yet been recorded as an initiating loader for the class */
@@ -647,21 +585,24 @@ static classinfo *link_class_intern(classinfo *c)
 
        if (c->super.any == NULL) {                     /* class java.lang.Object */
                c->index = 0;
-               c->instancesize = sizeof(java_objectheader);
+               c->instancesize = sizeof(java_object_t);
                
                vftbllength = supervftbllength = 0;
 
                c->finalizer = NULL;
 
-       } else {
-               /* resolve super class */
+       }
+       else {
+               /* Resolve super class. */
+
+               super = resolve_classref_or_classinfo_eager(c->super, true);
 
-               if ((super = resolve_classref_or_classinfo_eager(c->super, true)) == NULL)
+               if (super == NULL)
                        return NULL;
 
                c->super.cls = super;
                
-               /* detect circularity */
+               /* Detect circularity. */
 
                if (super == c) {
                        exceptions_throw_classcircularityerror(c);
@@ -690,9 +631,11 @@ static classinfo *link_class_intern(classinfo *c)
                        if (!link_class(super))
                                return NULL;
 
-               /* OR the ACC_CLASS_HAS_POINTERS flag */
+               /* OR the ACC_CLASS_HAS_POINTERS and the ACC_CLASS_REFERENCE_*
+                  flags. */
 
-               c->flags |= (super->flags & ACC_CLASS_HAS_POINTERS);
+               c->flags |= (super->flags &
+                                        (ACC_CLASS_HAS_POINTERS | ACC_CLASS_REFERENCE_MASK));
 
                /* handle array classes */
 
@@ -953,7 +896,7 @@ static classinfo *link_class_intern(classinfo *c)
                if (!(f->flags & ACC_STATIC)) {
                        dsize = descriptor_typesize(f->parseddesc);
 
-#if defined(__I386__) || defined(__ARM__)
+#if defined(__I386__) || (defined(__ARM__) && !defined(__ARM_EABI__)) || (defined(__POWERPC__) && defined(__DARWIN__))
                        /* On i386 and ARM we align double and s8 fields to
                           4-bytes.  This matches what GCC does for struct
                           members. We must do the same as gcc here because the
@@ -1110,7 +1053,7 @@ static arraydescriptor *link_array(classinfo *c)
                /* c is an array of references */
                desc->arraytype = ARRAYTYPE_OBJECT;
                desc->componentsize = sizeof(void*);
-               desc->dataoffset = OFFSET(java_objectarray, data);
+               desc->dataoffset = OFFSET(java_objectarray_t, data);
                
                compvftbl = comp->vftbl;
 
@@ -1143,49 +1086,49 @@ static arraydescriptor *link_array(classinfo *c)
                switch (c->name->text[1]) {
                case 'Z':
                        desc->arraytype = ARRAYTYPE_BOOLEAN;
-                       desc->dataoffset = OFFSET(java_booleanarray,data);
+                       desc->dataoffset = OFFSET(java_booleanarray_t,data);
                        desc->componentsize = sizeof(u1);
                        break;
 
                case 'B':
                        desc->arraytype = ARRAYTYPE_BYTE;
-                       desc->dataoffset = OFFSET(java_bytearray,data);
+                       desc->dataoffset = OFFSET(java_bytearray_t,data);
                        desc->componentsize = sizeof(u1);
                        break;
 
                case 'C':
                        desc->arraytype = ARRAYTYPE_CHAR;
-                       desc->dataoffset = OFFSET(java_chararray,data);
+                       desc->dataoffset = OFFSET(java_chararray_t,data);
                        desc->componentsize = sizeof(u2);
                        break;
 
                case 'D':
                        desc->arraytype = ARRAYTYPE_DOUBLE;
-                       desc->dataoffset = OFFSET(java_doublearray,data);
+                       desc->dataoffset = OFFSET(java_doublearray_t,data);
                        desc->componentsize = sizeof(double);
                        break;
 
                case 'F':
                        desc->arraytype = ARRAYTYPE_FLOAT;
-                       desc->dataoffset = OFFSET(java_floatarray,data);
+                       desc->dataoffset = OFFSET(java_floatarray_t,data);
                        desc->componentsize = sizeof(float);
                        break;
 
                case 'I':
                        desc->arraytype = ARRAYTYPE_INT;
-                       desc->dataoffset = OFFSET(java_intarray,data);
+                       desc->dataoffset = OFFSET(java_intarray_t,data);
                        desc->componentsize = sizeof(s4);
                        break;
 
                case 'J':
                        desc->arraytype = ARRAYTYPE_LONG;
-                       desc->dataoffset = OFFSET(java_longarray,data);
+                       desc->dataoffset = OFFSET(java_longarray_t,data);
                        desc->componentsize = sizeof(s8);
                        break;
 
                case 'S':
                        desc->arraytype = ARRAYTYPE_SHORT;
-                       desc->dataoffset = OFFSET(java_shortarray,data);
+                       desc->dataoffset = OFFSET(java_shortarray_t,data);
                        desc->componentsize = sizeof(s2);
                        break;
 
@@ -1208,13 +1151,22 @@ static arraydescriptor *link_array(classinfo *c)
 
    XXX
 
+   ATTENTION: DO NOT REMOVE ANY OF THE LOCKING MECHANISMS BELOW:
+   This function needs to take the class renumber lock and stop the
+   world during class renumbering. The lock is used in C code which
+   is not that performance critical. Whereas JIT code uses critical
+   sections to atomically access the class values.
+
 *******************************************************************************/
 
 static void linker_compute_subclasses(classinfo *c)
 {
-#if defined(ENABLE_THREADS)
+       LOCK_MONITOR_ENTER(linker_classrenumber_lock);
+
+#if 0 && defined(ENABLE_THREADS) && !defined(DISABLE_GC)
        threads_cast_stopworld();
 #endif
+
        if (!(c->flags & ACC_INTERFACE)) {
                c->nextsub = NULL;
                c->sub     = NULL;
@@ -1231,7 +1183,9 @@ static void linker_compute_subclasses(classinfo *c)
 
        linker_compute_class_values(class_java_lang_Object);
 
-#if defined(ENABLE_THREADS)
+       LOCK_MONITOR_EXIT(linker_classrenumber_lock);
+
+#if 0 && defined(ENABLE_THREADS) && !defined(DISABLE_GC)
        threads_cast_startworld();
 #endif
 }