[vmkit-commits] [vmkit] r121256 - in /vmkit/branches/multi-vm: include/mvm/Threads/Thread.h lib/Mvm/CommonThread/ctthread.cpp lib/Mvm/Compiler/mvm-runtime.ll

[Gael Thomas]

Author: gthomas
Date: Wed Dec  8 07:55:11 2010
New Revision: 121256

URL: http://llvm.org/viewvc/llvm-project?rev=121256&view=rev
Log:
remove the field MyVM from mvm::Thread (yipa!)


Modified:
    vmkit/branches/multi-vm/include/mvm/Threads/Thread.h
    vmkit/branches/multi-vm/lib/Mvm/CommonThread/ctthread.cpp
    vmkit/branches/multi-vm/lib/Mvm/Compiler/mvm-runtime.ll

Modified: vmkit/branches/multi-vm/include/mvm/Threads/Thread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/include/mvm/Threads/Thread.h?rev=121256&r1=121255&r2=121256&view=diff
==============================================================================
--- vmkit/branches/multi-vm/include/mvm/Threads/Thread.h (original)
+++ vmkit/branches/multi-vm/include/mvm/Threads/Thread.h Wed Dec  8 07:55:11 2010
@@ -177,36 +177,33 @@
 	/// vmkit - a (shortcut) pointer to vmkit that contains information on all the vms
 	mvm::VMKit* vmkit;                                     // 5
 
-  /// MyVM - The VM attached to this Thread.
-  VirtualMachine* MyVM;                                  // 6
-
   /// baseSP - The base stack pointer.
-  void* baseSP;                                          // 7
+  void* baseSP;                                          // 6
 
   /// inRV - Flag to tell that the thread is being part of a rendezvous.
-  bool inRV;                                             // 8
+  bool inRV;                                             // 7
 
   /// joinedRV - Flag to tell that the thread has joined a rendezvous.
-  bool joinedRV;                                         // 9
+  bool joinedRV;                                         // 8
 
 private:
   /// lastSP - If the thread is running native code that can not be
   /// interrupted, lastSP is not null and contains the value of the
   /// stack pointer before entering native.
-  void* lastSP;                                          // 10
+  void* lastSP;                                          // 9
  
   /// internalThreadID - The implementation specific thread id.
-  void* internalThreadID;                                // 11
+  void* internalThreadID;                                // 10
 
 public:
   /// routine - The function to invoke when the thread starts.
-  void (*routine)(mvm::Thread*);                         // 12
+  void (*routine)(mvm::Thread*);                         // 11
 
   /// lastKnownFrame - The last frame that we know of, before resuming to JNI.
-  KnownFrame* lastKnownFrame;                            // 13
+  KnownFrame* lastKnownFrame;                            // 12
 
   /// allVmsData - the array of thread specific data.
-	VMThreadData** allVmsData;                             // 14
+	VMThreadData** allVmsData;                             // 13
 
 
 protected:

Modified: vmkit/branches/multi-vm/lib/Mvm/CommonThread/ctthread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/Mvm/CommonThread/ctthread.cpp?rev=121256&r1=121255&r2=121256&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/Mvm/CommonThread/ctthread.cpp (original)
+++ vmkit/branches/multi-vm/lib/Mvm/CommonThread/ctthread.cpp Wed Dec  8 07:55:11 2010
@@ -45,7 +45,6 @@
 }
 
 void Thread::attach(VirtualMachine* vm) {
-	MyVM = vm;
 	vmData = allVmsData[vm->vmID];
 
 	if(!vmData) {

Modified: vmkit/branches/multi-vm/lib/Mvm/Compiler/mvm-runtime.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/Mvm/Compiler/mvm-runtime.ll?rev=121256&r1=121255&r2=121256&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/Mvm/Compiler/mvm-runtime.ll (original)
+++ vmkit/branches/multi-vm/lib/Mvm/Compiler/mvm-runtime.ll Wed Dec  8 07:55:11 2010
@@ -13,16 +13,15 @@
 ;;; field 3:  void*  vmData
 ;;; field 4:  gc*    pendingException
 ;;; field 5:  VMkit* vmkit
-;;; Field 6:  void*  MyVM
-;;; Field 7:  void*  baseSP
-;;; Field 8:  bool   inRV
-;;; Field 9:  bool   joinedRV
-;;; Field 10: void*  lastSP
-;;; Field 11: void*  internalThreadID
-;;; field 12: void*  routine
-;;; field 13: void*  lastKnownFrame
-;;; field 14: void*  allVMDatas
-%Thread       = type { %CircularBase, i1, i8*, i8*, i8*, i8*, i8*, i8*, i1, i1, i8*, i8*, i8*, i8*, i8* }
+;;; Field 6:  void*  baseSP
+;;; Field 7:  bool   inRV
+;;; Field 8:  bool   joinedRV
+;;; Field 9: void*  lastSP
+;;; Field 10: void*  internalThreadID
+;;; field 11: void*  routine
+;;; field 12: void*  lastKnownFrame
+;;; field 13: void*  allVMDatas
+%Thread       = type { %CircularBase, i1, i8*, i8*, i8*, i8*, i8*, i1, i1, i8*, i8*, i8*, i8*, i8* }
 
 ;;; field 0: VT
 ;;; field 1: mvm::MutatorThread*  mut