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

[Nicolas Geoffray]

Author: geoffray
Date: Wed Aug 20 05:26:03 2008
New Revision: 55043

URL: http://llvm.org/viewvc/llvm-project?rev=55043&view=rev
Log:
Rename sharedLoader and remove CommonClass::VT.


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

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h Wed Aug 20 05:26:03 2008
@@ -416,11 +416,6 @@
   ///
   CommonClass(JnjvmClassLoader* loader, const UTF8* name, bool isArray);
   
-  /// VT - The virtual table of instances of this class (TODO: should be
-  /// removed).
-  ///
-  static VirtualTable* VT;
-
   /// ~CommonClass - Free memory used by this class, and remove it from
   /// metadata.
   ///
@@ -442,6 +437,12 @@
     return static_cast<Ty*>(JInfo);
   }
 
+#ifdef MULTIPLE_VM
+  bool isSharedClass() {
+    return loader == JnjvmClassLoader::sharedLoader;
+  }
+#endif
+
 };
 
 /// ClassPrimitive - This class represents internal classes for primitive

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaInitialise.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaInitialise.cpp Wed Aug 20 05:26:03 2008
@@ -40,7 +40,6 @@
   X fake; \
   X::VT = ((void**)(void*)(&fake))[0]; }
 
-  INIT(CommonClass);
   INIT(Class);
   INIT(ClassArray);
   INIT(JavaThread);

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.h Wed Aug 20 05:26:03 2008
@@ -215,9 +215,9 @@
   static JnjvmBootstrapLoader* bootstrapLoader;
   
 #ifdef MULTIPLE_VM
-  /// SharedLoader - Shared loader when multiple vms are executing.
+  /// sharedLoader - Shared loader when multiple vms are executing.
   ///
-  static JnjvmClassLoader* SharedLoader;
+  static JnjvmClassLoader* sharedLoader;
 #endif
 
   /// ~JnjvmClassLoader - Destroy the loader. Depending on the JVM

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp Wed Aug 20 05:26:03 2008
@@ -27,7 +27,6 @@
 
   INIT(JavaArray);
   INIT(ArrayObject);
-  INIT(CommonClass);
   INIT(Class);
   INIT(ClassArray);
   INIT(JavaObject);