harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlyd...@apache.org
Subject svn commit: r572317 - /harmony/enhanced/sandbox/bootjvm/bootJVM/jvm/src/jvm.c
Date Mon, 03 Sep 2007 13:21:51 GMT
Author: dlydick
Date: Mon Sep  3 06:21:51 2007
New Revision: 572317

URL: http://svn.apache.org/viewvc?rev=572317&view=rev
Log:
Adjusted load order for startup classes.

Modified:
    harmony/enhanced/sandbox/bootjvm/bootJVM/jvm/src/jvm.c

Modified: harmony/enhanced/sandbox/bootjvm/bootJVM/jvm/src/jvm.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/sandbox/bootjvm/bootJVM/jvm/src/jvm.c?rev=572317&r1=572316&r2=572317&view=diff
==============================================================================
--- harmony/enhanced/sandbox/bootjvm/bootJVM/jvm/src/jvm.c (original)
+++ harmony/enhanced/sandbox/bootjvm/bootJVM/jvm/src/jvm.c Mon Sep  3 06:21:51 2007
@@ -1328,16 +1328,23 @@
        (jvm_class_index_null == pjvm->class_primative_boolean))
     {
         sysErrMsg(arch_function_name,
-                  "Cannot load primative classes for java.lang.Class");
+                  "Cannot load primative classes");
         exit_jvm(EXIT_JVM_CLASS);
 /*NOTREACHED*/
     }
 
 
-    /********** Load java.lang.Class *****************/
-
     /********** Load java.lang.String ****************/
 
+    clsidx = class_load_from_prchar(JVMCLASS_JAVA_LANG_STRING,
+                           /* The startup classes have local bindings */
+                                    rtrue,
+                                    (jint *) rnull);
+
+
+
+    /********** Load java.lang.Class *****************/
+
     /********** Load java.lang.Thread ****************/
 
     /********** Load, resolve, and @c @b \<clinit\> all classes *****/
@@ -1354,19 +1361,20 @@
                                   jvm_thread_index_null,
                                   rtrue,
                                   rtrue);
-#if 0
+#if 1
     /* Enable for diagnostics when desired */
     cfmsgs_show_constant_pool(CLASS_OBJECT_LINKAGE(clsidxOBJECT)->pcfs);
 #endif
 
-    jvm_class_index clsidxCLASS =
-        class_load_resolve_clinit(JVMCLASS_JAVA_LANG_CLASS,
-                                  jvm_thread_index_null,
-                                  rtrue,
-                                  rtrue);
-#if 0
+#if 1
     /* Enable for diagnostics when desired */
-    cfmsgs_show_constant_pool(CLASS_OBJECT_LINKAGE(clsidxCLASS)->pcfs);
+    cfmsgs_show_constant_pool(CLASS_OBJECT_LINKAGE(clsidxOBJECT)->pcfs);
+#endif
+
+#if 1
+    /* Enable for diagnostics when desired */
+#warning Remove block ASAP
+    cfmsgs_show_constant_pool(CLASS_OBJECT_LINKAGE(clsidx)->pcfs);
 #endif
 
     jvm_class_index clsidxSTRING =
@@ -1374,9 +1382,15 @@
                                   jvm_thread_index_null,
                                   rtrue,
                                   rtrue);
+
+    jvm_class_index clsidxCLASS =
+        class_load_resolve_clinit(JVMCLASS_JAVA_LANG_CLASS,
+                                  jvm_thread_index_null,
+                                  rtrue,
+                                  rtrue);
 #if 0
     /* Enable for diagnostics when desired */
-    cfmsgs_show_constant_pool(CLASS_OBJECT_LINKAGE(clsidxSTRING)->pcfs);
+    cfmsgs_show_constant_pool(CLASS_OBJECT_LINKAGE(clsidxCLASS)->pcfs);
 #endif
 
     HEAP_REPORT(&jvm_heap_initialized);
@@ -1557,13 +1571,13 @@
 
             if (pjs->jar_msg)
             {
-            sysErrMsg(arch_function_name,
+                sysErrMsg(arch_function_name,
                      "Invalid or missing startup JAR manifest file: %s",
                       pjs->jar_msg);
             }
             else
             {
-            sysErrMsg(arch_function_name,
+                sysErrMsg(arch_function_name,
                       "Invalid or missing startup JAR manifest file");
             }
             HEAP_FREE_DATA(pjs);



Mime
View raw message