Changeset 4958 in vbox

Timestamp:

Sep 21, 2007 2:54:04 PM (17 years ago)

Author:

vboxsync

Message:

Added hSelf and removed pVMHC from the VM structure.

Location:

trunk

Files:

• include/VBox/vm.h (modified) (4 diffs)
• include/VBox/vm.mac (modified) (1 diff)
• src/VBox/VMM/CPUM.cpp (modified) (3 diffs)
• src/VBox/VMM/CPUMInternal.h (modified) (2 diffs)
• src/VBox/VMM/CPUMInternal.mac (modified) (2 diffs)
• src/VBox/VMM/TM.cpp (modified) (1 diff)
• src/VBox/VMM/VM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (6 diffs)

trunk/include/VBox/vm.h

@@ -235 +235 @@
      */
     R3PTRTYPE(struct VM *)      pNext;
-    /** Host Context VM Pointer.
-     * @obsolete don't use in new code! */
-    R3PTRTYPE(struct VM *)      pVMHC;
     /** Ring-3 Host Context VM Pointer. */
     R3PTRTYPE(struct VM *)      pVMR3;
@@ -244 +241 @@
     /** Guest Context VM Pointer. */
     GCPTRTYPE(struct VM *)      pVMGC;
+
+    /** The GVM VM handle. Only the GVM should modify this field. */
+    uint32_t                    hSelf;
+    /** Reserved / padding. */
+    uint32_t                    u32Reserved;
 
     /** @name Public VMM Switcher APIs
@@ -317 +319 @@
 
     /* padding to make gnuc put the StatQemuToGC where msc does. */
-/*#if HC_ARCH_BITS == 32
+#if HC_ARCH_BITS == 32
     uint32_t            padding0;
-#endif */
+#endif
 
     /** Profiling the total time from Qemu to GC. */
@@ -346 +348 @@
 
     /* padding - the unions must be aligned on 32 bytes boundraries. */
-    uint32_t            padding[HC_ARCH_BITS == 32 ? 6 : 6];
+    uint32_t            padding[HC_ARCH_BITS == 32 ? 4 : 6];
 
     /** CPUM part. */

trunk/include/VBox/vm.mac

@@ -38 +38 @@
     .pSession           RTR3PTR_RES 1
     .pNext              RTHCPTR_RES 1
-    .pVMHC              RTHCPTR_RES 1
     .pVMR3              RTR3PTR_RES 1
     .pVMR0              RTR0PTR_RES 1
     .pVMGC              RTGCPTR_RES 1
+    .hSelf              resd 1
+    .u32Reserved        resd 1
 
     .pfnVMMGCGuestToHostAsmGuestCtx RTGCPTR_RES 1

trunk/src/VBox/VMM/CPUM.cpp

@@ -99 +99 @@
     pVM->cpum.s.offVM = RT_OFFSETOF(VM, cpum);
     pVM->cpum.s.pCPUMHC = &pVM->cpum.s;
-    pVM->cpum.s.pHyperCoreHC = CPUMCTX2CORE(&pVM->cpum.s.Hyper);
+    pVM->cpum.s.pHyperCoreR3 = CPUMCTX2CORE(&pVM->cpum.s.Hyper);
+    pVM->cpum.s.pHyperCoreR0 = VM_R0_ADDR(pVM, CPUMCTX2CORE(&pVM->cpum.s.Hyper));
 
     /* Hidden selector registers are invalid by default. */
@@ -399 +400 @@
      */
     pVM->cpum.s.pCPUMGC = VM_GUEST_ADDR(pVM, &pVM->cpum.s);
-    pVM->cpum.s.pHyperCoreGC = MMHyperHC2GC(pVM, pVM->cpum.s.pHyperCoreHC);
+    pVM->cpum.s.pHyperCoreGC = MMHyperCCToGC(pVM, pVM->cpum.s.pHyperCoreR3);
+    Assert(pVM->cpum.s.pHyperCoreGC != NIL_RTGCPTR);
 }
 
@@ -857 +859 @@
     cpumR3InfoParseArg(pszArgs, &enmType, &pszComment);
     pHlp->pfnPrintf(pHlp, "Hypervisor CPUM state: %s\n", pszComment);
-    cpumR3InfoOne(&pVM->cpum.s.Hyper, pVM->cpum.s.pHyperCoreHC, pHlp, enmType, ".");
+    cpumR3InfoOne(&pVM->cpum.s.Hyper, pVM->cpum.s.pHyperCoreR3, pHlp, enmType, ".");
     pHlp->pfnPrintf(pHlp, "CR4OrMask=%#x CR4AndMask=%#x\n", pVM->cpum.s.CR4.OrMask, pVM->cpum.s.CR4.AndMask);
 }

trunk/src/VBox/VMM/CPUMInternal.h

@@ -284 +284 @@
 
 
-    /** Pointer to the current hypervisor core context - HCPtr. */
-    R3R0PTRTYPE(PCPUMCTXCORE) pHyperCoreHC;
+    /** Pointer to the current hypervisor core context - R3Ptr. */
+    R3PTRTYPE(PCPUMCTXCORE) pHyperCoreR3;
+    /** Pointer to the current hypervisor core context - R3Ptr. */
+    R0PTRTYPE(PCPUMCTXCORE) pHyperCoreR0;
     /** Pointer to the current hypervisor core context - GCPtr. */
     GCPTRTYPE(PCPUMCTXCORE) pHyperCoreGC;
@@ -324 +326 @@
     /** Have we entered rawmode? */
     bool                    fRawEntered;
-    uint8_t                 abPadding[3 + (HC_ARCH_BITS == 32) * 4];
+    uint8_t                 abPadding[3 + (HC_ARCH_BITS == 64) * 4];
 
     /** The standard set of CpuId leafs. */

trunk/src/VBox/VMM/CPUMInternal.mac

@@ -357 +357 @@
     alignb 32
     ; hypervisor core context.
-    .pHyperCoreHC         RTHCPTR_RES 1
+    .pHyperCoreR3         RTR3PTR_RES 1
+    .pHyperCoreR0         RTR0PTR_RES 1
     .pHyperCoreGC         RTGCPTR_RES 1
     ;...
@@ -373 +374 @@
     .fRawEntered          resb    1
 %if RTHCPTR_CB == 8
+    .abPadding            resb    7
+%else
     .abPadding            resb    3
-%else
-    .abPadding            resb    7
 %endif
 

trunk/src/VBox/VMM/TM.cpp

@@ -672 +672 @@
     {
         pTimer->pVMGC = pVM->pVMGC;
-        pTimer->pVMR0 = (PVMR0)pVM->pVMHC; /// @todo pTimer->pVMR0 = pVM->pVMR0;
+        pTimer->pVMR0 = pVM->pVMR0;
     }
 }

trunk/src/VBox/VMM/VM.cpp

@@ -198 +198 @@
              */
             memset(pVM, 0, sizeof(*pVM));
-            pVM->pVMHC = pVM;
             pVM->pVMR0 = pVMR0;
             pVM->pVMR3 = pVM;

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

@@ -54 +54 @@
 CPUMDECL(void) CPUMHyperSetCtxCore(PVM pVM, PCPUMCTXCORE pCtxCore)
 {
-    LogFlow(("CPUMHyperSetCtxCore: %p -> %p\n", pVM->cpum.s.CTXSUFF(pHyperCore), pCtxCore));
+    LogFlow(("CPUMHyperSetCtxCore: %p/%p/%p -> %p\n", pVM->cpum.s.CTXALLSUFF(pHyperCore), pCtxCore));
     if (!pCtxCore)
     {
         pCtxCore = CPUMCTX2CORE(&pVM->cpum.s.Hyper);
-#ifdef IN_GC
-        pVM->cpum.s.pHyperCoreHC = VM_HOST_ADDR(pVM, pCtxCore);
-#else
-        pVM->cpum.s.pHyperCoreGC = VM_GUEST_ADDR(pVM, pCtxCore);
-#endif
+        pVM->cpum.s.pHyperCoreR3 = (R3PTRTYPE(PCPUMCTXCORE))VM_R3_ADDR(pVM, pCtxCore);
+        pVM->cpum.s.pHyperCoreR0 = (R0PTRTYPE(PCPUMCTXCORE))VM_R0_ADDR(pVM, pCtxCore);
+        pVM->cpum.s.pHyperCoreGC = (GCPTRTYPE(PCPUMCTXCORE))VM_GUEST_ADDR(pVM, pCtxCore);
     }
     else
     {
-#ifdef IN_GC
-        pVM->cpum.s.pHyperCoreHC = MMHyperGC2HC(pVM, pCtxCore);
-#else
-        pVM->cpum.s.pHyperCoreGC = MMHyperHC2GC(pVM, pCtxCore);
-#endif
+        pVM->cpum.s.pHyperCoreR3 = (R3PTRTYPE(PCPUMCTXCORE))MMHyperCCToR3(pVM, pCtxCore);
+        pVM->cpum.s.pHyperCoreR0 = (R0PTRTYPE(PCPUMCTXCORE))MMHyperCCToR0(pVM, pCtxCore);
+        pVM->cpum.s.pHyperCoreGC = (GCPTRTYPE(PCPUMCTXCORE))MMHyperCCToGC(pVM, pCtxCore);
     }
-    pVM->cpum.s.CTXSUFF(pHyperCore) = pCtxCore;
 }
 
@@ -84 +79 @@
 CPUMDECL(PCCPUMCTXCORE) CPUMGetHyperCtxCore(PVM pVM)
 {
-    return pVM->cpum.s.CTXSUFF(pHyperCore);
+    return pVM->cpum.s.CTXALLSUFF(pHyperCore);
 }
 
@@ -129 +124 @@
 CPUMDECL(void) CPUMSetHyperCS(PVM pVM, RTSEL SelCS)
 {
-    pVM->cpum.s.CTXSUFF(pHyperCore)->cs = SelCS;
+    pVM->cpum.s.CTXALLSUFF(pHyperCore)->cs = SelCS;
 }
 
 CPUMDECL(void) CPUMSetHyperDS(PVM pVM, RTSEL SelDS)
 {
-    pVM->cpum.s.CTXSUFF(pHyperCore)->ds = SelDS;
+    pVM->cpum.s.CTXALLSUFF(pHyperCore)->ds = SelDS;
 }
 
 CPUMDECL(void) CPUMSetHyperES(PVM pVM, RTSEL SelES)
 {
-    pVM->cpum.s.CTXSUFF(pHyperCore)->es = SelES;
+    pVM->cpum.s.CTXALLSUFF(pHyperCore)->es = SelES;
 }
 
 CPUMDECL(void) CPUMSetHyperFS(PVM pVM, RTSEL SelFS)
 {
-    pVM->cpum.s.CTXSUFF(pHyperCore)->fs = SelFS;
+    pVM->cpum.s.CTXALLSUFF(pHyperCore)->fs = SelFS;
 }
 
 CPUMDECL(void) CPUMSetHyperGS(PVM pVM, RTSEL SelGS)
 {
-    pVM->cpum.s.CTXSUFF(pHyperCore)->gs = SelGS;
+    pVM->cpum.s.CTXALLSUFF(pHyperCore)->gs = SelGS;
 }
 
 CPUMDECL(void) CPUMSetHyperSS(PVM pVM, RTSEL SelSS)
 {
-    pVM->cpum.s.CTXSUFF(pHyperCore)->ss = SelSS;
+    pVM->cpum.s.CTXALLSUFF(pHyperCore)->ss = SelSS;
 }
 
 CPUMDECL(void) CPUMSetHyperESP(PVM pVM, uint32_t u32ESP)
 {
-    pVM->cpum.s.CTXSUFF(pHyperCore)->esp = u32ESP;
+    pVM->cpum.s.CTXALLSUFF(pHyperCore)->esp = u32ESP;
 }
 
 CPUMDECL(int) CPUMSetHyperEFlags(PVM pVM, uint32_t Efl)
 {
-    pVM->cpum.s.CTXSUFF(pHyperCore)->eflags.u32 = Efl;
+    pVM->cpum.s.CTXALLSUFF(pHyperCore)->eflags.u32 = Efl;
     return VINF_SUCCESS;
 }
@@ -170 +165 @@
 CPUMDECL(void) CPUMSetHyperEIP(PVM pVM, uint32_t u32EIP)
 {
-    pVM->cpum.s.CTXSUFF(pHyperCore)->eip = u32EIP;
+    pVM->cpum.s.CTXALLSUFF(pHyperCore)->eip = u32EIP;
 }
 
@@ -222 +217 @@
 CPUMDECL(RTSEL) CPUMGetHyperCS(PVM pVM)
 {
-    return pVM->cpum.s.CTXSUFF(pHyperCore)->cs;
+    return pVM->cpum.s.CTXALLSUFF(pHyperCore)->cs;
 }
 
 CPUMDECL(RTSEL) CPUMGetHyperDS(PVM pVM)
 {
-    return pVM->cpum.s.CTXSUFF(pHyperCore)->ds;
+    return pVM->cpum.s.CTXALLSUFF(pHyperCore)->ds;
 }
 
 CPUMDECL(RTSEL) CPUMGetHyperES(PVM pVM)
 {
-    return pVM->cpum.s.CTXSUFF(pHyperCore)->es;
+    return pVM->cpum.s.CTXALLSUFF(pHyperCore)->es;
 }
 
 CPUMDECL(RTSEL) CPUMGetHyperFS(PVM pVM)
 {
-    return pVM->cpum.s.CTXSUFF(pHyperCore)->fs;
+    return pVM->cpum.s.CTXALLSUFF(pHyperCore)->fs;
 }
 
 CPUMDECL(RTSEL) CPUMGetHyperGS(PVM pVM)
 {
-    return pVM->cpum.s.CTXSUFF(pHyperCore)->gs;
+    return pVM->cpum.s.CTXALLSUFF(pHyperCore)->gs;
 }
 
 CPUMDECL(RTSEL) CPUMGetHyperSS(PVM pVM)
 {
-    return pVM->cpum.s.CTXSUFF(pHyperCore)->ss;
+    return pVM->cpum.s.CTXALLSUFF(pHyperCore)->ss;
 }
 
@@ -276 +271 @@
 CPUMDECL(uint32_t) CPUMGetHyperEAX(PVM pVM)
 {
-    return pVM->cpum.s.CTXSUFF(pHyperCore)->eax;
+    return pVM->cpum.s.CTXALLSUFF(pHyperCore)->eax;
 }
 
 CPUMDECL(uint32_t) CPUMGetHyperEBX(PVM pVM)
 {
-    return pVM->cpum.s.CTXSUFF(pHyperCore)->ebx;
+    return pVM->cpum.s.CTXALLSUFF(pHyperCore)->ebx;
 }
 
 CPUMDECL(uint32_t) CPUMGetHyperECX(PVM pVM)
 {
-    return pVM->cpum.s.CTXSUFF(pHyperCore)->ecx;
+    return pVM->cpum.s.CTXALLSUFF(pHyperCore)->ecx;
 }
 
 CPUMDECL(uint32_t) CPUMGetHyperEDX(PVM pVM)
 {
-    return pVM->cpum.s.CTXSUFF(pHyperCore)->edx;
+    return pVM->cpum.s.CTXALLSUFF(pHyperCore)->edx;
 }
 
 CPUMDECL(uint32_t) CPUMGetHyperESI(PVM pVM)
 {
-    return pVM->cpum.s.CTXSUFF(pHyperCore)->esi;
+    return pVM->cpum.s.CTXALLSUFF(pHyperCore)->esi;
 }
 
 CPUMDECL(uint32_t) CPUMGetHyperEDI(PVM pVM)
 {
-    return pVM->cpum.s.CTXSUFF(pHyperCore)->edi;
+    return pVM->cpum.s.CTXALLSUFF(pHyperCore)->edi;
 }
 
 CPUMDECL(uint32_t) CPUMGetHyperEBP(PVM pVM)
 {
-    return pVM->cpum.s.CTXSUFF(pHyperCore)->ebp;
+    return pVM->cpum.s.CTXALLSUFF(pHyperCore)->ebp;
 }
 
 CPUMDECL(uint32_t) CPUMGetHyperESP(PVM pVM)
 {
-    return pVM->cpum.s.CTXSUFF(pHyperCore)->esp;
+    return pVM->cpum.s.CTXALLSUFF(pHyperCore)->esp;
 }
 
 CPUMDECL(uint32_t) CPUMGetHyperEFlags(PVM pVM)
 {
-    return pVM->cpum.s.CTXSUFF(pHyperCore)->eflags.u32;
+    return pVM->cpum.s.CTXALLSUFF(pHyperCore)->eflags.u32;
 }
 
 CPUMDECL(uint32_t) CPUMGetHyperEIP(PVM pVM)
 {
-    return pVM->cpum.s.CTXSUFF(pHyperCore)->eip;
+    return pVM->cpum.s.CTXALLSUFF(pHyperCore)->eip;
 }