Changeset 66336 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Mar 29, 2017 2:54:09 PM (8 years ago)

Author:

vboxsync

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

114270

Message:

IEM: Unused entries in grp 8 completes ModR/M decoding and takes a 8-bit immediate, even on AMD it seems.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAllInstructions.cpp.h (modified) (1 diff)
• IEMAllInstructionsTwoByte0f.cpp.h (modified) (2 diffs)

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

@@ -572 +572 @@
 
 
+/** Invalid with RM byte where intel requires 8-byte immediate.
+ * Both AMD and Intel also needs SIB and displacement according to bRm. */
+FNIEMOPRM_DEF(iemOp_InvalidWithRMAllNeedImm8)
+{
+    IEMOP_MNEMONIC(InvalidWithRMAllNeedImm8, "InvalidWithRMAllNeedImm8");
+#ifndef TST_IEM_CHECK_MC
+    if ((bRm & X86_MODRM_MOD_MASK) != (3 << X86_MODRM_MOD_SHIFT))
+    {
+        RTGCPTR      GCPtrEff;
+        VBOXSTRICTRC rcStrict = iemOpHlpCalcRmEffAddr(pVCpu, bRm, 0, &GCPtrEff);
+        if (rcStrict != VINF_SUCCESS)
+            return rcStrict;
+    }
+#endif
+    uint8_t bImm8;  IEM_OPCODE_GET_NEXT_U8(&bImm8);  RT_NOREF(bRm);
+    IEMOP_HLP_DONE_DECODING();
+    return IEMOP_RAISE_INVALID_OPCODE();
+}
+
+
 /** Invalid opcode where intel requires Mod R/M sequence. */
 FNIEMOP_DEF(iemOp_InvalidNeedRM)

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

@@ -6583 +6583 @@
     {
         case 0: case 1: case 2: case 3:
-            return IEMOP_RAISE_INVALID_OPCODE();
+            /* Both AMD and Intel want full modr/m decoding and imm8. */
+            return FNIEMOP_CALL_1(iemOp_InvalidWithRMAllNeedImm8, bRm);
         case 4: pImpl = &g_iemAImpl_bt;  IEMOP_MNEMONIC(bt_Ev_Ib,  "bt  Ev,Ib"); break;
         case 5: pImpl = &g_iemAImpl_bts; IEMOP_MNEMONIC(bts_Ev_Ib, "bts Ev,Ib"); break;
@@ -6743 +6744 @@
         }
     }
-
 }