Changeset 72769 in vbox

Timestamp:

Jun 29, 2018 11:10:00 AM (7 years ago)

Author:

vboxsync

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

123310

Message:

VMM/HM: Avoid some CPUMQueryGuestCtxPtr calls.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMR0.cpp (modified) (2 diffs)
• VMMR3/HM.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR0/HMR0.cpp

@@ -21 +21 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_HM
+#define VMCPU_INCL_CPUM_GST_CTX
 #include <VBox/vmm/hm.h>
 #include <VBox/vmm/pgm.h>
@@ -1553 +1554 @@
 #endif
 
-    VBOXSTRICTRC rcStrict = g_HmR0.pfnRunGuestCode(pVM, pVCpu, CPUMQueryGuestCtxPtr(pVCpu));
+    VBOXSTRICTRC rcStrict = g_HmR0.pfnRunGuestCode(pVM, pVCpu, &pVCpu->cpum.GstCtx);
 
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE

trunk/src/VBox/VMM/VMMR3/HM.cpp

@@ -1275 +1275 @@
     {
         PVMCPU   pVCpu   = &pVM->aCpus[iCpu];
-        PCPUMCTX pCpuCtx = CPUMQueryGuestCtxPtr(pVCpu);
+        PCPUMCTX pCpuCtx = &pVCpu->cpum.GstCtx;
         pCpuCtx->fWorldSwitcher &= ~(CPUMCTX_WSF_IBPB_EXIT | CPUMCTX_WSF_IBPB_ENTRY);
         if (pVM->cpum.ro.HostFeatures.fIbpb)
@@ -1587 +1587 @@
                 pVM->hm.s.vmx.pNonPagingModeEPTPageTable->a[i].u  = _4M * i;
                 pVM->hm.s.vmx.pNonPagingModeEPTPageTable->a[i].u |= X86_PDE4M_P | X86_PDE4M_RW | X86_PDE4M_US
-                                                                  | X86_PDE4M_A | X86_PDE4M_D | X86_PDE4M_PS
-                                                                  | X86_PDE4M_G;
+                                                                 |  X86_PDE4M_A | X86_PDE4M_D | X86_PDE4M_PS
+                                                                 |  X86_PDE4M_G;
             }
 
@@ -2229 +2229 @@
      * and make sure there is still room for our patch record.
      */
-    PCPUMCTX    pCtx   = CPUMQueryGuestCtxPtr(pVCpu);
+    PCPUMCTX    pCtx   = &pVCpu->cpum.GstCtx;
     PHMTPRPATCH pPatch = (PHMTPRPATCH)RTAvloU32Get(&pVM->hm.s.PatchTree, (AVLOU32KEY)pCtx->eip);
     if (pPatch)
@@ -2405 +2405 @@
      * and make sure there is still room for our patch record.
      */
-    PCPUMCTX    pCtx   = CPUMQueryGuestCtxPtr(pVCpu);
+    PCPUMCTX    pCtx   = &pVCpu->cpum.GstCtx;
     PHMTPRPATCH pPatch = (PHMTPRPATCH)RTAvloU32Get(&pVM->hm.s.PatchTree, (AVLOU32KEY)pCtx->eip);
     if (pPatch)