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

Timestamp:

Apr 6, 2017 5:58:25 PM (8 years ago)

Author:

vboxsync

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

114448

Message:

IEM,bs3-cpu-generated-1: Made the current testcases pass on AMD.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

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

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

@@ -549 +549 @@
 
 
+/** Invalid with RM byte where both AMD and Intel decodes any additional
+ *  address encoding bytes. */
+FNIEMOPRM_DEF(iemOp_InvalidWithRMAllNeeded)
+{
+    IEMOP_MNEMONIC(InvalidWithRMAllNeeded, "InvalidWithRMAllNeeded");
+#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
+    IEMOP_HLP_DONE_DECODING();
+    return IEMOP_RAISE_INVALID_OPCODE();
+}
+
+
 /** Invalid with RM byte where intel requires 8-byte immediate.
  * Intel will also need SIB and displacement if bRm indicates memory. */
@@ -614 +633 @@
 
 
+/** Invalid opcode where both AMD and Intel requires Mod R/M sequence. */
+FNIEMOP_DEF(iemOp_InvalidAllNeedRM)
+{
+    IEMOP_MNEMONIC(InvalidAllNeedRM, "InvalidAllNeedRM");
+    uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm); RT_NOREF(bRm);
+#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
+    IEMOP_HLP_DONE_DECODING();
+    return IEMOP_RAISE_INVALID_OPCODE();
+}
+
+
 /** Invalid opcode where intel requires Mod R/M sequence and 8-byte
  *  immediate. */

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

@@ -1974 +1974 @@
         {
             Log(("evex not supported by the guest CPU!\n"));
-            return FNIEMOP_CALL(iemOp_InvalidNeedRM);
+            return FNIEMOP_CALL(iemOp_InvalidAllNeedRM);
         }
         IEM_OPCODE_GET_NEXT_U8(&bRm);

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

@@ -6028 +6028 @@
     IEMOP_MNEMONIC1(M_MEM, CLFLUSH, clflush, MbRO, DISOPTYPE_HARMLESS, IEMOPHINT_IGNORES_OP_SIZE);
     if (!IEM_GET_GUEST_CPU_FEATURES(pVCpu)->fClFlush)
-        return IEMOP_RAISE_INVALID_OPCODE();
+        return FNIEMOP_CALL_1(iemOp_InvalidWithRMAllNeeded, bRm);
 
     IEM_MC_BEGIN(2, 0);
@@ -6053 +6053 @@
     IEMOP_MNEMONIC1(M_MEM, CLFLUSHOPT, clflushopt, MbRO, DISOPTYPE_HARMLESS, IEMOPHINT_IGNORES_OP_SIZE);
     if (!IEM_GET_GUEST_CPU_FEATURES(pVCpu)->fClFlushOpt)
-        return IEMOP_RAISE_INVALID_OPCODE();
+        return FNIEMOP_CALL_1(iemOp_InvalidWithRMAllNeeded, bRm);
 
     IEM_MC_BEGIN(2, 0);