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

Timestamp:

May 25, 2017 8:36:03 PM (8 years ago)

Author:

vboxsync

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

115756

Message:

bs3-cpu-generated-1: cleanups

File:

• trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-generated-1-template.c (modified) (7 diffs)

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

@@ -193 +193 @@
     /** End of rings being tested. */
     uint8_t                 iEndRing;
+
+    /** Default operand size. */
+    uint8_t                 cbOpDefault;
+    /** Operand size when overridden by 066h. */
+    uint8_t                 cbOpOvrd66;
+    /** Operand size when overridden by REX.W. */
+    uint8_t                 cbOpOvrdRexW;
 
 
@@ -1487 +1494 @@
 {
     unsigned off;
-    /* Start by reg,reg encoding. */
-    if (iEncoding == 0)
-    {
-        off = Bs3Cg1InsertOpcodes(pThis, Bs3Cg1InsertReqPrefix(pThis, 0));
-        pThis->abCurInstr[off++] = X86_MODRM_MAKE(3, X86_GREG_xAX, X86_GREG_xCX);
-        pThis->aOperands[pThis->iRegOp].idxField = BS3CG1DST_AL;
-        pThis->aOperands[pThis->iRmOp ].idxField = BS3CG1DST_CL;
-    }
-    else if (iEncoding == 1)
-    {
-        pThis->aOperands[pThis->iRegOp].idxField = BS3CG1DST_CH;
-        off = Bs3Cg1InsertOpcodes(pThis, Bs3Cg1InsertReqPrefix(pThis, 0));
-        off = Bs3Cfg1EncodeMemMod0Disp(pThis, false, off, X86_GREG_xBP, 1, 0, BS3CG1OPLOC_MEM_RW);
-    }
-    else if (iEncoding == 2 && (g_uBs3CpuDetected & BS3CPU_TYPE_MASK) >= BS3CPU_80386)
-    {
-        pThis->aOperands[pThis->iRegOp].idxField = BS3CG1DST_BH;
-        pThis->abCurInstr[0] = P_AZ;
-        off = Bs3Cg1InsertOpcodes(pThis, Bs3Cg1InsertReqPrefix(pThis, 1));
-        off = Bs3Cfg1EncodeMemMod0Disp(pThis, true, off, X86_GREG_xDI, 1, 0, BS3CG1OPLOC_MEM_RW);
-    }
-    else
-        return 0;
+    switch (iEncoding)
+    {
+        /* Start by reg,reg encoding. */
+        case 0:
+            off = Bs3Cg1InsertOpcodes(pThis, Bs3Cg1InsertReqPrefix(pThis, 0));
+            pThis->abCurInstr[off++] = X86_MODRM_MAKE(3, X86_GREG_xAX, X86_GREG_xCX);
+            pThis->aOperands[pThis->iRegOp].idxField = BS3CG1DST_AL;
+            pThis->aOperands[pThis->iRmOp ].idxField = BS3CG1DST_CL;
+            break;
+        case 1:
+            pThis->aOperands[pThis->iRegOp].idxField = BS3CG1DST_CH;
+            off = Bs3Cg1InsertOpcodes(pThis, Bs3Cg1InsertReqPrefix(pThis, 0));
+            off = Bs3Cfg1EncodeMemMod0Disp(pThis, false, off, X86_GREG_xBP, 1, 0, BS3CG1OPLOC_MEM_RW);
+            break;
+        case 2:
+            if ((g_uBs3CpuDetected & BS3CPU_TYPE_MASK) < BS3CPU_80386)
+                return 0;
+            pThis->aOperands[pThis->iRegOp].idxField = BS3CG1DST_BH;
+            pThis->abCurInstr[0] = P_AZ;
+            off = Bs3Cg1InsertOpcodes(pThis, Bs3Cg1InsertReqPrefix(pThis, 1));
+            off = Bs3Cfg1EncodeMemMod0Disp(pThis, true, off, X86_GREG_xDI, 1, 0, BS3CG1OPLOC_MEM_RW);
+            break;
+        default:
+            return 0;
+    }
     pThis->cbCurInstr = off;
     return iEncoding + 1;
@@ -1518 +1527 @@
 {
     unsigned off;
-    /* Start by reg,reg encoding. */
-    if (iEncoding == 0)
-    {
-        off = Bs3Cg1InsertOpcodes(pThis, Bs3Cg1InsertReqPrefix(pThis, 0));
-        pThis->abCurInstr[off++] = X86_MODRM_MAKE(3, X86_GREG_xAX, X86_GREG_xCX);
-        pThis->aOperands[pThis->iRegOp].idxField = BS3CG1DST_AL;
-        pThis->aOperands[pThis->iRmOp ].idxField = BS3CG1DST_CL;
-    }
-    else if (iEncoding == 1)
-    {
-        pThis->aOperands[pThis->iRegOp].idxField = BS3CG1DST_CH;
-        off = Bs3Cg1InsertOpcodes(pThis, Bs3Cg1InsertReqPrefix(pThis, 0));
-        off = Bs3Cfg1EncodeMemMod0Disp(pThis, false, off, X86_GREG_xBP, 1, 0, BS3CG1OPLOC_MEM);
-    }
-    else if (iEncoding == 2 && (g_uBs3CpuDetected & BS3CPU_TYPE_MASK) >= BS3CPU_80386)
-    {
-        pThis->aOperands[pThis->iRegOp].idxField = BS3CG1DST_BH;
-        pThis->abCurInstr[0] = P_AZ;
-        off = Bs3Cg1InsertOpcodes(pThis, Bs3Cg1InsertReqPrefix(pThis, 1));
-        off = Bs3Cfg1EncodeMemMod0Disp(pThis, true, off, X86_GREG_xDI, 1, 0, BS3CG1OPLOC_MEM);
-    }
-    else
-        return 0;
+    switch (iEncoding)
+    {
+        /* Start by reg,reg encoding. */
+        case 0:
+            off = Bs3Cg1InsertOpcodes(pThis, Bs3Cg1InsertReqPrefix(pThis, 0));
+            pThis->abCurInstr[off++] = X86_MODRM_MAKE(3, X86_GREG_xAX, X86_GREG_xCX);
+            pThis->aOperands[pThis->iRegOp].idxField = BS3CG1DST_AL;
+            pThis->aOperands[pThis->iRmOp ].idxField = BS3CG1DST_CL;
+            break;
+        case 1:
+            pThis->aOperands[pThis->iRegOp].idxField = BS3CG1DST_CH;
+            off = Bs3Cg1InsertOpcodes(pThis, Bs3Cg1InsertReqPrefix(pThis, 0));
+            off = Bs3Cfg1EncodeMemMod0Disp(pThis, false, off, X86_GREG_xBP, 1, 0, BS3CG1OPLOC_MEM);
+            break;
+        case 2:
+            if ((g_uBs3CpuDetected & BS3CPU_TYPE_MASK) < BS3CPU_80386)
+                return 0;
+            pThis->aOperands[pThis->iRegOp].idxField = BS3CG1DST_BH;
+            pThis->abCurInstr[0] = P_AZ;
+            off = Bs3Cg1InsertOpcodes(pThis, Bs3Cg1InsertReqPrefix(pThis, 1));
+            off = Bs3Cfg1EncodeMemMod0Disp(pThis, true, off, X86_GREG_xDI, 1, 0, BS3CG1OPLOC_MEM);
+            break;
+        default:
+            return 0;
+    }
     pThis->cbCurInstr = off;
     return iEncoding + 1;
@@ -2222 +2233 @@
 
 
-static unsigned BS3_NEAR_CODE Bs3Cg1EncodeNext_MODRM_Mq_WO_Pq(PBS3CG1STATE pThis, unsigned iEncoding)
+static unsigned BS3_NEAR_CODE Bs3Cg1EncodeNext_MODRM_Msomething_Psomething(PBS3CG1STATE pThis, unsigned iEncoding)
 {
     unsigned off;
@@ -4156 +4167 @@
 
         case BS3CG1ENC_MODRM_Mq_WO_Pq:
-            pThis->pfnEncoder        = Bs3Cg1EncodeNext_MODRM_Mq_WO_Pq;
+            pThis->pfnEncoder        = Bs3Cg1EncodeNext_MODRM_Msomething_Psomething;
             pThis->iRmOp             = 0;
             pThis->iRegOp            = 1;
@@ -4607 +4618 @@
             Bs3TestFailedF("Bs3Cg1CalcNoneIntelInvalidEncoding: Unsupported encoding: %d\n", enmEncoding);
             return BS3CG1ENC_FIXED;
+    }
+}
+
+
+/**
+ * Sets cbOpDefault, cbOpOvrd66 and cbOpOvrdRexW.
+ *
+ * @param   pThis               The state.
+ * @param   bMode               The mode (only code part is used).
+ */
+static void Bs3Cg1SetOpSizes(PBS3CG1STATE pThis, uint8_t bMode)
+{
+    if (BS3_MODE_IS_16BIT_CODE(bMode))
+    {
+        pThis->cbOpDefault  = 2;
+        pThis->cbOpOvrd66   = 4;
+        pThis->cbOpOvrdRexW = 0;
+    }
+    else if (BS3_MODE_IS_32BIT_CODE(bMode))
+    {
+        pThis->cbOpDefault  = 4;
+        pThis->cbOpOvrd66   = 2;
+        pThis->cbOpOvrdRexW = 0;
+    }
+    else
+    {
+        pThis->cbOpDefault  = 4;
+        pThis->cbOpOvrd66   = 2;
+        pThis->cbOpOvrdRexW = 8;
     }
 }
@@ -6096 +6136 @@
              * Prep the operands and encoding handling.
              */
+            Bs3Cg1SetOpSizes(pThis, pThis->bMode);
             if (!Bs3Cg1EncodePrep(pThis))
                 break;