[vmkit-commits] [vmkit] r119501 - in /vmkit/branches/multi-vm/lib/J3/VMCore: JavaThread.cpp JavaThread.h

[Gael Thomas]

Author: gthomas
Date: Wed Nov 17 09:41:44 2010
New Revision: 119501

URL: http://llvm.org/viewvc/llvm-project?rev=119501&view=rev
Log:
JavaThread::get() uses vmData. Add a Jnjvm field in JavaThread.

Modified:
    vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.cpp
    vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.h

Modified: vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.cpp?rev=119501&r1=119500&r2=119501&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.cpp (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.cpp Wed Nov 17 09:41:44 2010
@@ -37,6 +37,7 @@
   jniEnv = isolate->jniEnv;
   localJNIRefs = new JNILocalReferences();
   currentAddedReferences = 0;
+	jnjvm = isolate;
 
 #ifdef SERVICE
   eipIndex = 0;

Modified: vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.h?rev=119501&r1=119500&r2=119501&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.h (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.h Wed Nov 17 09:41:44 2010
@@ -120,6 +120,9 @@
   ///
   JNILocalReferences* localJNIRefs;
 
+  /// jnjvm - my vm
+  ///
+	Jnjvm *jnjvm;
 
   JavaObject** pushJNIRef(JavaObject* obj) {
     llvm_gcroot(obj, 0);
@@ -158,13 +161,13 @@
   /// get - Get the current thread as a JnJVM object.
   ///
   static JavaThread* get() {
-    return (JavaThread*)mvm::Thread::get();
+    return j3Thread(mvm::Thread::get());
   }
 
   /// getJVM - Get the JnJVM in which this thread executes.
   ///
   Jnjvm* getJVM() {
-    return (Jnjvm*)MyVM;
+    return jnjvm;
   }
 
   /// currentThread - Return the current thread as a Java object.