[vmkit-commits] [vmkit] r54691 - in /vmkit/trunk/lib/JnJVM/VMCore: JavaIsolate.cpp JavaUpcalls.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Tue Aug 12 13:07:28 2008
New Revision: 54691

URL: http://llvm.org/viewvc/llvm-project?rev=54691&view=rev
Log:
Perform initialization of bootstrap classes when loading the
bootstrap of a jvm. Also initialize the VMThrowable class during
bootstrap.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JavaIsolate.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaUpcalls.cpp

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaIsolate.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaIsolate.cpp?rev=54691&r1=54690&r2=54691&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaIsolate.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaIsolate.cpp Tue Aug 12 13:07:28 2008
@@ -318,6 +318,8 @@
 }
 
 void JavaIsolate::loadBootstrap() {
+  loadName(Classpath::newVMThrowable->name,
+           CommonClass::jnjvmClassLoader, true, true, true);
   loadName(Classpath::newClass->name,
            CommonClass::jnjvmClassLoader, true, true, true);
   loadName(Classpath::newConstructor->name,

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaUpcalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaUpcalls.cpp?rev=54691&r1=54690&r2=54691&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaUpcalls.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaUpcalls.cpp Tue Aug 12 13:07:28 2008
@@ -389,12 +389,12 @@
     
   vm->loadName(vm->asciizConstructUTF8("java/lang/String"), 
                                        CommonClass::jnjvmClassLoader, true,
-                                       true, false);
+                                       false, false);
 
   CommonClass* object = 
     vm->loadName(vm->asciizConstructUTF8("java/lang/Object"), 
                                          CommonClass::jnjvmClassLoader, true,
-                                         true, false);
+                                         false, false);
   COMPILE_METHODS(object)
   
   JavaMethod* getCallingClass =