Changeset 66134 in vbox

Timestamp:

Mar 16, 2017 3:45:31 PM (8 years ago)

Author:

vboxsync

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

114037

Message:

bs3-cpu-generated-1: Deal with instructions not available in 64-bit mode (invalid) and fixed form instruction w/o any operands (e.g. AAA).

Location:

trunk/src/VBox/ValidationKit/bootsectors

Files:

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

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

@@ -304 +304 @@
         for oOp in oInstr.aoOperands:
             self.sEncoding     += '_' + oOp.sType;
+
         self.asFlags            = [];
+        if 'invalid_64' in oInstr.dHints:
+            self.asFlags.append('BS3CG1INSTR_F_INVALID_64BIT')
+
         self.fAdvanceMnemonic   = True; ##< Set by the caller.
         if self.sEncoding == 'ModR/M':
@@ -467 +471 @@
             '{',
         ];
+        cOperands = 0;
         for oInstr in self.aoInstructions:
-            asLines.append('    ' + oInstr.getOperands() + ',');
+            if oInstr.oInstr.aoOperands:
+                cOperands += len(oInstr.oInstr.aoOperands);
+                asLines.append('    ' + oInstr.getOperands() + ', /* %s */' % (oInstr.oInstr.sStats,));
+            else:
+                asLines.append('    /* none */');
+        if not cOperands:
+            asLines.append('    0 /* dummy */');
         asLines += [
             '};',

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

@@ -646 +646 @@
             break;
 
+        case BS3CG1ENC_FIXED:
+            if (iEncoding == 0)
+            {
+                off = Bs3Cg1InsertOpcodes(pThis, 0);
+                pThis->cbCurInstr = off;
+                iEncoding++;
+            }
+            break;
+
         case BS3CG1ENC_FIXED_AL_Ib:
             if (iEncoding == 0)
@@ -822 +831 @@
             pThis->aOperands[0].enmLocation = BS3CG1OPLOC_CTX;
             pThis->aOperands[1].enmLocation = BS3CG1OPLOC_CTX;
+            break;
+
+        case BS3CG1ENC_FIXED:
+            /* nothing to do here */
             break;
 
@@ -1290 +1303 @@
         unsigned iEncoding;
         unsigned iEncodingNext;
+        bool     fInvalidInstr = false;
+        uint8_t  bXcptExpected = BS3_MODE_IS_PAGED(bMode) ? X86_XCPT_PF : X86_XCPT_UD;
 
         /*
@@ -1322 +1337 @@
         }
 
+        if ((This.fFlags & BS3CG1INSTR_F_INVALID_64BIT) && BS3_MODE_IS_64BIT_CODE(bMode))
+        {
+            fInvalidInstr = true;
+            bXcptExpected = X86_XCPT_UD;
+        }
+
         /*
          * Prep the operands and encoding handling.
@@ -1383 +1404 @@
 
                             /* Check the control exception result first. */
-                            if (   This.TrapFrame.bXcpt     == (BS3_MODE_IS_PAGED(bMode) ? X86_XCPT_PF : X86_XCPT_UD)
-                                && This.TrapFrame.Ctx.rip.u == This.Ctx.rip.u + This.cbCurInstr)
+                            if (   This.TrapFrame.bXcpt     == bXcptExpected
+                                && This.TrapFrame.Ctx.rip.u == This.Ctx.rip.u + (!fInvalidInstr ? This.cbCurInstr : 0))
                             {
                                 /* Apply output modifications and compare the contexts. */
-                                if (BS3_MODE_IS_PAGED(bMode))
+                                if (bXcptExpected == X86_XCPT_PF)
                                     This.Ctx.cr2.u = This.uCodePgFlat + X86_PAGE_SIZE;
                                 This.Ctx.rflags.u32 &= ~X86_EFL_RF;
                                 This.Ctx.rflags.u32 |= This.TrapFrame.Ctx.rflags.u32 & X86_EFL_RF;
-                                if (Bs3Cg1RunContextModifier(&This, &This.Ctx, pHdr,
-                                                             pHdr->cbSelector + pHdr->cbInput, pHdr->cbOutput,
-                                                             &This.TrapFrame.Ctx, NULL /*pbCode*/))
+                                if (   fInvalidInstr
+                                    || Bs3Cg1RunContextModifier(&This, &This.Ctx, pHdr,
+                                                                pHdr->cbSelector + pHdr->cbInput, pHdr->cbOutput,
+                                                                &This.TrapFrame.Ctx, NULL /*pbCode*/))
                                 {
-                                    if (!Bs3TestCheckRegCtxEx(&This.TrapFrame.Ctx, &This.Ctx, This.cbCurInstr,  0 /*cbSpAdjust*/,
+                                    if (!Bs3TestCheckRegCtxEx(&This.TrapFrame.Ctx, &This.Ctx,
+                                                              !fInvalidInstr ? This.cbCurInstr : 0,  0 /*cbSpAdjust*/,
                                                               0 /*fExtraEfl*/, pszMode, iEncoding))
                                         Bs3TestFailedF("encoding#%u: %.*Rhxs", iEncoding, This.cbCurInstr, This.abCurInstr);
@@ -1402 +1425 @@
                             else
                             {
-                                Bs3TestFailedF("bXcpt=%#x expected %#x; rip=%RX64 expected %RX64; encoding#u: %.*Rhxs",
-                                               This.TrapFrame.bXcpt, BS3_MODE_IS_PAGED(bMode) ? X86_XCPT_PF : X86_XCPT_UD,
-                                               This.TrapFrame.Ctx.rip.u, This.Ctx.rip.u + This.cbCurInstr,
+                                Bs3TestFailedF("bXcpt=%#x expected %#x; rip=%RX64 expected %RX64; encoding#%u: %.*Rhxs",
+                                               This.TrapFrame.bXcpt, bXcptExpected,
+                                               This.TrapFrame.Ctx.rip.u, This.Ctx.rip.u + (!fInvalidInstr ? This.cbCurInstr : 0),
                                                iEncoding, This.cbCurInstr, This.abCurInstr);
                             }

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

@@ -76 +76 @@
     BS3CG1ENC_MODRM_Gv_Ev,
 
+    BS3CG1ENC_FIXED,
     BS3CG1ENC_FIXED_AL_Ib,
     BS3CG1ENC_FIXED_rAX_Iz,
@@ -130 +131 @@
 /** Defaults to SS rather than DS. */
 #define BS3CG1INSTR_F_DEF_SS            UINT32_C(0x00000001)
+/** Invalid instruction in 64-bit mode. */
+#define BS3CG1INSTR_F_INVALID_64BIT     UINT32_C(0x00000002)
 /** @} */