Changeset 72636 in vbox for trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

Timestamp:

Jun 21, 2018 10:47:43 AM (6 years ago)

Author:

vboxsync

Message:

EM,HM: Removed EMInterpretRdtsc and EMInterpretRdtscp (reapplying r123092 backed out in r123118). Use VINF_IEM_RAISED_XCPT rather than VINF_EM_RESCHEDULE for clarity. bugref:6973

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (2 diffs)

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

@@ -6255 +6255 @@
 {
     HMSVM_VALIDATE_EXIT_HANDLER_PARAMS();
-#if 1 /** @todo Needs testing. @bugref{6973} */
     VBOXSTRICTRC rcStrict = IEMExecDecodedRdtsc(pVCpu, hmR0SvmGetInstrLengthHwAssist(pVCpu, pCtx, 2));
     if (rcStrict == VINF_SUCCESS)
         pSvmTransient->fUpdateTscOffsetting = true;
-    else if (rcStrict == VINF_EM_RESCHEDULE)
+    else if (rcStrict == VINF_IEM_RAISED_XCPT)
         rcStrict = VINF_SUCCESS;
     HMSVM_CHECK_SINGLE_STEP(pVCpu, rcStrict);
     STAM_COUNTER_INC(&pVCpu->hm.s.StatExitRdtsc);
     return VBOXSTRICTRC_TODO(rcStrict);
-#else
-    int rc = EMInterpretRdtsc(pVCpu->CTX_SUFF(pVM), pVCpu, CPUMCTX2CORE(pCtx));
-    if (RT_LIKELY(rc == VINF_SUCCESS))
-    {
-        pSvmTransient->fUpdateTscOffsetting = true;
-        hmR0SvmAdvanceRipHwAssist(pVCpu, pCtx, 2);
-        HMSVM_CHECK_SINGLE_STEP(pVCpu, rc);
-    }
-    else
-    {
-        AssertMsgFailed(("hmR0SvmExitRdtsc: EMInterpretRdtsc failed with %Rrc\n", rc));
-        rc = VERR_EM_INTERPRETER;
-    }
-    STAM_COUNTER_INC(&pVCpu->hm.s.StatExitRdtsc);
-    return rc;
-#endif
 }
 
@@ -6289 +6272 @@
 {
     HMSVM_VALIDATE_EXIT_HANDLER_PARAMS();
-#if 1 /** @todo Needs testing. @bugref{6973} */
     VBOXSTRICTRC rcStrict = IEMExecDecodedRdtscp(pVCpu, hmR0SvmGetInstrLengthHwAssist(pVCpu, pCtx, 3));
     if (rcStrict == VINF_SUCCESS)
         pSvmTransient->fUpdateTscOffsetting = true;
-    else if (rcStrict == VINF_EM_RESCHEDULE)
+    else if (rcStrict == VINF_IEM_RAISED_XCPT)
         rcStrict = VINF_SUCCESS;
     HMSVM_CHECK_SINGLE_STEP(pVCpu, rcStrict);
     STAM_COUNTER_INC(&pVCpu->hm.s.StatExitRdtscp);
     return VBOXSTRICTRC_TODO(rcStrict);
-#else
-    int rc = EMInterpretRdtscp(pVCpu->CTX_SUFF(pVM), pVCpu, pCtx);
-    if (RT_LIKELY(rc == VINF_SUCCESS))
-    {
-        pSvmTransient->fUpdateTscOffsetting = true;
-        hmR0SvmAdvanceRipHwAssist(pVCpu, pCtx, 3);
-        HMSVM_CHECK_SINGLE_STEP(pVCpu, rc);
-    }
-    else
-    {
-        AssertMsgFailed(("hmR0SvmExitRdtsc: EMInterpretRdtscp failed with %Rrc\n", rc));
-        rc = VERR_EM_INTERPRETER;
-    }
-    STAM_COUNTER_INC(&pVCpu->hm.s.StatExitRdtscp);
-    return rc;
-#endif
 }