Changeset 66334 in vbox

Timestamp:

Mar 29, 2017 2:26:23 PM (8 years ago)

Author:

vboxsync

Message:

IEM: Fixed UD1 / grp 10 decoding (intel eats modr/m after it).

Location:

trunk

Files:

• include/VBox/disopcode.h (modified) (2 diffs)
• src/VBox/VMM/Makefile.kmk (modified) (2 diffs)
• src/VBox/VMM/VMMAll/IEMAllInstructionsPython.py (modified) (3 diffs)
• src/VBox/VMM/VMMAll/IEMAllInstructionsTwoByte0f.cpp.h (modified) (1 diff)
• src/VBox/ValidationKit/bootsectors/bs3-cpu-decoding-1.c32 (modified) (8 diffs)
• src/VBox/ValidationKit/bootsectors/bs3-cpu-generated-1-data.py (modified) (1 diff)
• src/VBox/ValidationKit/bootsectors/bs3-cpu-generated-1-template.c (modified) (2 diffs)
• src/VBox/ValidationKit/bootsectors/bs3-cpu-generated-1.h (modified) (1 diff)
• src/VBox/ValidationKit/bootsectors/bs3kit/Makefile.kmk (modified) (1 diff)

trunk/include/VBox/disopcode.h

@@ -690 +690 @@
     OP_PAVGUSB,
     OP_PFNACC,
+/** @}  */
     OP_ROL,
     OP_ROR,
@@ -734 +735 @@
     OP_MOV_TR,
     OP_SWAPGS,
-/** @}  */
+    OP_UD1,
+    OP_UD2,
 /** @name VT-x instructions
-* @{ */
+ * @{ */
     OP_VMREAD,
     OP_VMWRITE,

trunk/src/VBox/VMM/Makefile.kmk

@@ -357 +357 @@
         $(QUIET)$(MKDIR) -p -- "$(dir $@)"
         $(QUIET)$(SED) \
-                -e '/IEMOP_MNEMONIC[01234]*(/!d' \
-               -e 's/^.*IEMOP_MNEMONIC\([01234]*\)(/IEM_DO_INSTR_STAT\1(/' \
+                -e '/IEMOP_MNEMONIC\(\|[01234]\|[01234]EX\)(/!d' \
+               -e 's/^.*IEMOP_MNEMONIC\(\|[01234]\|[01234]EX\)(/IEM_DO_INSTR_STAT\1(/' \
                -e 's/;.*$(DOLLAR)//' \
                 --output "[email protected]" $(filter %.cpp.h,$^)
@@ -384 +384 @@
                 '#undef IEM_DO_INSTR_STAT3' \
                 '#undef IEM_DO_INSTR_STAT4' \
+                '#undef IEM_DO_INSTR_STAT0EX' \
+                '#undef IEM_DO_INSTR_STAT1EX' \
+                '#undef IEM_DO_INSTR_STAT2EX' \
+                '#undef IEM_DO_INSTR_STAT3EX' \
+                '#undef IEM_DO_INSTR_STAT4EX' \
                ''
         $(QUIET)$(RM) -f -- "[email protected]" "[email protected]"
         $(QUIET)$(CP) -v -f --changed -- "$@" "$(patsubst %.ts,%,$@)"
 
+foobar: $$(VBoxVMM_0_OUTDIR)/CommonGenIncs/IEMInstructionStatisticsTmpl.h
 
 if "$(KBUILD_TARGET)" == "win" && !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)

trunk/src/VBox/VMM/VMMAll/IEMAllInstructionsPython.py

@@ -448 +448 @@
         'byte':     [ 256, ], ##< next opcode byte selects the instruction (default).
         '/r':       [   8, ], ##< modrm.reg selects the instruction.
+        'memreg /r':[  16, ], ##< modrm.reg and (modrm.mod == 3) selects the instruction.
         'mod /r':   [  32, ], ##< modrm.reg and modrm.mod selects the instruction.
         '!11 /r':   [   8, ], ##< modrm.reg selects the instruction with modrm.mod != 0y11.
@@ -494 +495 @@
         if self.sSelector == 'mod /r':
             return (bOpcode >> 3) & 0x1f;
+
+        if self.sSelector == 'memreg /r':
+            return ((bOpcode >> 3) & 0x7) | (int((bOpcode >> 6) == 3) << 3);
 
         if self.sSelector == '!11 /r':
@@ -1207 +1211 @@
     'grp13':        InstructionMap('grp13',     asLeadOpcodes = ['0x0f', '0x72',], sSelector = 'mod /r'),
     'grp14':        InstructionMap('grp14',     asLeadOpcodes = ['0x0f', '0x73',], sSelector = 'mod /r'),
-    'grp15':        InstructionMap('grp15',     asLeadOpcodes = ['0x0f', '0xae',], sSelector = 'mod /r'),
+    'grp15':        InstructionMap('grp15',     asLeadOpcodes = ['0x0f', '0xae',], sSelector = 'memreg /r'),
     'grp16':        InstructionMap('grp16',     asLeadOpcodes = ['0x0f', '0x18',], sSelector = 'mod /r'),
     'grpA17':       InstructionMap('grpA17',    asLeadOpcodes = ['0x0f', '0x78',], sSelector = '/r'), # AMD: EXTRQ weirdness

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

@@ -6555 +6555 @@
 
 
-/** Opcode 0x0f 0xb9. */
+/**
+ * @opcode      0xb9
+ * @opinvalid   intel-modrm
+ * @optest      op1=1 op2=2 ->
+ * @oponlytest
+ */
 FNIEMOP_DEF(iemOp_Grp10)
 {
-    Log(("iemOp_Grp10 -> #UD\n"));
-    return IEMOP_RAISE_INVALID_OPCODE();
+    /*
+     * AMD does not decode beyond the 0xb9 whereas intel does the modr/m bit
+     * too. See bs3-cpu-decoder-1.c32.  So, we can forward to iemOp_InvalidNeedRM.
+     */
+    /** @todo fix bs3-cpu-generated-1 to deal with this on AMD! */
+    Log(("iemOp_Grp10 aka UD1 -> #UD\n"));
+    IEMOP_MNEMONIC2EX(ud1, "ud1", RM, UD1, ud1, Gb, Eb, DISOPTYPE_INVALID, IEMOPHINT_IGNORES_OP_SIZE); /* just picked Gb,Eb here. */
+    return FNIEMOP_CALL(iemOp_InvalidNeedRM);
 }
 

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-decoding-1.c32

@@ -355 +355 @@
 
 #define UD_T_EXACT          0
+#define UD_T_NOAMD          0x80        /**< AMD does not decode unnecessary bytes, Intel does. */
 #define UD_T_MODRM          1
 #define UD_T_MODRM_I8       2
@@ -397 +398 @@
 CPUDECODE1UDTST const g_aUdTest2Byte_0f[] =
 {
-#if 1
+#if 0
     {  UD_T_EXACT, 2, { 0x0f, 0x04 }, UD_F_ANY_PFX },
     {  UD_T_EXACT, 2, { 0x0f, 0x0a }, UD_F_ANY_PFX },
@@ -508 +509 @@
     {  UD_T_MODRM_RR7, 2, { 0x0f, 0xae }, UD_F_NOT_NO_PFX }, /* 00=sfence */
     {  UD_T_MODRM, 2, { 0x0f, 0xb8 }, UD_F_NOT_RN_PFX },
+#endif
+    {  UD_T_MODRM | UD_T_NOAMD, 2, { 0x0f, 0xb9 }, UD_F_ANY_PFX }, /* UD1 */
+#if 0
     /** @todo f3 0f bb rm and f2 0f bb rm does stuff on skylake even if their are blank in intel and AMD tables! */
     //{  UD_T_MODRM, 2, { 0x0f, 0xbb }, UD_F_NOT_NO_PFX | UD_F_NOT_OZ_PFX },
@@ -843 +847 @@
 void DecodeUdEdgeTest(PCCPUDECODE1UDTST paTests, unsigned cTests)
 {
+    uint8_t BS3_FAR *pbPages;
+
+    /*
+     * Detect AMD.
+     */
+    bool fIsAmd = false;
+    if (g_uBs3CpuDetected & BS3CPU_F_CPUID)
+        fIsAmd = ASMIsAmdCpu();
+    Bs3TestPrintf("fIsAmd=%d\n", fIsAmd);
+
     /*
      * Allocate and initialize a page pair
      */
-    uint8_t BS3_FAR *pbPages;
     pbPages  = Bs3MemGuardedTestPageAlloc(BS3MEMKIND_FLAT32);
     if (pbPages)
@@ -1024 +1037 @@
             {
                 case UD_T_EXACT:
+                l_case_exact:
                     cSuffixes   = RT_ELEMENTS(s_aExact);
                     paSuffixes  = s_aExact;
                     break;
+                case UD_T_MODRM | UD_T_NOAMD:
+                    if (fIsAmd)
+                        goto l_case_exact;
                 case UD_T_MODRM:
                     cSuffixes   = RT_ELEMENTS(s_aModRm);
@@ -1557 +1574 @@
     Bs3TestPrintf("g_uBs3CpuDetected=%#x\n", g_uBs3CpuDetected);
 
+#if 1
     Bs3TestSub("CMPPS, CMPPD, CMPSS, CMPSD");
     DecodeCmppsCmppdCmpssCmpsd();
@@ -1562 +1580 @@
     Bs3TestSub("MOVBE vs CRC32");
     DecodeMovbeVsCrc32();
+#endif
 
 #if 1
@@ -1572 +1591 @@
 #endif
 
-#if 0
+#if 1
     Bs3TestSub("misc");
     DecodeEdgeTest();

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-generated-1-data.py

@@ -313 +313 @@
         if oInstr.fUnused:
             self.asFlags.append('BS3CG1INSTR_F_UNUSED');
+        elif oInstr.fInvalid:
+            self.asFlags.append('BS3CG1INSTR_F_INVALID');
 
         self.fAdvanceMnemonic   = True; ##< Set by the caller.

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-generated-1-template.c

@@ -3128 +3128 @@
          */
         if (   !Bs3Cg1CpuSetupFirst(pThis)
-            || (pThis->fFlags & BS3CG1INSTR_F_UNUSED))
+            || (pThis->fFlags & (BS3CG1INSTR_F_UNUSED | BS3CG1INSTR_F_INVALID)))
         {
             fInvalidInstr = true;
@@ -3250 +3250 @@
             if (!Bs3Cg1CpuSetupNext(pThis, iCpuSetup, &fInvalidInstr))
                 break;
-            if (pThis->fFlags & BS3CG1INSTR_F_UNUSED)
+            if (pThis->fFlags & (BS3CG1INSTR_F_UNUSED | BS3CG1INSTR_F_INVALID))
                 fInvalidInstr = true;
             if (fInvalidInstr)

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-generated-1.h

@@ -242 +242 @@
 /** Unused instruction. */
 #define BS3CG1INSTR_F_UNUSED            UINT32_C(0x00000004)
+/** Invalid instruction. */
+#define BS3CG1INSTR_F_INVALID           UINT32_C(0x00000008)
 /** @} */
 

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/Makefile.kmk

@@ -200 +200 @@
        ../../../Runtime/common/asm/ASMSerializeInstruction-rdtscp.asm \
        ../../../Runtime/common/asm/ASMCpuIdExSlow.asm \
+       ../../../Runtime/common/asm/ASMCpuId.asm \
        ../../../Runtime/common/asm/ASMGetXcr0.asm \
        ../../../Runtime/common/asm/ASMSetXcr0.asm \