[vmkit-commits] [vmkit] r120578 - in /vmkit/branches/multi-vm: include/mvm/VMKit.h lib/J3/Classpath/ClasspathVMThread.inc

[Gael Thomas]

Author: gthomas
Date: Wed Dec  1 10:12:07 2010
New Revision: 120578

URL: http://llvm.org/viewvc/llvm-project?rev=120578&view=rev
Log:
the argument of the start routine of a thread is a mvm::Thread, not a JavaThread

Modified:
    vmkit/branches/multi-vm/include/mvm/VMKit.h
    vmkit/branches/multi-vm/lib/J3/Classpath/ClasspathVMThread.inc

Modified: vmkit/branches/multi-vm/include/mvm/VMKit.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/include/mvm/VMKit.h?rev=120578&r1=120577&r2=120578&view=diff
==============================================================================
--- vmkit/branches/multi-vm/include/mvm/VMKit.h (original)
+++ vmkit/branches/multi-vm/include/mvm/VMKit.h Wed Dec  1 10:12:07 2010
@@ -8,10 +8,14 @@
 class VMKit : public mvm::PermanentObject {
 public:
   /// allocator - Bump pointer allocator to allocate permanent memory of VMKit
-  ///
   mvm::BumpPtrAllocator& allocator;
 
-  VMKit(mvm::BumpPtrAllocator &Alloc) : allocator(Alloc) {}
+  VMKit(mvm::BumpPtrAllocator &Alloc) : allocator(Alloc) {
+	}
+
+	/// ------------------------------------------------- ///
+	/// ---             thread managment              --- ///
+	/// ------------------------------------------------- ///
 };
 
 }

Modified: vmkit/branches/multi-vm/lib/J3/Classpath/ClasspathVMThread.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/Classpath/ClasspathVMThread.inc?rev=120578&r1=120577&r2=120578&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/Classpath/ClasspathVMThread.inc (original)
+++ vmkit/branches/multi-vm/lib/J3/Classpath/ClasspathVMThread.inc Wed Dec  1 10:12:07 2010
@@ -32,13 +32,13 @@
   return JavaThread::get()->currentThread();
 }
 
-void start(JavaThread* thread) {
-
+void start(mvm::Thread* mut) {
   JavaObjectVMThread* vmThread = NULL;
   JavaObject* javaThread = NULL;
   llvm_gcroot(vmThread, 0);
   llvm_gcroot(javaThread, 0);
 
+	JavaThread* thread = JavaThread::j3Thread(mut);
   Jnjvm* vm = thread->getJVM();
   // Wait some time to let the creator initialise these fields.
   while ((thread->javaThread == NULL) || (thread->vmThread == NULL)) {