Changeset 13791 in vbox for trunk/include/VBox

Timestamp:

Nov 4, 2008 4:12:57 PM (16 years ago)

Author:

vboxsync

Message:

Moving data around

Location:

trunk/include/VBox

Files:

• hwaccm.h (modified) (1 diff)
• vm.h (modified) (4 diffs)
• vm.mac (modified) (1 diff)
• vmapi.h (modified) (1 diff)

trunk/include/VBox/hwaccm.h

@@ -70 +70 @@
 
 #ifndef IN_GC
-VMMDECL(int)    HWACCMFlushTLB(PVM pVM);
-VMMDECL(int)    HWACCMInvalidatePhysPage(PVM pVM, RTGCPHYS GCPhys);
-VMMDECL(bool)   HWACCMIsNestedPagingActive(PVM pVM);
+VMMDECL(int)     HWACCMFlushTLB(PVM pVM);
+VMMDECL(int)     HWACCMInvalidatePhysPage(PVM pVM, RTGCPHYS GCPhys);
+VMMDECL(bool)    HWACCMIsNestedPagingActive(PVM pVM);
 VMMDECL(PGMMODE) HWACCMGetPagingMode(PVM pVM);
+VMMDECL(RTCPUID) HWACCMGetVMCPUId(PVM pVM);
 #else
 /* Nop in GC */

trunk/include/VBox/vm.h

@@ -365 +365 @@
 #else
 /** @todo need to rework this macro for the case of multiple emulation threads for SMP */
-# define VM_IS_EMT(pVM)                     ((pVM)->NativeThreadEMT == RTThreadNativeSelf())
+# define VM_IS_EMT(pVM)                     (VMR3GetVMCPUNativeThread(pVM) == RTThreadNativeSelf())
 #endif
 
@@ -378 +378 @@
 # define VM_ASSERT_EMT(pVM) \
     AssertMsg(VM_IS_EMT(pVM), \
-        ("Not emulation thread! Thread=%RTnthrd ThreadEMT=%RTnthrd\n", RTThreadNativeSelf(), pVM->NativeThreadEMT))
+        ("Not emulation thread! Thread=%RTnthrd ThreadEMT=%RTnthrd\n", RTThreadNativeSelf(), VMR3GetVMCPUNativeThread(pVM)))
 #endif
 
@@ -391 +391 @@
 # define VM_ASSERT_EMT_RETURN(pVM, rc) \
     AssertMsgReturn(VM_IS_EMT(pVM), \
-        ("Not emulation thread! Thread=%RTnthrd ThreadEMT=%RTnthrd\n", RTThreadNativeSelf(), pVM->NativeThreadEMT), \
+        ("Not emulation thread! Thread=%RTnthrd ThreadEMT=%RTnthrd\n", RTThreadNativeSelf(), VMR3GetVMCPUNativeThread(pVM)), \
         (rc))
+#endif
+
+
+/** @def VM_GET_VMCPUID
+ * Returns the VMCPU id of the current EMT thread.
+ */
+#ifdef IN_GC
+# define VM_GET_VMCPUID(pVM)                       0
+#elif defined(IN_RING0)
+# define VM_GET_VMCPUID(pVM)                       HWACCMGetVMCPUId(pVM)
+#else
+# define VM_GET_VMCPUID(pVM)                       VMR3GetVMCPUId(pVM)
 #endif
 
@@ -517 +529 @@
     /** The native handle of ThreadEMT. Getting the native handle
      * is generally faster than getting the IPRT one (except on OS/2 :-). */
-    RTNATIVETHREAD      NativeThreadEMT;
+    RTNATIVETHREAD      uPadding2;
     /** @} */
 

trunk/include/VBox/vm.mac

@@ -67 +67 @@
 
     .uPadding1          RTHCPTR_RES 1
-    .NativeThreadEMT    RTHCPTR_RES 1
+    .uPadding2          RTHCPTR_RES 1
 
     .fRawR3Enabled      resb 1

trunk/include/VBox/vmapi.h

@@ -432 +432 @@
 VMMR3DECL(int)  VMR3WaitHalted(PVM pVM, bool fIgnoreInterrupts);
 VMMR3DECL(int)  VMR3WaitU(PUVM pUVM);
+VMMR3DECL(RTCPUID)          VMR3GetVMCPUId(PVM pVM);
+VMMR3DECL(RTTHREAD)         VMR3GetVMCPUThread(PVM pVM);
+VMMR3DECL(RTTHREAD)         VMR3GetVMCPUThreadU(PUVM pUVM);
+VMMR3DECL(RTNATIVETHREAD)   VMR3GetVMCPUNativeThread(PVM pVM);
+VMMR3DECL(RTNATIVETHREAD)   VMR3GetVMCPUNativeThreadU(PUVM pUVM);
 
 /** @} */