[vmkit-commits] [vmkit] r121365 - in /vmkit/branches/multi-vm: lib/J3/Classpath/JavaUpcalls.cpp lib/J3/Compiler/JavaAOTCompiler.cpp lib/J3/VMCore/Jnjvm.cpp lib/J3/VMCore/Jnjvm.h tools/j3/Main.cpp

[Gael Thomas]

Author: gthomas
Date: Thu Dec  9 05:00:37 2010
New Revision: 121365

URL: http://llvm.org/viewvc/llvm-project?rev=121365&view=rev
Log:
remove the useless field javaMainThread

Modified:
    vmkit/branches/multi-vm/lib/J3/Classpath/JavaUpcalls.cpp
    vmkit/branches/multi-vm/lib/J3/Compiler/JavaAOTCompiler.cpp
    vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.cpp
    vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.h
    vmkit/branches/multi-vm/tools/j3/Main.cpp

Modified: vmkit/branches/multi-vm/lib/J3/Classpath/JavaUpcalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/Classpath/JavaUpcalls.cpp?rev=121365&r1=121364&r2=121365&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/Classpath/JavaUpcalls.cpp (original)
+++ vmkit/branches/multi-vm/lib/J3/Classpath/JavaUpcalls.cpp Thu Dec  9 05:00:37 2010
@@ -103,7 +103,7 @@
   RG = rootGroup->getStaticObjectField();
   assert(RG && "No root group");
   assert(vm->getMainThread() && "VM did not set its main thread");
-  CreateJavaThread(vm, vm->javaMainThread, "main", RG);
+  CreateJavaThread(vm, JavaThread::get(), "main", RG);
 
   // Create the "system" group.
   SystemGroup = threadGroup->doNew();

Modified: vmkit/branches/multi-vm/lib/J3/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/Compiler/JavaAOTCompiler.cpp?rev=121365&r1=121364&r2=121365&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/branches/multi-vm/lib/J3/Compiler/JavaAOTCompiler.cpp Thu Dec  9 05:00:37 2010
@@ -2090,8 +2090,7 @@
 
 void JavaAOTCompiler::compileFile(Jnjvm* vm, const char* n) {
   name = n;
-	vm->javaMainThread = JavaThread::create(vm);
-  vm->javaMainThread->mut->start(mainCompilerStart);
+	JavaThread::create(vm)->mut->start(mainCompilerStart);
   vm->vmkit->waitNonDaemonThreads();
 }
 

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=121365&r1=121364&r2=121365&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.cpp (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.cpp Thu Dec  9 05:00:37 2010
@@ -1319,8 +1319,7 @@
 void Jnjvm::runApplication(int argc, char** argv) {
   argumentsInfo.argc = argc;
   argumentsInfo.argv = argv;
-  javaMainThread = JavaThread::create(this);
-  javaMainThread->mut->start((void (*)(mvm::Thread*))mainJavaStart);
+  JavaThread::create(this)->mut->start((void (*)(mvm::Thread*))mainJavaStart);
 }
 
 Jnjvm::Jnjvm(mvm::BumpPtrAllocator& Alloc, mvm::VMKit* vmkit, JavaCompiler* Comp, bool dlLoad) : 

Modified: vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.h?rev=121365&r1=121364&r2=121365&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.h (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.h Thu Dec  9 05:00:37 2010
@@ -183,9 +183,6 @@
   ///
   StringMap hashStr;
 
-	/// javaMainThread - the java main thread
-	JavaThread* javaMainThread;
-
 	mvm::VirtualTable* VMClassLoader__VT;
 
 	void initialiseInternalVTs();

Modified: vmkit/branches/multi-vm/tools/j3/Main.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/tools/j3/Main.cpp?rev=121365&r1=121364&r2=121365&view=diff
==============================================================================
--- vmkit/branches/multi-vm/tools/j3/Main.cpp (original)
+++ vmkit/branches/multi-vm/tools/j3/Main.cpp Thu Dec  9 05:00:37 2010
@@ -41,7 +41,7 @@
  
   // Run the application. 
   vm->runApplication(argc, argv);
-  vmkit->waitNonDamonThreads();
+  vmkit->waitNonDaemonThreads();
   exit(0);
 
   // Destroy everyone.