Changeset 40072 in vbox for trunk/src

Timestamp:

Feb 10, 2012 9:49:12 PM (13 years ago)

Author:

vboxsync

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

76206

Message:

hacking in progress...

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAll.cpp (modified) (3 diffs)
• VMMAll/IEMAllInstructions.cpp.h (modified) (1 diff)
• include/IEMInternal.h (modified) (2 diffs)
• testcase/tstIEMCheckMc.cpp (modified) (3 diffs)

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

@@ -3248 +3248 @@
 
 
+/** @name   FPU access and helpers.
+ *
+ * @{
+ */
+
+
+/**
+ * Hook for preparing to use the host FPU.
+ *
+ * This is necessary in ring-0 and raw-mode context.
+ *
+ * @param   pIemCpu             The IEM per CPU data.
+ */
+DECLINLINE(void) iemFpuPrepareUsage(PIEMCPU pIemCpu)
+{
+#ifdef IN_RING3
+    NOREF(pIemCpu);
+#else
+# error "Implement me"
+#endif
+}
+
+
+/**
+ * Pushes a FPU result onto the FPU stack after inspecting the resulting
+ * statuses.
+ *
+ * @param   pIemCpu             The IEM per CPU data.
+ * @param   pResult             The FPU operation result to push.
+ */
+static void iemFpuPushResult(PIEMCPU pIemCpu, PIEMFPURESULT pResult)
+{
+    PCPUMCTX pCtx = pIemCpu->CTX_SUFF(pCtx);
+
+    if (pResult->u16FSW & (1))
+    {
+        /** @todo continue here later... */
+    }
+
+}
+
+
+/** @}  */
+
+
 /** @name   Memory access.
  *
@@ -4975 +5020 @@
 #define IEM_MC_REF_LOCAL(a_pRefArg, a_Local)            (a_pRefArg) = &(a_Local)
 #define IEM_MC_ARG(a_Type, a_Name, a_iArg)              a_Type a_Name
-#define IEM_MC_ARG_CONST(a_Type, a_Name, a_Value, a_iArg)   a_Type const a_Name = (a_Value)
+#define IEM_MC_ARG_CONST(a_Type, a_Name, a_Value, a_iArg)       a_Type const a_Name = (a_Value)
+#define IEM_MC_ARG_LOCAL_REF(a_Type, a_Name, a_Local, a_iArg)   a_Type const a_Name = &(a_Local)
 #define IEM_MC_ARG_LOCAL_EFLAGS(a_pName, a_Name, a_iArg) \
     uint32_t a_Name; \
@@ -5371 +5417 @@
  */
 #define IEM_MC_DEFER_TO_CIMPL_3(a_pfnCImpl, a0, a1, a2) (a_pfnCImpl)(pIemCpu, pIemCpu->offOpcode, a0, a1, a2)
+
+/**
+ * Calls a FPU assembly implementation taking two visible arguments.
+ *
+ * This shall be used without any IEM_MC_BEGIN or IEM_END macro surrounding it.
+ *
+ * @param   a_pfnAImpl      Pointer to the assembly FPU routine.
+ * @param   a0              The first extra argument.
+ * @param   a1              The second extra argument.
+ */
+#define IEM_MC_CALL_FPU_AIMPL_2(a_pfnAImpl, a0, a1) \
+    do { \
+        iemFpuPrepareUsage(pIemCpu); \
+        a_pfnAImpl(&pIemCpu->CTX_SUFF(pCtx)->fpu, (a0), (a1)); \
+    } while (0)
+/** Pushes FPU result onto the stack. */
+#define IEM_MC_PUSH_FPU_RESULT(a_FpuData) iemFpuPushResult(pIemCpu, &a_FpuData)
+
 
 #define IEM_MC_IF_EFL_BIT_SET(a_fBit)                   if (pIemCpu->CTX_SUFF(pCtx)->eflags.u & (a_fBit)) {

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

@@ -10390 +10390 @@
     IEMOP_MNEMONIC("fld m32r");
     IEMOP_HLP_NO_LOCK_PREFIX();
-#if 0
-
-    IEM_MC_BEGIN(3, 2);
-    IEM_MC_LOCAL(RTFLOAT32U,    r32Tmp);
-    IEM_MC_LOCAL(RTGCPTR,       GCPtrEffSrc);
+
+    IEM_MC_BEGIN(2, 2);
+    IEM_MC_LOCAL(RTGCPTR,               GCPtrEffSrc);
+    IEM_MC_LOCAL(IEMFPURESULT,          FpuRes);
+    IEM_MC_ARG_LOCAL_REF(PIEMFPURESULT, pFpuRes,    FpuRes, 0);
+    IEM_MC_ARG(RTFLOAT32U,              r32Val,             1);
 
     IEM_MC_CALC_RM_EFF_ADDR(GCPtrEffSrc, bRm);
-    IEM_MC_FETCH_MEM_R32(r32Tmp, pIemCpu->iEffSeg, GCPtrEffSrc);
-
-
     IEM_MC_MAYBE_RAISE_DEVICE_NOT_AVAILABLE();
     IEM_MC_MAYBE_RAISE_FPU_XCPT();
-
-
+    IEM_MC_FETCH_MEM_R32(r32Val, pIemCpu->iEffSeg, GCPtrEffSrc);
+//    IEM_MC_CALL_FPU_AIMPL_2(iemAImpl_fpu_r32_to_r80, pFpuRes, r32Val);
+
+    IEM_MC_PUSH_FPU_RESULT(FpuRes);
     IEM_MC_ADVANCE_RIP();
+
     IEM_MC_END();
     return VINF_SUCCESS;
-#else
-    AssertFailedReturn(VERR_NOT_IMPLEMENTED);
-#endif
 }
 

trunk/src/VBox/VMM/include/IEMInternal.h

@@ -68 +68 @@
 } IEMMODEX;
 AssertCompileSize(IEMMODEX, 4);
+
+
+/**
+ * A FPU result.
+ */
+typedef struct IEMFPURESULT
+{
+    /** The output value. */
+    RTFLOAT80U      r80Result;
+    /** The output status. */
+    uint16_t        u16FSW;
+} IEMFPURESULT;
+/** Pointer to a FPU result. */
+typedef IEMFPURESULT *PIEMFPURESULT;
+/** Pointer to a const FPU result. */
+typedef IEMFPURESULT const *PCIEMFPURESULT;
 
 
@@ -688 +704 @@
 
 
+/** @name FPU operations taking a 32-bit float argument
+ * @{ */
+typedef IEM_DECL_IMPL_TYPE(void, FNIEMAIMPLFPUR32,(PCX86FXSTATE pFpuState, PIEMFPURESULT pFpuRes, RTFLOAT32U r32Val));
+typedef FNIEMAIMPLFPUR32  *PFNIEMAIMPLFPUR32;
+FNIEMAIMPLFPUR32 iemAImpl_fpu_r32_to_r80;
+/** @} */
+
+
 /** @name Function tables.
  * @{

trunk/src/VBox/VMM/testcase/tstIEMCheckMc.cpp

@@ -222 +222 @@
     AssertCompile((a_iArg) < cArgs); \
     a_Type const a_Name = (a_Value); \
+    NOREF(a_Name)
+#define IEM_MC_ARG_LOCAL_REF(a_Type, a_Name, a_Local, a_iArg) \
+    RT_CONCAT(iArgCheck_, a_iArg) = 1; NOREF(RT_CONCAT(iArgCheck_,a_iArg)); \
+    int RT_CONCAT3(iArgCheck_,a_iArg,a_Name); NOREF(RT_CONCAT3(iArgCheck_,a_iArg,a_Name)); \
+    AssertCompile((a_iArg) < cArgs); \
+    a_Type const a_Name = &(a_Local); \
     NOREF(a_Name)
 #define IEM_MC_ARG_LOCAL_EFLAGS(a_pName, a_Name, a_iArg) \
@@ -347 +353 @@
     do { CHK_GCPTR(a_GCPtrMem); CHK_CONST(uint8_t, a_offDisp); CHK_TYPE(uint64_t, a_u64Dst); } while (0)
 
+#define IEM_MC_FETCH_MEM_R32(a_r32Dst, a_iSeg, a_GCPtrMem)              do { CHK_GCPTR(a_GCPtrMem); CHK_TYPE(RTFLOAT32U, a_r32Dst);} while (0)
+#define IEM_MC_FETCH_MEM_R64(a_r64Dst, a_iSeg, a_GCPtrMem)              do { CHK_GCPTR(a_GCPtrMem); CHK_TYPE(RTFLOAT64U, a_r64Dst);} while (0)
+#define IEM_MC_FETCH_MEM_R80(a_r80Dst, a_iSeg, a_GCPtrMem)              do { CHK_GCPTR(a_GCPtrMem); CHK_TYPE(RTFLOAT80U, a_r80Dst);} while (0)
+
 #define IEM_MC_FETCH_MEM_U8_ZX_U16(a_u16Dst, a_iSeg, a_GCPtrMem)        do { CHK_GCPTR(a_GCPtrMem); } while (0)
 #define IEM_MC_FETCH_MEM_U8_ZX_U32(a_u32Dst, a_iSeg, a_GCPtrMem)        do { CHK_GCPTR(a_GCPtrMem); } while (0)
@@ -390 +400 @@
 #define IEM_MC_DEFER_TO_CIMPL_3(a_pfnCImpl, a0, a1, a2)                 (VINF_SUCCESS)
 
+#define IEM_MC_CALL_FPU_AIMPL_2(a_pfnAImpl, a0, a1)                     do { } while (0)
+#define IEM_MC_PUSH_FPU_RESULT(a_FpuData)                               do { } while (0)
+
 #define IEM_MC_IF_EFL_BIT_SET(a_fBit)                                   if (g_fRandom) {
 #define IEM_MC_IF_EFL_BIT_NOT_SET(a_fBit)                               if (g_fRandom) {