Changeset 72874 in vbox

Timestamp:

Jul 4, 2018 1:42:55 PM (7 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Call EMR0HistoryUpdatePC when importing guest-CPU state from the VMCS on VM-exits rather than on the export side on VM-entry.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (3 diffs)

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

@@ -3597 +3597 @@
         AssertRCReturn(rc, rc);
 
-        /* Update the exit history entry with the correct CS.BASE + RIP or just RIP. */
-        if (ASMAtomicUoReadU64(&pVCpu->hm.s.fCtxChanged) & HM_CHANGED_GUEST_CS)
-            EMR0HistoryUpdatePC(pVCpu, pMixedCtx->cs.u64Base + pMixedCtx->rip, true);
-        else
-            EMR0HistoryUpdatePC(pVCpu, pMixedCtx->rip, false);
-
         ASMAtomicUoAndU64(&pVCpu->hm.s.fCtxChanged, ~HM_CHANGED_GUEST_RIP);
         Log4Func(("RIP=%#RX64\n", pMixedCtx->rip));
@@ -6168 +6162 @@
         {
             pCtx->rip = u64Val;
+            EMR0HistoryUpdatePC(pVCpu, pCtx->rip, false);
             pCtx->fExtrn &= ~CPUMCTX_EXTRN_RIP;
         }
@@ -6335 +6330 @@
                 if (fWhat & CPUMCTX_EXTRN_CS)
                 {
-                    rc = HMVMX_IMPORT_SREG(CS, &pCtx->cs);
+                    rc  = HMVMX_IMPORT_SREG(CS, &pCtx->cs);
+                    rc |= hmR0VmxImportGuestRip(pVCpu);
                     VMXLOCAL_BREAK_RC(rc);
                     if (pVCpu->hm.s.vmx.RealMode.fRealOnV86Active)
                         pCtx->cs.Attr.u = pVCpu->hm.s.vmx.RealMode.AttrCS.u;
+                    EMR0HistoryUpdatePC(pVCpu, pCtx->cs.u64Base + pCtx->rip, true);
                 }
                 if (fWhat & CPUMCTX_EXTRN_SS)