Changeset 66405 in vbox

Timestamp:

Apr 3, 2017 3:34:39 PM (8 years ago)

Author:

vboxsync

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

114358

Message:

IEM: Use the new CPUMGetGuestMxCsrMask function in FXSAVE & FXRSTOR implementation.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllCImpl.cpp.h (modified) (2 diffs)
• VMMR3/CPUM.cpp (modified) (1 diff)

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

@@ -6888 +6888 @@
     pDst->FOP           = pSrc->FOP;
     pDst->MXCSR         = pSrc->MXCSR;
-    pDst->MXCSR_MASK    = pSrc->MXCSR_MASK;
+    pDst->MXCSR_MASK    = CPUMGetGuestMxCsrMask(pVCpu->CTX_SUFF(pVM));
     for (uint32_t i = 0; i < RT_ELEMENTS(pDst->aRegs); i++)
     {
@@ -6984 +6984 @@
      */
     uint32_t const fMXCSR      = pSrc->MXCSR;
-    uint32_t const fMXCSR_MASK = pDst->MXCSR_MASK ? pDst->MXCSR_MASK : UINT32_C(0xffbf);
+    uint32_t const fMXCSR_MASK = CPUMGetGuestMxCsrMask(pVCpu->CTX_SUFF(pVM));
     if (fMXCSR & ~fMXCSR_MASK)
     {

trunk/src/VBox/VMM/VMMR3/CPUM.cpp

@@ -1190 +1190 @@
        IA-32 Processor States Following Power-up, Reset, or INIT */
     pFpuCtx->MXCSR                  = 0x1F80;
-    pFpuCtx->MXCSR_MASK             = 0xffff; /** @todo REM always changed this for us. Should probably check if the HW really
-                                                        supports all bits, since a zero value here should be read as 0xffbf. */
+    pFpuCtx->MXCSR_MASK             = pVM->cpum.s.GuestInfo.fMxCsrMask; /** @todo check if REM messes this up... */
+
     pCtx->aXcr[0]                   = XSAVE_C_X87;
     if (pVM->cpum.s.HostFeatures.cbMaxExtendedState >= RT_OFFSETOF(X86XSAVEAREA, Hdr))