[vmkit-commits] [vmkit] r60184 - in /vmkit/trunk/lib/JnJVM/VMCore: JavaClass.cpp Jnjvm.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Thu Nov 27 16:01:58 2008
New Revision: 60184

URL: http://llvm.org/viewvc/llvm-project?rev=60184&view=rev
Log:
An array class is ready when loaded.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp
    vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp Thu Nov 27 16:01:58 2008
@@ -333,7 +333,7 @@
   } else {
     virtualVT = ArrayObject::VT;
   }
-  status = resolved;
+  status = ready;
 }
 
 void Class::print(mvm::PrintBuffer* buf) const {

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp Thu Nov 27 16:01:58 2008
@@ -55,10 +55,6 @@
 void UserCommonClass::initialiseClass(Jnjvm* vm) {
   
   // Primitives are initialized at boot time, arrays are initialized directly.
-  if (isArray()) {
-    status = ready;
-    return;
-  }
   
   // Assumes that the Class object has already been verified and prepared and
   // that the Class object contains state that can indicate one of four