Changeset 72619 in vbox for trunk/src/VBox/VMM/VMMAll/EMAll.cpp

Timestamp:

Jun 19, 2018 7:12:46 PM (6 years ago)

Author:

vboxsync

Message:

VMM: Temporarily put the old RDTSC[P] code back and enabled it (reverted r123092). bugref:6973

File:

• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (modified) (1 diff)

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

@@ -1865 +1865 @@
 }
 
+
+#if 1 /** @todo Remove after testing and enabling @bugref{6973}. */
+
+/**
+ * Interpret RDTSC.
+ *
+ * @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) EMInterpretRdtsc(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame)
+{
+    Assert(pRegFrame == CPUMGetGuestCtxCore(pVCpu));
+    unsigned uCR4 = CPUMGetGuestCR4(pVCpu);
+
+    if (uCR4 & X86_CR4_TSD)
+        return VERR_EM_INTERPRETER; /* genuine #GP */
+
+    uint64_t uTicks = TMCpuTickGet(pVCpu);
+#ifdef VBOX_WITH_NESTED_HWVIRT_SVM
+    uTicks = CPUMApplyNestedGuestTscOffset(pVCpu, uTicks);
+#endif
+
+    /* Same behaviour in 32 & 64 bits mode */
+    pRegFrame->rax = RT_LO_U32(uTicks);
+    pRegFrame->rdx = RT_HI_U32(uTicks);
+#ifdef VBOX_COMPARE_IEM_AND_EM
+    g_fIgnoreRaxRdx = true;
+#endif
+
+    NOREF(pVM);
+    return VINF_SUCCESS;
+}
+
+/**
+ * Interpret RDTSCP.
+ *
+ * @returns VBox status code.
+ * @param   pVM         The cross context VM structure.
+ * @param   pVCpu       The cross context virtual CPU structure.
+ * @param   pCtx        The CPU context.
+ *
+ */
+VMM_INT_DECL(int) EMInterpretRdtscp(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
+{
+    Assert(pCtx == CPUMQueryGuestCtxPtr(pVCpu));
+    uint32_t uCR4 = CPUMGetGuestCR4(pVCpu);
+
+    if (!pVM->cpum.ro.GuestFeatures.fRdTscP)
+    {
+        AssertFailed();
+        return VERR_EM_INTERPRETER; /* genuine #UD */
+    }
+
+    if (uCR4 & X86_CR4_TSD)
+        return VERR_EM_INTERPRETER; /* genuine #GP */
+
+    uint64_t uTicks = TMCpuTickGet(pVCpu);
+#ifdef VBOX_WITH_NESTED_HWVIRT_SVM
+    uTicks = CPUMApplyNestedGuestTscOffset(pVCpu, uTicks);
+#endif
+
+    /* Same behaviour in 32 & 64 bits mode */
+    pCtx->rax = RT_LO_U32(uTicks);
+    pCtx->rdx = RT_HI_U32(uTicks);
+#ifdef VBOX_COMPARE_IEM_AND_EM
+    g_fIgnoreRaxRdx = true;
+#endif
+    /* Low dword of the TSC_AUX msr only. */
+    VBOXSTRICTRC rc2 = CPUMQueryGuestMsr(pVCpu, MSR_K8_TSC_AUX, &pCtx->rcx); Assert(rc2 == VINF_SUCCESS); NOREF(rc2);
+    pCtx->rcx &= UINT32_C(0xffffffff);
+
+    return VINF_SUCCESS;
+}
+
+#endif /* Trying to use IEM APIs instead. */
 
 /**