First version of x86 section.

[cacao.git] / loader.c

diff --git a/loader.c b/loader.c
index a73597d58afc442f97a396b020caf735be57d53d..aae004cf1020aa2cfe40b3891175c0cc77c44fd8 100644 (file)
--- a/loader.c
+++ b/loader.c
@@ -30,7 +30,7 @@
             Mark Probst
                        Edwin Steiner
 
-   $Id: loader.c 881 2004-01-13 19:57:08Z edwin $
+   $Id: loader.c 897 2004-01-21 00:49:42Z stefan $
 
 */
 
@@ -763,7 +763,7 @@ static int checkmethoddescriptor (utf *d)
 
     /* check arguments */
     while (utf_ptr != end_pos && *utf_ptr != ')') {
-               /* XXX we cannot count the this argument here because
+               /* We cannot count the this argument here because
                 * we don't know if the method is static. */
                if (*utf_ptr == 'J' || *utf_ptr == 'D')
                        argcount+=2;
@@ -790,7 +790,6 @@ static int checkmethoddescriptor (utf *d)
 
        /* XXX use the following if -noverify */
 #if 0
-       /* XXX check length */
        /* check arguments */
        while ((c = *utf_ptr++) != ')') {
                start = utf_ptr-1;
@@ -1070,7 +1069,6 @@ static void method_load(methodinfo *m, classinfo *c)
                        panic("Method has more than 255 arguments");
 
                /* check flag consistency */
-               /* XXX could check if <clinit> is STATIC */
                if (m->name != utf_clinit) {
                        i = (m->flags & (ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED));
                        if (i != 0 && i != ACC_PUBLIC && i != ACC_PRIVATE && i != ACC_PROTECTED)
@@ -1706,7 +1704,7 @@ static int class_load(classinfo *c)
        /* check ACC flags consistency */
        if ((c->flags & ACC_INTERFACE) != 0) {
                if ((c->flags & ACC_ABSTRACT) == 0) {
-                       /* XXX We work around this because interfaces in JDK 1.1 are
+                       /* We work around this because interfaces in JDK 1.1 are
                         * not declared abstract. */
 
                        c->flags |= ACC_ABSTRACT;
@@ -1974,7 +1972,7 @@ void class_new_array(classinfo *c)
        methodinfo *clone;
        int namelen;
 
-       /* XXX remove */ /* dolog("class_new_array: %s",c->name->text); */
+       /* DEBUG */ /* dolog("class_new_array: %s",c->name->text); */
 
        /* Array classes are not loaded from classfiles. */
        list_remove(&unloadedclasses, c);
@@ -2004,21 +2002,21 @@ void class_new_array(classinfo *c)
        c->flags = ACC_PUBLIC | ACC_FINAL | ACC_ABSTRACT;
 
     c->interfacescount = 2;
-    c->interfaces = MNEW(classinfo*,2); /* XXX use GC? */
+    c->interfaces = MNEW(classinfo*,2);
     c->interfaces[0] = class_java_lang_Cloneable;
     c->interfaces[1] = class_java_io_Serializable;
 
        c->methodscount = 1;
-       c->methods = MNEW (methodinfo, c->methodscount); /* XXX use GC? */
+       c->methods = MNEW (methodinfo, c->methodscount);
 
        clone = c->methods;
        memset(clone, 0, sizeof(methodinfo));
-       clone->flags = ACC_PUBLIC; /* XXX protected? */
+       clone->flags = ACC_PUBLIC;
        clone->name = utf_new_char("clone");
        clone->descriptor = utf_new_char("()Ljava/lang/Object;");
        clone->class = c;
        clone->stubroutine = createnativestub((functionptr) &builtin_clone_array, clone);
-       clone->monoPoly = MONO; /* XXX should be poly? */
+       clone->monoPoly = MONO;
 
        /* XXX: field: length? */
 
@@ -2787,7 +2785,7 @@ void class_init(classinfo *c)
 {
        methodinfo *m;
        s4 i;
-#ifdef USE_THREADS
+#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
        int b;
 #endif
 
@@ -2851,7 +2849,7 @@ void class_init(classinfo *c)
                log_text(logtext);
        }
 
-#ifdef USE_THREADS
+#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
        b = blockInts;
        blockInts = 0;
 #endif
@@ -2859,7 +2857,7 @@ void class_init(classinfo *c)
        /* now call the initializer */
        asm_calljavafunction(m, NULL, NULL, NULL, NULL);
 
-#ifdef USE_THREADS
+#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
        assert(blockInts == 0);
        blockInts = b;
 #endif
@@ -2898,14 +2896,14 @@ void class_init(classinfo *c)
                        return;
                }
 
-#ifdef USE_THREADS
+#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
                b = blockInts;
                blockInts = 0;
 #endif
 
                asm_calljavafunction(m, NULL, NULL, NULL, NULL);
 
-#ifdef USE_THREADS
+#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
                assert(blockInts == 0);
                blockInts = b;
 #endif
@@ -3202,7 +3200,9 @@ classinfo *loader_load(utf *topname)
 
        loader_load_running++;
        
+#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
        intsDisable();
+#endif
 
        if (getloadingtime)
                starttime = getcputime();
@@ -3223,7 +3223,7 @@ classinfo *loader_load(utf *topname)
        if (linkverbose)
                dolog("Linking...");
 
-       /* XXX added a hack to break infinite linking loops. A better
+       /* Added a hack to break infinite linking loops. A better
         * linking algorithm would be nice. -Edwin */
        notlinkable = NULL;
        while ((c = list_first(&unlinkedclasses))) {
@@ -3279,13 +3279,15 @@ classinfo *loader_load(utf *topname)
                }
        }
 
+#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
        intsRestore();
+#endif
        
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
        pthread_mutex_unlock(&compiler_mutex);
 #endif
 
-       /* XXX DEBUG */ if (linkverbose && !top) dolog("returning NULL from loader_load");
+       /* DEBUG */ /*if (linkverbose && !top) dolog("returning NULL from loader_load");*/
        
        return top; 
 }
@@ -3471,7 +3473,7 @@ classinfo *class_from_descriptor(char *utf_ptr, char *end_ptr,
                          if (mode & CLASSLOAD_SKIP) return class_java_lang_Object;
                          name = utf_new(start,utf_ptr-start);
                          return (mode & CLASSLOAD_LOAD)
-                                 ? loader_load(name) : class_new(name); /* XXX */
+                                 ? loader_load(name) : class_new(name); /* XXX handle errors */
                }
        }
 
@@ -3658,7 +3660,7 @@ void loader_init(u1 *stackbottom)
        /* correct vftbl-entries (retarded loading of class java/lang/String) */
        stringtable_update();
 
-#ifdef USE_THREADS
+#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
        if (stackbottom!=0)
                initLocks();
 #endif
@@ -3760,7 +3762,9 @@ void loader_compute_subclasses()
 {
        classinfo *c;
        
+#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
        intsDisable();                     /* schani */
+#endif
 
        c = list_first(&linkedclasses);
        while (c) {
@@ -3789,7 +3793,9 @@ void loader_compute_subclasses()
        cast_unlock();
 #endif
 
+#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
        intsRestore();                      /* schani */
+#endif
 }