Changeset 40163 in vbox

Timestamp:

Feb 16, 2012 8:28:18 PM (13 years ago)

Author:

vboxsync

Message:

IEM: More r80 by m64r instructions.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllAImpl.asm (modified) (4 diffs)
• VMMAll/IEMAllInstructions.cpp.h (modified) (4 diffs)
• include/IEMInternal.h (modified) (1 diff)
• testcase/tstIEMCheckMc.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/IEMAllAImpl.asm

@@ -1369 +1369 @@
 
 ;;
-; FDIV with 64-bit floating point value.
+; FPU instruction working on one 80-bit and one 64-bit floating point value.
+;
+; @param    1       The instruction
 ;
 ; @param    A0      FPU context (fxsave).
@@ -1376 +1378 @@
 ; @param    A3      Pointer to the 64-bit divisor.
 ;
-BEGINPROC_FASTCALL iemAImpl_fpu_fdiv_r80_by_r64, 16
+%macro IEMIMPL_FPU_R80_BY_R64 1
+BEGINPROC_FASTCALL iemAImpl_ %+ %1 %+ _r80_by_r64, 16
         PROLOGUE_4_ARGS
         sub     xSP, 20h
@@ -1383 +1386 @@
         fld     tword [A2]
         FPU_LD_FXSTATE_FCW_AND_SAFE_FSW A0
-        fdiv    qword [A3]
+        %1      qword [A3]
 
         fnstsw  word  [A1 + IEMFPURESULT.FSW]
@@ -1391 +1394 @@
         add     xSP, 20h
         EPILOGUE_4_ARGS 8
-ENDPROC iemAImpl_fpu_fdiv_r80_by_r64
-
-
-;;
-; FMUL with 64-bit floating point value.
-;
-; @param    A0      FPU context (fxsave).
-; @param    A1      Pointer to a IEMFPURESULT for the output.
-; @param    A2      Pointer to the 80-bit factor.
-; @param    A3      Pointer to the 64-bit factor.
-;
-BEGINPROC_FASTCALL iemAImpl_fpu_fmul_r80_by_r64, 16
-        PROLOGUE_4_ARGS
-        sub     xSP, 20h
-
-        fninit
-        fld     tword [A2]
-        FPU_LD_FXSTATE_FCW_AND_SAFE_FSW A0
-        fmul    qword [A3]
-
-        fnstsw  word  [A1 + IEMFPURESULT.FSW]
-        fnclex
-        fstp    tword [A1 + IEMFPURESULT.r80Result]
-
-        add     xSP, 20h
-        EPILOGUE_4_ARGS 8
-ENDPROC iemAImpl_fpu_fmul_r80_by_r64
-
+ENDPROC iemAImpl_ %+ %1 %+ _r80_by_r64
+%endmacro
+
+IEMIMPL_FPU_R80_BY_R64 fadd
+IEMIMPL_FPU_R80_BY_R64 fmul
+IEMIMPL_FPU_R80_BY_R64 fcom
+IEMIMPL_FPU_R80_BY_R64 fsub
+IEMIMPL_FPU_R80_BY_R64 fsubr
+IEMIMPL_FPU_R80_BY_R64 fdiv
+IEMIMPL_FPU_R80_BY_R64 fdivr
+

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

@@ -10806 +10806 @@
 FNIEMOP_STUB_1(iemOp_fdiv_stN_st0,   uint8_t, bRm);
 
-/** Opcode 0xdc !11/0. */
-FNIEMOP_STUB_1(iemOp_fadd_m64r,  uint8_t, bRm);
-
-/** Opcode 0xdc !11/1. */
-FNIEMOP_DEF_1(iemOp_fmul_m64r,  uint8_t, bRm)
-{
-    IEMOP_MNEMONIC("fdiv m64r");
+
+/**
+ * Common worker for FPU instructions working on ST0 and a 64-bit floating point
+ * memory operand, and storing the result in ST0.
+ *
+ * @param   pImpl       Pointer to the instruction implementation (assembly).
+ */
+FNIEMOP_DEF_2(iemOpHlpFpu_ST0_m64r, uint8_t, bRm, PFNIEMAIMPLFPUR64, pfnImpl)
+{
     IEMOP_HLP_NO_LOCK_PREFIX();
 
@@ -10828 +10830 @@
     IEM_MC_FETCH_MEM_R64(r64Factor2, pIemCpu->iEffSeg, GCPtrEffSrc);
     IEM_MC_IF_FPUREG_NOT_EMPTY_REF_R80(pr80Factor1, 0)
-        IEM_MC_CALL_FPU_AIMPL_3(iemAImpl_fpu_fmul_r80_by_r64, pFpuRes, pr80Factor1, pr64Factor2);
+        IEM_MC_CALL_FPU_AIMPL_3(pfnImpl, pFpuRes, pr80Factor1, pr64Factor2);
         IEM_MC_STORE_FPU_RESULT_MEM_OP(FpuRes, 0, pIemCpu->iEffSeg, GCPtrEffSrc);
     IEM_MC_ELSE()
@@ -10839 +10841 @@
 }
 
+
+/** Opcode 0xdc !11/0. */
+FNIEMOP_DEF_1(iemOp_fadd_m64r,  uint8_t, bRm)
+{
+    IEMOP_MNEMONIC("fadd m64r");
+    return FNIEMOP_CALL_2(iemOpHlpFpu_ST0_m64r, bRm, iemAImpl_fadd_r80_by_r64);
+}
+
+
+/** Opcode 0xdc !11/1. */
+FNIEMOP_DEF_1(iemOp_fmul_m64r,  uint8_t, bRm)
+{
+    IEMOP_MNEMONIC("fmul m64r");
+    return FNIEMOP_CALL_2(iemOpHlpFpu_ST0_m64r, bRm, iemAImpl_fmul_r80_by_r64);
+}
+
 /** Opcode 0xdc !11/2. */
-FNIEMOP_STUB_1(iemOp_fcom_m64r,  uint8_t, bRm);
+FNIEMOP_DEF_1(iemOp_fcom_m64r,  uint8_t, bRm)
+{
+    IEMOP_MNEMONIC("fcom m64r");
+    return FNIEMOP_CALL_2(iemOpHlpFpu_ST0_m64r, bRm, iemAImpl_fcom_r80_by_r64);
+}
+
 
 /** Opcode 0xdc !11/3. */
 FNIEMOP_STUB_1(iemOp_fcomp_m64r, uint8_t, bRm);
 
+
 /** Opcode 0xdc !11/4. */
-FNIEMOP_STUB_1(iemOp_fsub_m64r,  uint8_t, bRm);
+FNIEMOP_DEF_1(iemOp_fsub_m64r,  uint8_t, bRm)
+{
+    IEMOP_MNEMONIC("fsub m64r");
+    return FNIEMOP_CALL_2(iemOpHlpFpu_ST0_m64r, bRm, iemAImpl_fsub_r80_by_r64);
+}
+
 
 /** Opcode 0xdc !11/5. */
-FNIEMOP_STUB_1(iemOp_fsubr_m64r, uint8_t, bRm);
+FNIEMOP_DEF_1(iemOp_fsubr_m64r, uint8_t, bRm)
+{
+    IEMOP_MNEMONIC("fsubr m64r");
+    return FNIEMOP_CALL_2(iemOpHlpFpu_ST0_m64r, bRm, iemAImpl_fsubr_r80_by_r64);
+}
 
 
@@ -10856 +10889 @@
 {
     IEMOP_MNEMONIC("fdiv m64r");
-    IEMOP_HLP_NO_LOCK_PREFIX();
-
-    IEM_MC_BEGIN(3, 3);
-    IEM_MC_LOCAL(RTGCPTR,               GCPtrEffSrc);
-    IEM_MC_LOCAL(IEMFPURESULT,          FpuRes);
-    IEM_MC_LOCAL(RTFLOAT64U,            r64Divisor);
-    IEM_MC_ARG_LOCAL_REF(PIEMFPURESULT, pFpuRes,        FpuRes,     0);
-    IEM_MC_ARG(PCRTFLOAT80U,            pr80Dividend,               1);
-    IEM_MC_ARG_LOCAL_REF(PRTFLOAT64U,   pr64Divisor,    r64Divisor, 2);
-
-    IEM_MC_CALC_RM_EFF_ADDR(GCPtrEffSrc, bRm);
-    IEM_MC_MAYBE_RAISE_DEVICE_NOT_AVAILABLE();
-    IEM_MC_MAYBE_RAISE_FPU_XCPT();
-    IEM_MC_FETCH_MEM_R64(r64Divisor, pIemCpu->iEffSeg, GCPtrEffSrc);
-    IEM_MC_IF_FPUREG_NOT_EMPTY_REF_R80(pr80Dividend, 0)
-        IEM_MC_CALL_FPU_AIMPL_3(iemAImpl_fpu_fdiv_r80_by_r64, pFpuRes, pr80Dividend, pr64Divisor);
-        IEM_MC_STORE_FPU_RESULT_MEM_OP(FpuRes, 0, pIemCpu->iEffSeg, GCPtrEffSrc);
-    IEM_MC_ELSE()
-        IEM_MC_FPU_STACK_UNDERFLOW_MEM_OP(0, pIemCpu->iEffSeg, GCPtrEffSrc);
-    IEM_MC_ENDIF();
-    IEM_MC_ADVANCE_RIP();
-
-    IEM_MC_END();
-    return VINF_SUCCESS;
+    return FNIEMOP_CALL_2(iemOpHlpFpu_ST0_m64r, bRm, iemAImpl_fdiv_r80_by_r64);
 }
 
 
 /** Opcode 0xdc !11/7. */
-FNIEMOP_STUB_1(iemOp_fdivr_m64r, uint8_t, bRm);
+FNIEMOP_DEF_1(iemOp_fdivr_m64r, uint8_t, bRm)
+{
+    IEMOP_MNEMONIC("fdivr m64r");
+    return FNIEMOP_CALL_2(iemOpHlpFpu_ST0_m64r, bRm, iemAImpl_fdivr_r80_by_r64);
+}
 
 

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

@@ -724 +724 @@
 typedef FNIEMAIMPLFPUR64U  *PFNIEMAIMPLFPUR64U;
 FNIEMAIMPLFPUR64U iemAImpl_fpu_r64_to_r80;
-FNIEMAIMPLFPUR64  iemAImpl_fpu_fdiv_r80_by_r64;
-FNIEMAIMPLFPUR64  iemAImpl_fpu_fmul_r80_by_r64;
+FNIEMAIMPLFPUR64  iemAImpl_fadd_r80_by_r64;
+FNIEMAIMPLFPUR64  iemAImpl_fmul_r80_by_r64;
+FNIEMAIMPLFPUR64  iemAImpl_fcom_r80_by_r64;
+FNIEMAIMPLFPUR64  iemAImpl_fsub_r80_by_r64;
+FNIEMAIMPLFPUR64  iemAImpl_fsubr_r80_by_r64;
+FNIEMAIMPLFPUR64  iemAImpl_fdiv_r80_by_r64;
+FNIEMAIMPLFPUR64  iemAImpl_fdivr_r80_by_r64;
 
 /** @} */

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

@@ -432 +432 @@
 #define IEM_MC_ENDIF()                                                  } do {} while (0)
 
+
+#define iemAImpl_fpu_r64_to_r80         NULL
+#define iemAImpl_fadd_r80_by_r64        NULL
+#define iemAImpl_fmul_r80_by_r64        NULL
+#define iemAImpl_fcom_r80_by_r64        NULL
+#define iemAImpl_fsub_r80_by_r64        NULL
+#define iemAImpl_fsubr_r80_by_r64       NULL
+#define iemAImpl_fdiv_r80_by_r64        NULL
+#define iemAImpl_fdivr_r80_by_r64       NULL
+
+
 /** @}  */