[vmkit-commits] [vmkit] r60173 - in /vmkit/trunk/lib/JnJVM/VMCore: JavaClass.cpp JavaClass.h JnjvmClassLoader.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Thu Nov 27 09:44:47 2008
New Revision: 60173

URL: http://llvm.org/viewvc/llvm-project?rev=60173&view=rev
Log:
Make super Class*, not CommonClass*.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h
    vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp Thu Nov 27 09:44:47 2008
@@ -40,7 +40,7 @@
 const UTF8* Attribut::innerClassesAttribut = 0;
 const UTF8* Attribut::sourceFileAttribut = 0;
 
-CommonClass* ClassArray::SuperArray;
+Class* ClassArray::SuperArray;
 Class** ClassArray::InterfacesArray;
 
 Attribut::Attribut(const UTF8* name, uint32 length,

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h Thu Nov 27 09:44:47 2008
@@ -220,11 +220,7 @@
 // New fields can be added from now, or reordered.
 //
 //===----------------------------------------------------------------------===//
-   
-  /// virtualTableSize - The size of the virtual table of this class.
-  ///
-  uint32 virtualTableSize;
-   
+    
   /// access - {public, private, protected}.
   ///
   uint32 access;
@@ -248,7 +244,7 @@
    
   /// super - The parent of this class.
   ///
-  CommonClass * super;
+  Class * super;
    
   /// classLoader - The Jnjvm class loader that loaded the class.
   ///
@@ -289,7 +285,7 @@
   uint32 getAccess()              { return access;}
   Class** getInterfaces()         { return interfaces; }
   const UTF8* getName()           { return name; }
-  CommonClass* getSuper()         { return super; }
+  Class* getSuper()               { return super; }
   JavaField* getStaticFields()    { return staticFields; }
   JavaField* getVirtualFields()   { return virtualFields; }
   JavaMethod* getStaticMethods()  { return staticMethods; }
@@ -520,7 +516,7 @@
 
   /// setSuper - Set the super of the class.
   ///
-  void setSuper(CommonClass* S) {
+  void setSuper(Class* S) {
     super = S;
   }
   
@@ -671,6 +667,10 @@
     innerAccess = access;
   }
   
+  /// virtualTableSize - The size of the virtual table of this class.
+  ///
+  uint32 virtualTableSize;
+  
   /// staticSize - The size of the static instance of this class.
   ///
   uint32 staticSize;
@@ -855,7 +855,7 @@
   ///
   virtual void TRACER;
 
-  static CommonClass* SuperArray;
+  static Class* SuperArray;
   static Class** InterfacesArray;
 };
 

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp Thu Nov 27 09:44:47 2008
@@ -110,7 +110,7 @@
   SuperArray = loadName(asciizConstructUTF8("java/lang/Object"), false,
                         false);
    
-  ClassArray::SuperArray = SuperArray->getInternal();
+  ClassArray::SuperArray = (Class*)SuperArray->getInternal();
   ClassArray::InterfacesArray = 
     (Class**)allocator.Allocate(2 * sizeof(UserClass*));
   ClassArray::InterfacesArray[0] = (Class*)InterfacesArray[0]->getInternal();