[vmkit-commits] [vmkit] r60246 - in /vmkit/trunk/lib/JnJVM/VMCore: JavaClass.cpp JavaClass.h JavaConstantPool.h JnjvmModuleProvider.cpp LowerConstantCalls.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Sat Nov 29 05:46:44 2008
New Revision: 60246

URL: http://llvm.org/viewvc/llvm-project?rev=60246&view=rev
Log:
Code cleanup, no functionality changes.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h
    vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.h
    vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp
    vmkit/trunk/lib/JnJVM/VMCore/LowerConstantCalls.cpp

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp Sat Nov 29 05:46:44 2008
@@ -257,8 +257,7 @@
   }
 }
 
-CommonClass::CommonClass(JnjvmClassLoader* loader, const UTF8* n,
-                         bool isArray) {
+CommonClass::CommonClass(JnjvmClassLoader* loader, const UTF8* n) {
   name = n;
   classLoader = loader;
   nbInterfaces = 0;
@@ -270,7 +269,7 @@
 
 ClassPrimitive::ClassPrimitive(JnjvmClassLoader* loader, const UTF8* n,
                                uint32 nb) : 
-  CommonClass(loader, n, false) {
+  CommonClass(loader, n) {
  
   display = (CommonClass**)loader->allocator.Allocate(sizeof(CommonClass*));
   display[0] = this;
@@ -280,7 +279,7 @@
 }
 
 Class::Class(JnjvmClassLoader* loader, const UTF8* n, ArrayUInt8* B) : 
-    CommonClass(loader, n, false) {
+    CommonClass(loader, n) {
   virtualVT = 0;
   bytes = B;
   super = 0;
@@ -306,7 +305,7 @@
 
 ClassArray::ClassArray(JnjvmClassLoader* loader, const UTF8* n,
                        UserCommonClass* base) : 
-    CommonClass(loader, n, true) {
+    CommonClass(loader, n) {
   _baseClass = base;
   super = ClassArray::SuperArray;
   interfaces = ClassArray::InterfacesArray;

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h Sat Nov 29 05:46:44 2008
@@ -302,7 +302,7 @@
   
   /// CommonClass - Create a class with th given name.
   ///
-  CommonClass(JnjvmClassLoader* loader, const UTF8* name, bool isArray);
+  CommonClass(JnjvmClassLoader* loader, const UTF8* name);
   
   /// ~CommonClass - Free memory used by this class, and remove it from
   /// metadata.

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaConstantPool.h Sat Nov 29 05:46:44 2008
@@ -19,8 +19,6 @@
 
 class Class;
 class CommonClass;
-class Jnjvm;
-class JavaConstantPool;
 class JavaField;
 class JavaMethod;
 class JavaString;
@@ -251,16 +249,10 @@
   
   /// loadClass - Loads the class and returns it. This is called just in time, 
   /// ie when the class will be used and not yet resolved, and also for
-  /// two special instructions when JIIting: exception comparisons, and
-  /// MULTIANEWARRAY. This function is also called by the classpath for
-  /// loading exception classes referenced by a method.
+  /// loading exceptions when JITting catch clauses.
   ///
   CommonClass* loadClass(uint32 index);
 
-  /// JavaConstantPool - Default constructor.
-  ///
-  JavaConstantPool() {}
-  
   /// JavaConstantPool - Reads the bytecode of the class to get
   /// the initial types and constants definitions.
   ///

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp Sat Nov 29 05:46:44 2008
@@ -168,6 +168,9 @@
 
 namespace mvm {
   llvm::FunctionPass* createEscapeAnalysisPass(llvm::Function*);
+}
+
+namespace jnjvm {
   llvm::FunctionPass* createLowerConstantCallsPass();
   llvm::FunctionPass* createLowerForcedCallsPass();
 }
@@ -182,14 +185,14 @@
   JavaNativeFunctionPasses->add(new llvm::TargetData(m));
   // Lower constant calls to lower things like getClass used
   // on synchronized methods.
-  JavaNativeFunctionPasses->add(mvm::createLowerConstantCallsPass());
+  JavaNativeFunctionPasses->add(createLowerConstantCallsPass());
   
   JavaFunctionPasses = new llvm::FunctionPassManager(this);
   JavaFunctionPasses->add(new llvm::TargetData(m));
   Function* func = m->JavaObjectAllocateFunction;
   JavaFunctionPasses->add(mvm::createEscapeAnalysisPass(func));
-  JavaFunctionPasses->add(mvm::createLowerConstantCallsPass());
-  JavaFunctionPasses->add(mvm::createLowerForcedCallsPass());
+  JavaFunctionPasses->add(createLowerConstantCallsPass());
+  JavaFunctionPasses->add(createLowerForcedCallsPass());
   nbCallbacks = 0;
 }
 

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/LowerConstantCalls.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/LowerConstantCalls.cpp Sat Nov 29 05:46:44 2008
@@ -20,9 +20,8 @@
 #include "JnjvmModule.h"
 
 using namespace llvm;
-using namespace jnjvm;
 
-namespace mvm {
+namespace jnjvm {
 
   class VISIBILITY_HIDDEN LowerConstantCalls : public FunctionPass {
   public: