Changeset 40083 in vbox

Timestamp:

Feb 12, 2012 1:51:58 PM (13 years ago)

Author:

vboxsync

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

76217

Message:

More FPU instruction stubs.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllInstructions.cpp.h (modified) (5 diffs)
• testcase/tstX86-1A.asm (modified) (1 diff)

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

@@ -10645 +10645 @@
 
 /** Opcode 0xdb 11/0. */
-FNIEMOP_STUB_1(iemOp_fcmovnb,  uint8_t, bRm);
+FNIEMOP_STUB_1(iemOp_fcmovnb_stN,  uint8_t, bRm);
 
 /** Opcode 0xdb 11/1. */
-FNIEMOP_STUB_1(iemOp_fcmovne,  uint8_t, bRm);
+FNIEMOP_STUB_1(iemOp_fcmovne_stN,  uint8_t, bRm);
 
 /** Opcode 0xdb 11/2. */
-FNIEMOP_STUB_1(iemOp_fcmovnbe, uint8_t, bRm);
+FNIEMOP_STUB_1(iemOp_fcmovnbe_stN, uint8_t, bRm);
 
 /** Opcode 0xdb 11/3. */
-FNIEMOP_STUB_1(iemOp_fcmovnnu, uint8_t, bRm);
+FNIEMOP_STUB_1(iemOp_fcmovnnu_stN, uint8_t, bRm);
 
 
@@ -10718 +10718 @@
 
 /** Opcode 0xdb 11/5. */
-FNIEMOP_STUB_1(iemOp_fucomi, uint8_t, bRm);
+FNIEMOP_STUB_1(iemOp_fucomi_stN, uint8_t, bRm);
 
 /** Opcode 0xdb 11/6. */
-FNIEMOP_STUB_1(iemOp_fcomi,  uint8_t, bRm);
+FNIEMOP_STUB_1(iemOp_fcomi_stN,  uint8_t, bRm);
 
 
@@ -10733 +10733 @@
         switch ((bRm >> X86_MODRM_REG_SHIFT) & X86_MODRM_REG_SMASK)
         {
-            case 0: FNIEMOP_CALL_1(iemOp_fcmovnb,  bRm);
-            case 1: FNIEMOP_CALL_1(iemOp_fcmovne,  bRm);
-            case 2: FNIEMOP_CALL_1(iemOp_fcmovnbe, bRm);
-            case 3: FNIEMOP_CALL_1(iemOp_fcmovnnu, bRm);
+            case 0: FNIEMOP_CALL_1(iemOp_fcmovnb_stN,  bRm);
+            case 1: FNIEMOP_CALL_1(iemOp_fcmovne_stN,  bRm);
+            case 2: FNIEMOP_CALL_1(iemOp_fcmovnbe_stN, bRm);
+            case 3: FNIEMOP_CALL_1(iemOp_fcmovnnu_stN, bRm);
             case 4:
                 IEMOP_HLP_NO_LOCK_PREFIX();
@@ -10752 +10752 @@
                 }
                 break;
-            case 5: return FNIEMOP_CALL_1(iemOp_fucomi, bRm);
-            case 6: return FNIEMOP_CALL_1(iemOp_fcomi,  bRm);
+            case 5: return FNIEMOP_CALL_1(iemOp_fucomi_stN, bRm);
+            case 6: return FNIEMOP_CALL_1(iemOp_fcomi_stN,  bRm);
             case 7: return IEMOP_RAISE_INVALID_OPCODE();
             IEM_NOT_REACHED_DEFAULT_CASE_RET();
@@ -10775 +10775 @@
 }
 
+
+/** Opcode 0xdc 11/0. */
+FNIEMOP_STUB_1(iemOp_fadd_stN_st0,   uint8_t, bRm);
+
+/** Opcode 0xdc 11/1. */
+FNIEMOP_STUB_1(iemOp_fmul_stN_st0,   uint8_t, bRm);
+
+/** Opcode 0xdc 11/4. */
+FNIEMOP_STUB_1(iemOp_fsubr_stN_st0,  uint8_t, bRm);
+
+/** Opcode 0xdc 11/5. */
+FNIEMOP_STUB_1(iemOp_fsub_stN_st0,   uint8_t, bRm);
+
+/** Opcode 0xdc 11/6. */
+FNIEMOP_STUB_1(iemOp_fdivr_stN_st0,  uint8_t, bRm);
+
+/** Opcode 0xdc 11/7. */
+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_STUB_1(iemOp_fmul_m64r,  uint8_t, bRm);
+
+/** Opcode 0xdc !11/2. */
+FNIEMOP_STUB_1(iemOp_fcom_m64r,  uint8_t, bRm);
+
+/** 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);
+
+/** Opcode 0xdc !11/5. */
+FNIEMOP_STUB_1(iemOp_fsubr_m64r, uint8_t, bRm);
+
+/** Opcode 0xdc !11/6. */
+FNIEMOP_STUB_1(iemOp_fdiv_m64r,  uint8_t, bRm);
+
+/** Opcode 0xdc !11/7. */
+FNIEMOP_STUB_1(iemOp_fdivr_m64r, uint8_t, bRm);
+
+
 /** Opcode 0xdc. */
-FNIEMOP_STUB(iemOp_EscF4);
+FNIEMOP_DEF(iemOp_EscF4)
+{
+    pIemCpu->offFpuOpcode = pIemCpu->offOpcode - 1;
+    uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
+    if ((bRm & X86_MODRM_MOD_MASK) == (3 << X86_MODRM_MOD_SHIFT))
+    {
+        switch ((bRm >> X86_MODRM_REG_SHIFT) & X86_MODRM_REG_SMASK)
+        {
+            case 0: return FNIEMOP_CALL_1(iemOp_fadd_stN_st0,  bRm);
+            case 1: return FNIEMOP_CALL_1(iemOp_fmul_stN_st0,  bRm);
+            case 2: return FNIEMOP_CALL(iemOp_fnop);
+            case 3: return FNIEMOP_CALL(iemOp_fnop);
+            case 4: return FNIEMOP_CALL_1(iemOp_fsubr_stN_st0, bRm);
+            case 5: return FNIEMOP_CALL_1(iemOp_fsub_stN_st0,  bRm);
+            case 6: return FNIEMOP_CALL_1(iemOp_fdivr_stN_st0, bRm);
+            case 7: return FNIEMOP_CALL_1(iemOp_fdiv_stN_st0,  bRm);
+            IEM_NOT_REACHED_DEFAULT_CASE_RET();
+        }
+    }
+    else
+    {
+        switch ((bRm >> X86_MODRM_REG_SHIFT) & X86_MODRM_REG_SMASK)
+        {
+            case 0: return FNIEMOP_CALL_1(iemOp_fadd_m64r,  bRm);
+            case 1: return FNIEMOP_CALL_1(iemOp_fmul_m64r,  bRm);
+            case 2: return FNIEMOP_CALL_1(iemOp_fcom_m64r,  bRm);
+            case 3: return FNIEMOP_CALL_1(iemOp_fcomp_m64r, bRm);
+            case 4: return FNIEMOP_CALL_1(iemOp_fsub_m64r,  bRm);
+            case 5: return FNIEMOP_CALL_1(iemOp_fsubr_m64r, bRm);
+            case 6: return FNIEMOP_CALL_1(iemOp_fdiv_m64r,  bRm);
+            case 7: return FNIEMOP_CALL_1(iemOp_fdivr_m64r, bRm);
+            IEM_NOT_REACHED_DEFAULT_CASE_RET();
+        }
+    }
+}
 
 

trunk/src/VBox/VMM/testcase/tstX86-1A.asm

@@ -1452 +1452 @@
         ShouldTrap X86_XCPT_UD, db 0dbh, 032h
 
+        ; the 0xdc block
+        db 0dbh, 0d0h ; fnop?
+        db 0dbh, 0d1h ; fnop?
+        db 0dbh, 0d2h ; fnop?
+        db 0dbh, 0d3h ; fnop?
+        db 0dbh, 0d4h ; fnop?
+        db 0dbh, 0d5h ; fnop?
+        db 0dbh, 0d6h ; fnop?
+        db 0dbh, 0d7h ; fnop?
+        db 0dbh, 0d8h ; fnop?
+        db 0dbh, 0d9h ; fnop?
+        db 0dbh, 0dah ; fnop?
+        db 0dbh, 0dbh ; fnop?
+        db 0dbh, 0dch ; fnop?
+        db 0dbh, 0ddh ; fnop?
+        db 0dbh, 0deh ; fnop?
+        db 0dbh, 0dfh ; fnop?
+
         ; the 0xdd block
         db 0ddh, 0c0h ; fnop?