Changeset 55105 in vbox

Timestamp:

Apr 6, 2015 7:18:50 PM (9 years ago)

Author:

vboxsync

Message:

Removed iemFRegIsFxSaveFormat.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAll.cpp (modified) (1 diff)
• IEMAllCImpl.cpp.h (modified) (3 diffs)

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

@@ -4629 +4629 @@
 {
     return *(uint64_t *)iemGRegRef(pIemCpu, iReg);
-}
-
-
-/**
- * Is the FPU state in FXSAVE format or not.
- *
- * @returns true if it is, false if it's in FNSAVE.
- * @param   pVCpu               Pointer to the VMCPU.
- */
-DECLINLINE(bool) iemFRegIsFxSaveFormat(PIEMCPU pIemCpu)
-{
-#ifdef RT_ARCH_AMD64
-    NOREF(pIemCpu);
-    return true;
-#else
-    NOREF(pIemCpu); /// @todo return pVCpu->pVMR3->cpum.s.CPUFeatures.edx.u1FXSR;
-    return true;
-#endif
 }
 

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

@@ -6044 +6044 @@
 
     PX86XSAVEAREA pXState = pCtx->CTX_SUFF(pXState);
-    if (iemFRegIsFxSaveFormat(pIemCpu))
-    {
-        pXState->x87.FCW   = 0x37f;
-        pXState->x87.FSW   = 0;
-        pXState->x87.FTW   = 0x00;         /* 0 - empty. */
-        pXState->x87.FPUDP = 0;
-        pXState->x87.DS    = 0; //??
-        pXState->x87.Rsrvd2= 0;
-        pXState->x87.FPUIP = 0;
-        pXState->x87.CS    = 0; //??
-        pXState->x87.Rsrvd1= 0;
-        pXState->x87.FOP   = 0;
-    }
-    else
-    {
-        PX86FPUSTATE pFpu = (PX86FPUSTATE)&pXState->x87;
-        pFpu->FCW       = 0x37f;
-        pFpu->FSW       = 0;
-        pFpu->FTW       = 0xffff;       /* 11 - empty */
-        pFpu->FPUOO     = 0; //??
-        pFpu->FPUOS     = 0; //??
-        pFpu->FPUIP     = 0;
-        pFpu->CS        = 0; //??
-        pFpu->FOP       = 0;
-    }
+    pXState->x87.FCW   = 0x37f;
+    pXState->x87.FSW   = 0;
+    pXState->x87.FTW   = 0x00;         /* 0 - empty. */
+    pXState->x87.FPUDP = 0;
+    pXState->x87.DS    = 0; //??
+    pXState->x87.Rsrvd2= 0;
+    pXState->x87.FPUIP = 0;
+    pXState->x87.CS    = 0; //??
+    pXState->x87.Rsrvd1= 0;
+    pXState->x87.FOP   = 0;
 
     iemHlpUsedFpu(pIemCpu);
@@ -6104 +6089 @@
         return iemRaiseGeneralProtectionFault0(pIemCpu);
     }
-    AssertReturn(iemFRegIsFxSaveFormat(pIemCpu), VERR_IEM_IPE_2);
 
     /*
@@ -6209 +6193 @@
         return iemRaiseGeneralProtectionFault0(pIemCpu);
     }
-    AssertReturn(iemFRegIsFxSaveFormat(pIemCpu), VERR_IEM_IPE_2);
 
     /*