Changeset 66313 in vbox for trunk/src/VBox/ValidationKit/bootsectors

Timestamp:

Mar 28, 2017 7:28:08 PM (8 years ago)

Author:

vboxsync

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

114242

Message:

bs3-cpu-generated-1,IEM: Introducing @opcodesub to more effectively deal with mod=3 vs mod!=3 encoding different instructions; hacked stuff to test unused mod encodings.

Location:

trunk/src/VBox/ValidationKit/bootsectors

Files:

• bs3-cpu-generated-1-data.py (modified) (1 diff)
• bs3-cpu-generated-1-template.c (modified) (4 diffs)
• bs3-cpu-generated-1.h (modified) (4 diffs)

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

@@ -304 +304 @@
         for oOp in oInstr.aoOperands:
             self.sEncoding     += '_' + oOp.sType;
+        if oInstr.fUnused:
+            if oInstr.sInvalidStyle == 'immediate' and oInstr.sSubOpcode:
+                self.sEncoding += '_MOD_EQ_3' if oInstr.sSubOpcode == '11 mr/reg' else '_MOD_NE_3';
 
         self.asFlags            = [];
         if 'invalid_64' in oInstr.dHints:
-            self.asFlags.append('BS3CG1INSTR_F_INVALID_64BIT')
+            self.asFlags.append('BS3CG1INSTR_F_INVALID_64BIT');
+        if oInstr.fUnused:
+            self.asFlags.append('BS3CG1INSTR_F_UNUSED');
 
         self.fAdvanceMnemonic   = True; ##< Set by the caller.

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

@@ -1524 +1524 @@
             break;
 
+        case BS3CG1ENC_MODRM_MOD_EQ_3:
+            if (iEncoding < 8)
+            {
+                off = Bs3Cg1InsertReqPrefix(pThis, 0);
+                off = Bs3Cg1InsertOpcodes(pThis, off);
+                pThis->abCurInstr[off++] = X86_MODRM_MAKE(3, iEncoding, 1);
+            }
+            else if (iEncoding < 16)
+            {
+                off = Bs3Cg1InsertReqPrefix(pThis, 0);
+                off = Bs3Cg1InsertOpcodes(pThis, off);
+                pThis->abCurInstr[off++] = X86_MODRM_MAKE(3, 0, iEncoding);
+            }
+            else
+                break;
+            pThis->cbCurInstr = off;
+            iEncoding++;
+            break;
+
+        case BS3CG1ENC_MODRM_MOD_NE_3:
+            if (iEncoding < 3)
+            {
+                off = Bs3Cg1InsertReqPrefix(pThis, 0);
+                off = Bs3Cg1InsertOpcodes(pThis, off);
+                pThis->abCurInstr[off++] = X86_MODRM_MAKE(iEncoding, 0, 1);
+                if (iEncoding >= 1)
+                    pThis->abCurInstr[off++] = 0x7f;
+                if (iEncoding == 2)
+                {
+                    pThis->abCurInstr[off++] = 0x5f;
+                    if (!BS3_MODE_IS_16BIT_CODE(pThis->bMode))
+                    {
+                        pThis->abCurInstr[off++] = 0x3f;
+                        pThis->abCurInstr[off++] = 0x1f;
+                    }
+                }
+            }
+            else
+                break;
+            pThis->cbCurInstr = off;
+            iEncoding++;
+            break;
+
         default:
             Bs3TestFailedF("Internal error! BS3CG1ENC_XXX = %u not implemented", pThis->enmEncoding);
@@ -1672 +1715 @@
             pThis->aOperands[0].idxField    = BS3CG1DST_OZ_RAX;
             pThis->aOperands[1].idxField    = BS3CG1DST_INVALID;
+            break;
+
+        case BS3CG1ENC_MODRM_MOD_EQ_3:
+        case BS3CG1ENC_MODRM_MOD_NE_3:
+            /* Unused or invalid instructions mostly. */
             break;
 
@@ -2925 +2973 @@
          * Check if the CPU supports the instruction.
          */
-        if (!Bs3Cg1CpuSetupFirst(pThis))
+        if (   !Bs3Cg1CpuSetupFirst(pThis)
+            || (pThis->fFlags & BS3CG1INSTR_F_UNUSED))
         {
             fInvalidInstr = true;
@@ -3045 +3094 @@
             if (!Bs3Cg1CpuSetupNext(pThis, iCpuSetup, &fInvalidInstr))
                 break;
+            if (pThis->fFlags & BS3CG1INSTR_F_UNUSED)
+                fInvalidInstr = true;
+            if (fInvalidInstr)
+                bTestXcptExpected = X86_XCPT_UD;
         }
     }

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

@@ -100 +100 @@
     BS3CG1ENC_FIXED_AL_Ib,
     BS3CG1ENC_FIXED_rAX_Iz,
+
+    BS3CG1ENC_MODRM_MOD_EQ_3, /**< Unused or invalid instruction. */
+    BS3CG1ENC_MODRM_MOD_NE_3, /**< Unused or invalid instruction. */
 
     BS3CG1ENC_END
@@ -198 +201 @@
     uint32_t    cOperands : 2;
     /** The length of the mnemonic. */
-    uint32_t    cchMnemonic : 3;
+    uint32_t    cchMnemonic : 4;
     /** Whether to advance the mnemonic array pointer. */
     uint32_t    fAdvanceMnemonic : 1;
@@ -212 +215 @@
     uint32_t    enmXcptType : 5;
     /** Currently unused bits. */
-    uint32_t    uUnused : 7;
+    uint32_t    uUnused : 6;
     /** BS3CG1INSTR_F_XXX. */
     uint32_t    fFlags;
@@ -227 +230 @@
 /** Invalid instruction in 64-bit mode. */
 #define BS3CG1INSTR_F_INVALID_64BIT     UINT32_C(0x00000002)
+/** Unused instruction. */
+#define BS3CG1INSTR_F_UNUSED            UINT32_C(0x00000004)
 /** @} */