Changeset 72895 in vbox

Timestamp:

Jul 4, 2018 5:03:57 PM (7 years ago)

Author:

vboxsync

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

123442

Message:

EM,HM: Replaced EMInterpretInvlpg with IEMExecDecodedInvlpg.

Location:

trunk

Files:

• include/VBox/vmm/em.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/EMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/IEMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (1 diff)

trunk/include/VBox/vmm/em.h

@@ -317 +317 @@
 #endif
 VMM_INT_DECL(int)               EMInterpretRdpmc(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame);
-VMM_INT_DECL(VBOXSTRICTRC)      EMInterpretInvlpg(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pAddrGC);
 VMM_INT_DECL(VBOXSTRICTRC)      EMInterpretMWait(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame);
 VMM_INT_DECL(int)               EMInterpretMonitor(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame);

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

@@ -1390 +1390 @@
 
 /**
- * Interpret INVLPG.
- *
- * @returns VBox status code.
- * @param   pVM         The cross context VM structure.
- * @param   pVCpu       The cross context virtual CPU structure.
- * @param   pRegFrame   The register frame.
- * @param   pAddrGC     Operand address.
- *
- */
-VMM_INT_DECL(VBOXSTRICTRC) EMInterpretInvlpg(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pAddrGC)
-{
-    /** @todo is addr always a flat linear address or ds based
-     * (in absence of segment override prefixes)????
-     */
-    Assert(pRegFrame == CPUMGetGuestCtxCore(pVCpu));
-    NOREF(pVM); NOREF(pRegFrame);
-#ifdef IN_RC
-    LogFlow(("RC: EMULATE: invlpg %RGv\n", pAddrGC));
-#endif
-    VBOXSTRICTRC rc = PGMInvalidatePage(pVCpu, pAddrGC);
-    if (    rc == VINF_SUCCESS
-        ||  rc == VINF_PGM_SYNC_CR3 /* we can rely on the FF */)
-        return VINF_SUCCESS;
-    AssertMsgReturn(rc == VINF_EM_RAW_EMULATE_INSTR,
-                    ("%Rrc addr=%RGv\n", VBOXSTRICTRC_VAL(rc), pAddrGC),
-                    VERR_EM_INTERPRETER);
-    return rc;
-}
-
-
-/**
  * Interpret DRx write.
  *

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

@@ -14913 +14913 @@
  * Interface for HM and EM to emulate the INVLPG instruction.
  *
+ * @returns Strict VBox status code.
+ * @retval  VINF_PGM_SYNC_CR3
+ *
  * @param   pVCpu       The cross context virtual CPU structure.
  * @param   cbInstr     The instruction length in bytes.

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

@@ -11449 +11449 @@
 
     int rc = hmR0VmxReadExitQualificationVmcs(pVCpu, pVmxTransient);
-    rc    |= hmR0VmxImportGuestState(pVCpu, CPUMCTX_EXTRN_SREG_MASK);
+    rc    |= hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
+    rc    |= hmR0VmxImportGuestState(pVCpu, IEM_CPUMCTX_EXTRN_EXEC_DECODED_MEM_MASK | CPUMCTX_EXTRN_DS);
     AssertRCReturn(rc, rc);
 
-    VBOXSTRICTRC rcStrict = EMInterpretInvlpg(pVM, pVCpu, CPUMCTX2CORE(pMixedCtx), pVmxTransient->uExitQualification);
-    if (RT_LIKELY(rcStrict == VINF_SUCCESS))
-        rcStrict = hmR0VmxAdvanceGuestRip(pVCpu, pMixedCtx, pVmxTransient);
+    VBOXSTRICTRC rcStrict = IEMExecDecodedInvlpg(pVCpu, pVmxTransient->cbInstr, pVmxTransient->uExitQualification);
+
+    if (rcStrict == VINF_SUCCESS || rcStrict == VINF_PGM_SYNC_CR3)
+        ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_GUEST_RIP | HM_CHANGED_GUEST_RFLAGS);
+    else if (rcStrict == VINF_IEM_RAISED_XCPT)
+    {
+        ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_XCPT_RAISED_MASK);
+        rcStrict = VINF_SUCCESS;
+    }
     else
-        AssertMsg(rcStrict == VERR_EM_INTERPRETER, ("hmR0VmxExitInvlpg: EMInterpretInvlpg %#RX64 failed with %Rrc\n",
-                                                    pVmxTransient->uExitQualification, VBOXSTRICTRC_VAL(rcStrict)));
+        AssertMsgFailed(("Unexpected IEMExecDecodedInvlpg(%#RX64) sttus: %Rrc\n",
+                         pVmxTransient->uExitQualification, VBOXSTRICTRC_VAL(rcStrict)));
     return rcStrict;
 }