Changeset 72771 in vbox

Timestamp:

Jun 29, 2018 11:25:05 AM (7 years ago)

Author:

vboxsync

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

123312

Message:

VMM: Avoid calling CPUMQueryGuestCtxPtr when possible, cleanup.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMSVMR0.cpp (modified) (1 diff)
• VMMR3/HM.cpp (modified) (3 diffs)

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

@@ -1185 +1185 @@
         Log4Func(("%#RGv\n", GCVirt));
 
-        PCPUMCTX pCtx  = CPUMQueryGuestCtxPtr(pVCpu);
+        PCPUMCTX pCtx  = &pVCpu->cpum.GstCtx;
         PSVMVMCB pVmcb = hmR0SvmGetCurrentVmcb(pVCpu, pCtx);
         AssertMsgReturn(pVmcb, ("Invalid pVmcb!\n"), VERR_SVM_INVALID_PVMCB);

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

@@ -2671 +2671 @@
      */
     if (   ((pSel->u32Limit & 0xfff00000) == 0x00000000 ||  pSel->Attr.n.u1Granularity)
-        && ((pSel->u32Limit & 0x00000fff) == 0x00000fff || !pSel->Attr.n.u1Granularity) )
+        && ((pSel->u32Limit & 0x00000fff) == 0x00000fff || !pSel->Attr.n.u1Granularity))
         return true;
     return false;
@@ -2722 +2722 @@
                          */
                         if (   ((pSel->u32Limit & 0xfff00000) == 0x00000000 ||  pSel->Attr.n.u1Granularity)
-                            && ((pSel->u32Limit & 0x00000fff) == 0x00000fff || !pSel->Attr.n.u1Granularity) )
+                            && ((pSel->u32Limit & 0x00000fff) == 0x00000fff || !pSel->Attr.n.u1Granularity))
                             return true;
                     }
@@ -2776 +2776 @@
      */
     if (   ((pSel->u32Limit & 0xfff00000) == 0x00000000 ||  pSel->Attr.n.u1Granularity)
-        && ((pSel->u32Limit & 0x00000fff) == 0x00000fff || !pSel->Attr.n.u1Granularity) )
+        && ((pSel->u32Limit & 0x00000fff) == 0x00000fff || !pSel->Attr.n.u1Granularity))
         return true;
     return false;