Changeset 66286 in vbox

Timestamp:

Mar 28, 2017 10:17:15 AM (8 years ago)

Author:

vboxsync

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

114211

Message:

bs3-cpu-generated-1: 16 byte SSE alignment check.

Location:

trunk/src/VBox/ValidationKit/bootsectors

Files:

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

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

@@ -312 +312 @@
         if oInstr.sPrefix:
             if oInstr.sPrefix == 'none':
-                self.sPfxKind = 'BS3CGPFXKIND_NO_F2_F3_66';
+                self.sPfxKind = 'BS3CG1PFXKIND_NO_F2_F3_66';
             else:
-                self.sPfxKind = 'BS3CGPFXKIND_REQ_' + oInstr.sPrefix[-2:].upper();
+                self.sPfxKind = 'BS3CG1PFXKIND_REQ_' + oInstr.sPrefix[-2:].upper();
         elif oInstr.sEncoding == 'ModR/M':
             if 'ignores_op_size' not in oInstr.dHints:
-                self.sPfxKind   = 'BS3CGPFXKIND_MODRM';
+                self.sPfxKind   = 'BS3CG1PFXKIND_MODRM';
             else:
-                self.sPfxKind   = 'BS3CGPFXKIND_MODRM_NO_OP_SIZES';
+                self.sPfxKind   = 'BS3CG1PFXKIND_MODRM_NO_OP_SIZES';
         else:
             self.sPfxKind       = '0';
@@ -332 +332 @@
             self.sCpu += 'ANY';
 
+        if oInstr.sXcptType:
+            self.sXcptType = 'BS3CG1XCPTTYPE_' + oInstr.sXcptType.upper();
+        else:
+            self.sXcptType = 'BS3CG1XCPTTYPE_NONE';
 
     def getOperands(self):
@@ -348 +352 @@
             '        /* enmPrefixKind = */    (unsigned)%s,' % (self.sPfxKind,),
             '        /* enmCpuTest = */       (unsigned)%s,' % (self.sCpu,),
+            '        /* enmXcptType = */      (unsigned)%s,' % (self.sXcptType,),
             '        /* uUnused = */          0,',
             '        /* fFlags = */           %s' % (' | '.join(self.asFlags) if self.asFlags else '0'),

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

@@ -123 +123 @@
     BS3CG1CPU               enmCpuTest;
     /** Prefix sensitivity and requirements. */
-    BS3CGPFXKIND            enmPrefixKind;
+    BS3CG1PFXKIND           enmPrefixKind;
+    /** Exception type (SSE, AVX). */
+    BS3CG1XCPTTYPE          enmXcptType;
     /** Per operand flags. */
     BS3CG1OP                aenmOperands[4];
@@ -224 +226 @@
     uint8_t                 bValueXcpt;
     /** @} */
+    /** Alignment exception expected by the encoder.
+     * UINT8_MAX if no special exception expected. */
+    uint8_t                 bAlignmentXcpt;
 
     /** The context we're working on. */
@@ -918 +923 @@
 };
 
-static const uint16_t g_afPfxKindToIgnoredFlags[BS3CGPFXKIND_END] =
+static const uint16_t g_afPfxKindToIgnoredFlags[BS3CG1PFXKIND_END] =
 {
-    /* [BS3CGPFXKIND_INVALID] = */              UINT16_MAX,
-    /* [BS3CGPFXKIND_MODRM] = */                0,
-    /* [BS3CGPFXKIND_MODRM_NO_OP_SIZES] = */    BS3CG1_PF_OZ | BS3CG1_PF_W,
+    /* [BS3CG1PFXKIND_INVALID] = */              UINT16_MAX,
+    /* [BS3CG1PFXKIND_MODRM] = */                0,
+    /* [BS3CG1PFXKIND_MODRM_NO_OP_SIZES] = */    BS3CG1_PF_OZ | BS3CG1_PF_W,
 };
 
 #endif
+
+
+/**
+ * Checks if >= 16 byte SSE/AVX alignment are exempted for the exception type.
+ *
+ * @returns true / false.
+ * @param   enmXcptType         The type to check.
+ */
+static bool Bs3Cg1XcptTypeIsUnaligned(BS3CG1XCPTTYPE enmXcptType)
+{
+    switch (enmXcptType)
+    {
+        case BS3CG1XCPTTYPE_4UA:
+        case BS3CG1XCPTTYPE_5:
+            return true;
+        default:
+            return false;
+    }
+}
 
 
@@ -932 +956 @@
     switch (pThis->enmPrefixKind)
     {
-        case BS3CGPFXKIND_REQ_66:
+        case BS3CG1PFXKIND_REQ_66:
             pThis->abCurInstr[offDst] = 0x66;
             break;
-        case BS3CGPFXKIND_REQ_F2:
+        case BS3CG1PFXKIND_REQ_F2:
             pThis->abCurInstr[offDst] = 0xf2;
             break;
-        case BS3CGPFXKIND_REQ_F3:
+        case BS3CG1PFXKIND_REQ_F3:
             pThis->abCurInstr[offDst] = 0xf3;
             break;
@@ -1053 +1077 @@
     unsigned off;
     unsigned cbOp;
+
+    pThis->bAlignmentXcpt = UINT8_MAX;
+
     switch (pThis->enmEncoding)
     {
@@ -1227 +1254 @@
                 off = Bs3Cfg1EncodeMemMod0Disp(pThis, false, off, 2 /*iReg*/, 16, 0, BS3CG1OPLOC_MEM_RW);
             }
-            //else if (iEncoding == 2)
-            //{
-            //    pThis->aOperands[pThis->iRegOp].idxField = BS3CG1DST_XMM3;
-            //    off = Bs3Cg1InsertOpcodes(pThis, Bs3Cg1InsertReqPrefix(pThis, 0));
-            //    off = Bs3Cfg1EncodeMemMod0Disp(pThis, false, off, 3 /*iReg*/, 16, 1 /*cbMissalign*/, BS3CG1OPLOC_MEM_RW);
-            //}
+            else if (iEncoding == 2)
+            {
+                pThis->aOperands[pThis->iRegOp].idxField = BS3CG1DST_XMM3;
+                off = Bs3Cg1InsertOpcodes(pThis, Bs3Cg1InsertReqPrefix(pThis, 0));
+                off = Bs3Cfg1EncodeMemMod0Disp(pThis, false, off, 3 /*iReg*/, 16, 1 /*cbMissalign*/, BS3CG1OPLOC_MEM_RW);
+                if (!Bs3Cg1XcptTypeIsUnaligned(pThis->enmXcptType))
+                    pThis->bAlignmentXcpt = X86_XCPT_GP;
+            }
             else
                 break;
@@ -2184 +2213 @@
     if (!fInvalidInstr)
     {
-        bExpectedXcpt = pThis->bValueXcpt;
+        bExpectedXcpt = pThis->bAlignmentXcpt;
+        if (bExpectedXcpt == UINT8_MAX)
+            bExpectedXcpt = pThis->bValueXcpt;
         if (bExpectedXcpt == UINT8_MAX)
         {
@@ -2706 +2737 @@
         pThis->enmEncoding     = (BS3CG1ENC)pInstr->enmEncoding;
         pThis->enmCpuTest      = (BS3CG1CPU)pInstr->enmCpuTest;
-        pThis->enmPrefixKind   = (BS3CG1CPU)pInstr->enmPrefixKind;
+        pThis->enmPrefixKind   = (BS3CG1PFXKIND)pInstr->enmPrefixKind;
+        pThis->enmXcptType     = (BS3CG1XCPTTYPE)pInstr->enmXcptType;
         pThis->cchMnemonic     = pInstr->cchMnemonic;
         if (pThis->fAdvanceMnemonic)

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

@@ -96 +96 @@
  * Prefix sensitivitiy kind.
  */
-typedef enum BS3CGPFXKIND
-{
-    BS3CGPFXKIND_INVALID = 0,
-
-    BS3CGPFXKIND_NO_F2_F3_66,           /**< No 66, F2 or F3 prefixes allowed as that would alter the meaning. */
-    BS3CGPFXKIND_REQ_F2,                /**< Requires F2 (REPNE) prefix as part of the instr encoding. */
-    BS3CGPFXKIND_REQ_F3,                /**< Requires F3 (REPE) prefix as part of the instr encoding. */
-    BS3CGPFXKIND_REQ_66,                /**< Requires 66 (OP SIZE) prefix as part of the instr encoding.  */
+typedef enum BS3CG1PFXKIND
+{
+    BS3CG1PFXKIND_INVALID = 0,
+
+    BS3CG1PFXKIND_NO_F2_F3_66,           /**< No 66, F2 or F3 prefixes allowed as that would alter the meaning. */
+    BS3CG1PFXKIND_REQ_F2,                /**< Requires F2 (REPNE) prefix as part of the instr encoding. */
+    BS3CG1PFXKIND_REQ_F3,                /**< Requires F3 (REPE) prefix as part of the instr encoding. */
+    BS3CG1PFXKIND_REQ_66,                /**< Requires 66 (OP SIZE) prefix as part of the instr encoding.  */
 
     /** @todo more work to be done here...   */
-    BS3CGPFXKIND_MODRM,
-    BS3CGPFXKIND_MODRM_NO_OP_SIZES,
-
-    BS3CGPFXKIND_END
-} BS3CGPFXKIND;
+    BS3CG1PFXKIND_MODRM,
+    BS3CG1PFXKIND_MODRM_NO_OP_SIZES,
+
+    BS3CG1PFXKIND_END
+} BS3CG1PFXKIND;
 
 /**
@@ -132 +132 @@
     BS3CG1CPU_END
 } BS3CG1CPU;
+
+
+/**
+ * SSE & AVX exception types.
+ */
+typedef enum BS3CG1XCPTTYPE
+{
+    BS3CG1XCPTTYPE_NONE = 0,
+    /* SSE: */
+    BS3CG1XCPTTYPE_1,
+    BS3CG1XCPTTYPE_2,
+    BS3CG1XCPTTYPE_3,
+    BS3CG1XCPTTYPE_4,
+    BS3CG1XCPTTYPE_4UA,
+    BS3CG1XCPTTYPE_5,
+    BS3CG1XCPTTYPE_6,
+    BS3CG1XCPTTYPE_7,
+    BS3CG1XCPTTYPE_8,
+    BS3CG1XCPTTYPE_11,
+    BS3CG1XCPTTYPE_12,
+    /* EVEX: */
+    BS3CG1XCPTTYPE_E1,
+    BS3CG1XCPTTYPE_E1NF,
+    BS3CG1XCPTTYPE_E2,
+    BS3CG1XCPTTYPE_E3,
+    BS3CG1XCPTTYPE_E3NF,
+    BS3CG1XCPTTYPE_E4,
+    BS3CG1XCPTTYPE_E4NF,
+    BS3CG1XCPTTYPE_E5,
+    BS3CG1XCPTTYPE_E5NF,
+    BS3CG1XCPTTYPE_E6,
+    BS3CG1XCPTTYPE_E6NF,
+    BS3CG1XCPTTYPE_E7NF,
+    BS3CG1XCPTTYPE_E9,
+    BS3CG1XCPTTYPE_E9NF,
+    BS3CG1XCPTTYPE_E10,
+    BS3CG1XCPTTYPE_E11,
+    BS3CG1XCPTTYPE_E12,
+    BS3CG1XCPTTYPE_E12NF,
+    BS3CG1XCPTTYPE_END
+} BS3CG1XCPTTYPE;
+AssertCompile(BS3CG1XCPTTYPE_END <= 32);
+
 
 /**
@@ -150 +193 @@
     /** BS3CG1ENC values. */
     uint32_t    enmEncoding : 10;
-    /** BS3CGPFXKIND values. */
+    /** BS3CG1PFXKIND values. */
     uint32_t    enmPrefixKind : 4;
     /** CPU test / CPU ID bit test (BS3CG1CPU). */
     uint32_t    enmCpuTest : 6;
+    /** Exception type (BS3CG1XCPTTYPE)   */
+    uint32_t    enmXcptType : 5;
     /** Currently unused bits. */
-    uint32_t    uUnused : 12;
+    uint32_t    uUnused : 7;
     /** BS3CG1INSTR_F_XXX. */
     uint32_t    fFlags;