[vmkit-commits] [vmkit] r121254 - in /vmkit/branches/multi-vm/lib/J3/VMCore: Jnjvm.cpp JnjvmClassLoader.cpp

[Gael Thomas]

Author: gthomas
Date: Wed Dec  8 07:43:01 2010
New Revision: 121254

URL: http://llvm.org/viewvc/llvm-project?rev=121254&view=rev
Log:
remove the useless vm arg from some function

Modified:
    vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.cpp
    vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmClassLoader.cpp

Modified: vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.cpp?rev=121254&r1=121253&r2=121254&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.cpp (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.cpp Wed Dec  8 07:43:01 2010
@@ -1050,10 +1050,10 @@
     appClassLoader = JnjvmClassLoader::getJnjvmLoaderFromJavaObject(loader,
                                                                     this);
     if (argumentsInfo.jarFile) {
-      appClassLoader->loadLibFromJar(this, argumentsInfo.jarFile,
+      appClassLoader->loadLibFromJar(argumentsInfo.jarFile,
                                      argumentsInfo.className);
     } else if (argumentsInfo.className) {
-      appClassLoader->loadLibFromFile(this, argumentsInfo.className);
+      appClassLoader->loadLibFromFile(argumentsInfo.className);
     }
   }
   return appClassLoader;
@@ -1186,7 +1186,7 @@
 
   TRY {
     // First try to see if we are a self-contained executable.
-    UserClass* cl = appClassLoader->loadClassFromSelf(this, className);
+    UserClass* cl = appClassLoader->loadClassFromSelf(className);
     
     // If not, load the class.
     if (cl == NULL) {
@@ -1366,7 +1366,7 @@
     end = end->prev;
   }
 
-  bootstrapLoader->insertAllMethodsInVM(this);  
+  bootstrapLoader->insertAllMethodsInVM();
 }
 
 Jnjvm::~Jnjvm() {

Modified: vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmClassLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmClassLoader.cpp?rev=121254&r1=121253&r2=121254&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/JnjvmClassLoader.cpp Wed Dec  8 07:43:01 2010
@@ -895,7 +895,7 @@
   fprintf(stderr, "\n");
 }
 
-void JnjvmClassLoader::insertAllMethodsInVM(Jnjvm* vm) {
+void JnjvmClassLoader::insertAllMethodsInVM() {
   for (ClassMap::iterator i = classes->map.begin(), e = classes->map.end();
        i != e; ++i) {
     CommonClass* cl = i->second;
@@ -923,7 +923,7 @@
   }
 }
 
-void JnjvmClassLoader::loadLibFromJar(Jnjvm* vm, const char* name,
+void JnjvmClassLoader::loadLibFromJar(const char* name,
                                       const char* file) {
 
   mvm::ThreadAllocator threadAllocator;
@@ -938,12 +938,12 @@
       static_init_t init = (static_init_t)(uintptr_t)cl->classLoader;
       assert(init && "Loaded the wrong library");
       init(this);
-      insertAllMethodsInVM(vm);
+      insertAllMethodsInVM();
     }
   }
 }
 
-void JnjvmClassLoader::loadLibFromFile(Jnjvm* vm, const char* name) {
+void JnjvmClassLoader::loadLibFromFile(const char* name) {
   mvm::ThreadAllocator threadAllocator;
   assert(classes->map.size() == 0);
   char* soName = (char*)threadAllocator.Allocate(
@@ -955,18 +955,18 @@
     if (cl) {
       static_init_t init = (static_init_t)(uintptr_t)cl->classLoader;
       init(this);
-      insertAllMethodsInVM(vm);
+      insertAllMethodsInVM();
     }
   }
 }
 
-Class* JnjvmClassLoader::loadClassFromSelf(Jnjvm* vm, const char* name) {
+Class* JnjvmClassLoader::loadClassFromSelf(const char* name) {
   assert(classes->map.size() == 0);
   Class* cl = (Class*)dlsym(SELF_HANDLE, name);
   if (cl) {
     static_init_t init = (static_init_t)(uintptr_t)cl->classLoader;
     init(this);
-    insertAllMethodsInVM(vm);
+    insertAllMethodsInVM();
   }
   return cl;
 }