Changeset 97206 in vbox for trunk/src/VBox/VMM

Timestamp:

Oct 18, 2022 12:48:35 PM (2 years ago)

Author:

vboxsync

Message:

VMM/EM,HMVMXR0: Replaced EMInterpretRdpmc with IEMExecDecodedRdpmc (not really tested as none of my guests use it).

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• EMAll.cpp (modified) (1 diff)
• VMXAllTemplate.cpp.h (modified) (1 diff)

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

@@ -1030 +1030 @@
  */
 
-
-/**
- * Interpret RDPMC.
- *
- * @returns VBox status code.
- * @param   pVM         The cross context VM structure.
- * @param   pVCpu       The cross context virtual CPU structure.
- * @param   pRegFrame   The register frame.
- *
- */
-VMM_INT_DECL(int) EMInterpretRdpmc(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame)
-{
-    Assert(pRegFrame == CPUMGetGuestCtxCore(pVCpu));
-    uint32_t uCR4 = CPUMGetGuestCR4(pVCpu);
-
-    /* If X86_CR4_PCE is not set, then CPL must be zero. */
-    if (    !(uCR4 & X86_CR4_PCE)
-        &&  CPUMGetGuestCPL(pVCpu) != 0)
-    {
-        Assert(CPUMGetGuestCR0(pVCpu) & X86_CR0_PE);
-        return VERR_EM_INTERPRETER; /* genuine #GP */
-    }
-
-    /* Just return zero here; rather tricky to properly emulate this, especially as the specs are a mess. */
-    pRegFrame->rax = 0;
-    pRegFrame->rdx = 0;
-    /** @todo We should trigger a \#GP here if the CPU doesn't support the index in
-     *        ecx but see @bugref{3472}! */
-
-    NOREF(pVM);
-    return VINF_SUCCESS;
-}
-
-
 /* VT-x only: */
 

trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h

@@ -7827 +7827 @@
 
     PVMXVMCSINFO pVmcsInfo = pVmxTransient->pVmcsInfo;
-    int rc = vmxHCImportGuestState<  CPUMCTX_EXTRN_CR4
-                                   | CPUMCTX_EXTRN_CR0
-                                   | CPUMCTX_EXTRN_RFLAGS
-                                   | CPUMCTX_EXTRN_RIP
-                                   | CPUMCTX_EXTRN_SS>(pVCpu, pVmcsInfo, __FUNCTION__);
+    vmxHCReadToTransient<HMVMX_READ_EXIT_INSTR_LEN>(pVCpu, pVmxTransient);
+    int rc = vmxHCImportGuestState<IEM_CPUMCTX_EXTRN_EXEC_DECODED_NO_MEM_MASK | CPUMCTX_EXTRN_CR4>(pVCpu, pVmcsInfo, __FUNCTION__);
     AssertRCReturn(rc, rc);
 
-    PCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
-    rc = EMInterpretRdpmc(pVCpu->CTX_SUFF(pVM), pVCpu, CPUMCTX2CORE(pCtx));
-    if (RT_LIKELY(rc == VINF_SUCCESS))
-    {
-        rc = vmxHCAdvanceGuestRip(pVCpu, pVmxTransient);
-        Assert(pVmxTransient->cbExitInstr == 2);
-    }
-    else
-    {
-        AssertMsgFailed(("vmxHCExitRdpmc: EMInterpretRdpmc failed with %Rrc\n", rc));
-        rc = VERR_EM_INTERPRETER;
-    }
-    return rc;
+    VBOXSTRICTRC rcStrict = IEMExecDecodedRdpmc(pVCpu, pVmxTransient->cbExitInstr);
+    if (RT_LIKELY(rcStrict == VINF_SUCCESS))
+        ASMAtomicUoOrU64(&VCPU_2_VMXSTATE(pVCpu).fCtxChanged, HM_CHANGED_GUEST_RIP | HM_CHANGED_GUEST_RFLAGS);
+    else if (rcStrict == VINF_IEM_RAISED_XCPT)
+    {
+        ASMAtomicUoOrU64(&VCPU_2_VMXSTATE(pVCpu).fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK);
+        rcStrict = VINF_SUCCESS;
+    }
+    return rcStrict;
 }