Changeset 13830 in vbox for trunk/include/VBox

Timestamp:

Nov 5, 2008 1:49:18 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

38821

Message:

VMM: Disabled VM:pVMGC, removed VM_GUEST_ADDR.

Location:

trunk/include/VBox

Files:

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

trunk/include/VBox/cpum.h

@@ -639 +639 @@
 VMMDECL(int)        CPUMGetGuestDRx(PVM pVM, uint32_t iReg, uint64_t *pValue);
 VMMDECL(void)       CPUMGetGuestCpuId(PVM pVM, uint32_t iLeaf, uint32_t *pEax, uint32_t *pEbx, uint32_t *pEcx, uint32_t *pEdx);
-VMMDECL(RCPTRTYPE(PCCPUMCPUID)) CPUMGetGuestCpuIdStdGCPtr(PVM pVM);
-VMMDECL(RCPTRTYPE(PCCPUMCPUID)) CPUMGetGuestCpuIdExtGCPtr(PVM pVM);
-VMMDECL(RCPTRTYPE(PCCPUMCPUID)) CPUMGetGuestCpuIdCentaurGCPtr(PVM pVM);
-VMMDECL(RCPTRTYPE(PCCPUMCPUID)) CPUMGetGuestCpuIdDefGCPtr(PVM pVM);
+VMMDECL(RCPTRTYPE(PCCPUMCPUID)) CPUMGetGuestCpuIdStdRCPtr(PVM pVM);
+VMMDECL(RCPTRTYPE(PCCPUMCPUID)) CPUMGetGuestCpuIdExtRCPtr(PVM pVM);
+VMMDECL(RCPTRTYPE(PCCPUMCPUID)) CPUMGetGuestCpuIdCentaurRCPtr(PVM pVM);
+VMMDECL(RCPTRTYPE(PCCPUMCPUID)) CPUMGetGuestCpuIdDefRCPtr(PVM pVM);
 VMMDECL(uint32_t)   CPUMGetGuestCpuIdStdMax(PVM pVM);
 VMMDECL(uint32_t)   CPUMGetGuestCpuIdExtMax(PVM pVM);
@@ -966 +966 @@
 VMMR3DECL(int)          CPUMR3TermCPU(PVM pVM);
 VMMR3DECL(void)         CPUMR3Reset(PVM pVM);
-VMMR3DECL(int)          CPUMR3QueryGuestCtxGCPtr(PVM pVM, RCPTRTYPE(PCPUMCTX) *ppCtx);
+VMMR3DECL(int)          CPUMR3QueryGuestCtxRCPtr(PVM pVM, RCPTRTYPE(PCPUMCTX) *ppCtx);
 # ifdef DEBUG
 VMMR3DECL(void)         CPUMR3SaveEntryCtx(PVM pVM);

trunk/include/VBox/vm.h

@@ -397 +397 @@
 
 /** @def VM_GET_VMCPUID
- * Returns the VMCPU id of the current EMT thread.
+ * Returns the VMCPU id of the current EMT.
+ * @todo r=bird: See VMMGetCpuId().
  */
 #ifdef IN_GC
-# define VM_GET_VMCPUID(pVM)                       0
+# 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)
+# define VM_GET_VMCPUID(pVM)                HWACCMGetVMCPUId(pVM)
+#else
+# define VM_GET_VMCPUID(pVM)                VMR3GetVMCPUId(pVM)
 #endif
 
@@ -465 +466 @@
     /** Raw-mode Context VM Pointer.
      * @deprecated Use VM::pVMRC. */
-    RCPTRTYPE(struct VM *)      pVMGC;
+    RCPTRTYPE(struct VM *)      pVMGCUnused;
     /** Raw-mode Context VM Pointer. */
     RCPTRTYPE(struct VM *)      pVMRC;

trunk/include/VBox/vm.mac

@@ -54 +54 @@
     .pVMR3              RTR3PTR_RES 1
     .pVMR0              RTR0PTR_RES 1
-    .pVMGC              RTRCPTR_RES 1
+    .pVMGCUnused        RTRCPTR_RES 1
     .pVMRC              RTRCPTR_RES 1
     .hSelf              resd 1

trunk/include/VBox/vmapi.h

@@ -44 +44 @@
  * @{ */
 
-/** @def VM_GUEST_ADDR
- * Converts a current context address of data within the VM structure to the equivalent
- * guest address.
- *
- * @returns guest virtual address.
- * @param   pVM     Pointer to the VM.
- * @param   pvInVM  CC Pointer within the VM.
- * @deprecated Use VM_RC_ADDR
- */
-#ifdef IN_RING3
-# define VM_GUEST_ADDR(pVM, pvInVM)     ( (RTGCPTR)((RTGCUINTPTR)pVM->pVMGC + (uint32_t)((uintptr_t)(pvInVM) - (uintptr_t)pVM->pVMR3)) )
-#elif defined(IN_RING0)
-# define VM_GUEST_ADDR(pVM, pvInVM)     ( (RTGCPTR)((RTGCUINTPTR)pVM->pVMGC + (uint32_t)((uintptr_t)(pvInVM) - (uintptr_t)pVM->pVMR0)) )
-#else
-# define VM_GUEST_ADDR(pVM, pvInVM)     ( (RTGCPTR)(pvInVM) )
-#endif
-
 /** @def VM_RC_ADDR
  * Converts a current context address of data within the VM structure to the equivalent
@@ -70 +53 @@
  */
 #ifdef IN_RING3
-# define VM_RC_ADDR(pVM, pvInVM)        ( (RTRCPTR)((RTRCUINTPTR)pVM->pVMGC + (uint32_t)((uintptr_t)(pvInVM) - (uintptr_t)pVM->pVMR3)) )
+# define VM_RC_ADDR(pVM, pvInVM)        ( (RTRCPTR)((RTRCUINTPTR)pVM->pVMRC + (uint32_t)((uintptr_t)(pvInVM) - (uintptr_t)pVM->pVMR3)) )
 #elif defined(IN_RING0)
-# define VM_RC_ADDR(pVM, pvInVM)        ( (RTRCPTR)((RTRCUINTPTR)pVM->pVMGC + (uint32_t)((uintptr_t)(pvInVM) - (uintptr_t)pVM->pVMR0)) )
+# define VM_RC_ADDR(pVM, pvInVM)        ( (RTRCPTR)((RTRCUINTPTR)pVM->pVMRC + (uint32_t)((uintptr_t)(pvInVM) - (uintptr_t)pVM->pVMR0)) )
 #else
 # define VM_RC_ADDR(pVM, pvInVM)        ( (RTRCPTR)(pvInVM) )
@@ -86 +69 @@
  */
 #ifdef IN_GC
-# define VM_R3_ADDR(pVM, pvInVM)       ( (RTR3PTR)((RTR3UINTPTR)pVM->pVMR3 + (uint32_t)((uintptr_t)(pvInVM) - (uintptr_t)pVM->pVMGC)) )
+# define VM_R3_ADDR(pVM, pvInVM)       ( (RTR3PTR)((RTR3UINTPTR)pVM->pVMR3 + (uint32_t)((uintptr_t)(pvInVM) - (uintptr_t)pVM->pVMRC)) )
 #elif defined(IN_RING0)
 # define VM_R3_ADDR(pVM, pvInVM)       ( (RTR3PTR)((RTR3UINTPTR)pVM->pVMR3 + (uint32_t)((uintptr_t)(pvInVM) - (uintptr_t)pVM->pVMR0)) )
@@ -103 +86 @@
  */
 #ifdef IN_GC
-# define VM_R0_ADDR(pVM, pvInVM)       ( (RTR0PTR)((RTR0UINTPTR)pVM->pVMR0 + (uint32_t)((uintptr_t)(pvInVM) - (uintptr_t)pVM->pVMGC)) )
+# define VM_R0_ADDR(pVM, pvInVM)       ( (RTR0PTR)((RTR0UINTPTR)pVM->pVMR0 + (uint32_t)((uintptr_t)(pvInVM) - (uintptr_t)pVM->pVMRC)) )
 #elif defined(IN_RING3)
 # define VM_R0_ADDR(pVM, pvInVM)       ( (RTR0PTR)((RTR0UINTPTR)pVM->pVMR0 + (uint32_t)((uintptr_t)(pvInVM) - (uintptr_t)pVM->pVMR3)) )