* class_java_lang_Thread, class_java_lang_VMThread: Added.

diff --git a/src/vm/class.c b/src/vm/class.c
index ebdf9e7f4f59e605ac08c77a73878c6e265546b8..394da80f6b44157e0046e3590feb2fd8d8ba7029 100644 (file)
--- a/src/vm/class.c
+++ b/src/vm/class.c
@@ -30,7 +30,7 @@
             Andreas Krall
             Christian Thalinger
 
-   $Id: class.c 3260 2005-09-21 19:41:47Z twisti $
+   $Id: class.c 3292 2005-09-28 10:36:34Z twisti $
 
 */
 
@@ -93,7 +93,9 @@ classinfo *class_java_lang_Cloneable = NULL;
 classinfo *class_java_lang_SecurityManager = NULL;
 classinfo *class_java_lang_String = NULL;
 classinfo *class_java_lang_System = NULL;
+classinfo *class_java_lang_Thread = NULL;
 classinfo *class_java_lang_ThreadGroup = NULL;
+classinfo *class_java_lang_VMThread = NULL;
 classinfo *class_java_io_Serializable = NULL;
 
 

diff --git a/src/vm/class.h b/src/vm/class.h
index 37beb0d62f6e3d4676c77bf2da447073f5e2b660..8ff041a4defbd9993daacc2aad99e20ec598742f 100644 (file)
--- a/src/vm/class.h
+++ b/src/vm/class.h
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: class.h 3259 2005-09-21 19:41:11Z twisti $
+   $Id: class.h 3292 2005-09-28 10:36:34Z twisti $
 
 */
 
@@ -163,7 +163,9 @@ extern classinfo *class_java_lang_Cloneable;
 extern classinfo *class_java_lang_SecurityManager;
 extern classinfo *class_java_lang_String;
 extern classinfo *class_java_lang_System;
+extern classinfo *class_java_lang_Thread;
 extern classinfo *class_java_lang_ThreadGroup;
+extern classinfo *class_java_lang_VMThread;
 extern classinfo *class_java_io_Serializable;
 
 

diff --git a/src/vm/linker.c b/src/vm/linker.c
index 20351062904246dbfc113119ea21cf4cf06402bc..e080a679e051b2757c2f09b7f58631713c85b067 100644 (file)
--- a/src/vm/linker.c
+++ b/src/vm/linker.c
@@ -32,7 +32,7 @@
             Edwin Steiner
             Christian Thalinger
 
-   $Id: linker.c 3267 2005-09-21 20:21:48Z twisti $
+   $Id: linker.c 3292 2005-09-28 10:36:34Z twisti $
 
 */
 
@@ -168,9 +168,15 @@ bool linker_init(void)
        if (!link_class(class_java_lang_System))
                return false;
 
+       if (!link_class(class_java_lang_Thread))
+               return false;
+
        if (!link_class(class_java_lang_ThreadGroup))
                return false;
 
+       if (!link_class(class_java_lang_VMThread))
+               return false;
+
 
        /* some classes which may be used more often */
 
@@ -214,14 +220,14 @@ bool linker_init(void)
                assert(0);
        }
 
-    if (!link_class(pseudo_class_Arraystub))
+       if (!link_class(pseudo_class_Arraystub))
                return false;
 
-    /* pseudo class representing the null type */
+       /* pseudo class representing the null type */
     
        pseudo_class_Null = class_create_classinfo(utf_new_char("$NULL$"));
        pseudo_class_Null->loaded = true;
-    pseudo_class_Null->super.cls = class_java_lang_Object;
+       pseudo_class_Null->super.cls = class_java_lang_Object;
 
        if (!classcache_store_unique(pseudo_class_Null)) {
                log_text("could not cache pseudo_class_Null");
@@ -231,7 +237,7 @@ bool linker_init(void)
        if (!link_class(pseudo_class_Null))
                return false;
 
-    /* pseudo class representing new uninitialized objects */
+       /* pseudo class representing new uninitialized objects */
     
        pseudo_class_New = class_create_classinfo(utf_new_char("$NEW$"));
        pseudo_class_New->loaded = true;

diff --git a/src/vm/loader.c b/src/vm/loader.c
index 4fefd169622ff82b28dfdd306ec29b689c3e5584..08bc4d5bbd7ef97188f17d91ce4bb1de3facb84c 100644 (file)
--- a/src/vm/loader.c
+++ b/src/vm/loader.c
@@ -32,7 +32,7 @@
             Edwin Steiner
             Christian Thalinger
 
-   $Id: loader.c 3269 2005-09-21 20:23:47Z twisti $
+   $Id: loader.c 3292 2005-09-28 10:36:34Z twisti $
 
 */
 
@@ -126,7 +126,7 @@ bool loader_init(u1 *stackbottom)
 #if defined(USE_THREADS) && defined(NATIVE_THREADS)
        classpath_info *cpi;
 
-       /* Initialize the monitor pointer for zip/jar file locking.               */
+       /* Initialize the monitor pointer for zip/jar file locking. */
 
        for (cpi = classpath_entries; cpi != NULL; cpi = cpi->next) {
                if (cpi->type == CLASSPATH_ARCHIVE)
@@ -200,10 +200,18 @@ bool loader_init(u1 *stackbottom)
        if (!(class_java_lang_System = load_class_bootstrap(utf_java_lang_System)))
                return false;
 
+       if (!(class_java_lang_Thread =
+                 load_class_bootstrap(utf_new_char("java/lang/Thread"))))
+               return false;
+
        if (!(class_java_lang_ThreadGroup =
                  load_class_bootstrap(utf_java_lang_ThreadGroup)))
                return false;
 
+       if (!(class_java_lang_VMThread =
+                 load_class_bootstrap(utf_new_char("java/lang/VMThread"))))
+               return false;
+
 
        /* some classes which may be used more often */