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

Timestamp:

May 17, 2017 12:09:30 PM (8 years ago)

Author:

vboxsync

Message:

IEM: Implemented vmovlpd Vq,Hq,Mq (VEX.66.0F 12 mod!=3).

Location:

trunk/src/VBox/ValidationKit/bootsectors

Files:

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

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

@@ -302 +302 @@
         self.asOpcodes          = oMap.asLeadOpcodes + [ '0x%02x' % (oInstr.getOpcodeByte(),) ];
         self.sEncoding          = iai.g_kdEncodings[oInstr.sEncoding][0];
+
         for oOp in oInstr.aoOperands:
             self.sEncoding     += '_' + oOp.sType;
         if oInstr.fUnused:
+            print('DEBUG: Unused Bs3Cg1Instruction: %s\n' % (oInstr.sEncoding,));
             if oInstr.sInvalidStyle == 'immediate' and oInstr.sSubOpcode:
                 self.sEncoding += '_MOD_EQ_3' if oInstr.sSubOpcode == '11 mr/reg' else '_MOD_NE_3';

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

@@ -2062 +2062 @@
         off = Bs3Cg1InsertReqPrefix(pThis, 0);
         off = Bs3Cg1InsertOpcodes(pThis, off);
-        pThis->abCurInstr[off++] = X86_MODRM_MAKE(3, 0, iEncoding);
+        pThis->abCurInstr[off++] = X86_MODRM_MAKE(3, 0, iEncoding & 7);
     }
     else
@@ -3143 +3143 @@
 }
 
+
+static unsigned BS3_NEAR_CODE Bs3Cg1EncodeNext_VEX_MODRM_MOD_EQ_3(PBS3CG1STATE pThis, unsigned iEncoding)
+{
+    unsigned off;
+    if (iEncoding < 8)
+    {
+        if (iEncoding & 1)
+            off = Bs3Cg1InsertVex2bPrefix(pThis, 0 /*offDst*/, 0xf /*~V*/, 0 /*L*/, 1 /*~R*/);
+        else
+            off = Bs3Cg1InsertVex3bPrefix(pThis, 0 /*offDst*/, 0xf /*~V*/, 0 /*L*/, 1 /*~R*/, 1 /*~X*/, 1 /*~B*/, 0 /*W*/);
+        off = Bs3Cg1InsertOpcodes(pThis, off);
+        pThis->abCurInstr[off++] = X86_MODRM_MAKE(3, iEncoding, 1);
+    }
+    else if (iEncoding < 16)
+    {
+        if (iEncoding & 1)
+            off = Bs3Cg1InsertVex2bPrefix(pThis, 0 /*offDst*/, 0xf /*~V*/, 1 /*L*/, 1 /*~R*/);
+        else
+            off = Bs3Cg1InsertVex3bPrefix(pThis, 0 /*offDst*/, 0xf /*~V*/, 1 /*L*/, 1 /*~R*/, 1 /*~X*/, 1 /*~B*/, 0 /*W*/);
+        off = Bs3Cg1InsertOpcodes(pThis, off);
+        pThis->abCurInstr[off++] = X86_MODRM_MAKE(3, iEncoding & 7, 1);
+    }
+    else if (iEncoding < 24)
+    {
+        if (iEncoding & 1)
+            off = Bs3Cg1InsertVex2bPrefix(pThis, 0 /*offDst*/, 0xf /*~V*/, 0 /*L*/, 1 /*~R*/);
+        else
+            off = Bs3Cg1InsertVex3bPrefix(pThis, 0 /*offDst*/, 0xf /*~V*/, 0 /*L*/, 1 /*~R*/, 1 /*~X*/, 1 /*~B*/, 0 /*W*/);
+        off = Bs3Cg1InsertOpcodes(pThis, off);
+        pThis->abCurInstr[off++] = X86_MODRM_MAKE(3, 0, iEncoding & 7);
+    }
+    else if (iEncoding < 32)
+    {
+        if (iEncoding & 1)
+            off = Bs3Cg1InsertVex2bPrefix(pThis, 0 /*offDst*/, 0xf /*~V*/, (iEncoding & 3) != 0 /*L*/, 1 /*~R*/);
+        else
+            off = Bs3Cg1InsertVex3bPrefix(pThis, 0 /*offDst*/, 0xf /*~V*/, (iEncoding & 2) != 0 /*L*/, 1 /*~R*/, 1 /*~X*/,
+                                          1 /*~B*/, (iEncoding & 4) != 0 /*W*/);
+        off = Bs3Cg1InsertOpcodes(pThis, off);
+        pThis->abCurInstr[off++] = X86_MODRM_MAKE(3, 0, iEncoding & 7);
+    }
+    else
+        return 0;
+    pThis->cbCurInstr = off;
+
+    return iEncoding + 1;
+}
+
+
+static unsigned BS3_NEAR_CODE Bs3Cg1EncodeNext_VEX_MODRM_MOD_NE_3(PBS3CG1STATE pThis, unsigned iEncoding)
+{
+    unsigned off;
+    if (iEncoding < 8)
+    {
+        unsigned iMod = iEncoding % 3;
+        if (iEncoding & 1)
+            off = Bs3Cg1InsertVex2bPrefix(pThis, 0 /*offDst*/, 0xf /*~V*/, (iEncoding & 2) != 0 /*L*/, 1 /*~R*/);
+        else
+            off = Bs3Cg1InsertVex3bPrefix(pThis, 0 /*offDst*/, 0xf /*~V*/, (iEncoding & 2) != 0 /*L*/, 1 /*~R*/,
+                                          1 /*~X*/, 1 /*~B*/, (iEncoding & 4) != 0 /*W*/);
+        off = Bs3Cg1InsertOpcodes(pThis, off);
+        pThis->abCurInstr[off++] = X86_MODRM_MAKE(iMod, 0, 1);
+        if (iMod >= 1)
+            pThis->abCurInstr[off++] = 0x7f;
+        if (iMod == 2)
+        {
+            pThis->abCurInstr[off++] = 0x5f;
+            if (!BS3_MODE_IS_16BIT_CODE(pThis->bMode))
+            {
+                pThis->abCurInstr[off++] = 0x3f;
+                pThis->abCurInstr[off++] = 0x1f;
+            }
+        }
+    }
+    else
+        return 0;
+    pThis->cbCurInstr = off;
+    return iEncoding + 1;
+}
+
 #endif /* BS3CG1_WITH_VEX */
 
@@ -3227 +3307 @@
             return Bs3Cg1EncodeNext_FIXED_rAX_Iz(pThis, iEncoding);
 
-        case BS3CG1ENC_MODRM_MOD_EQ_3:
-            return Bs3Cg1EncodeNext_MODRM_MOD_EQ_3(pThis, iEncoding);
-        case BS3CG1ENC_MODRM_MOD_NE_3:
-            return Bs3Cg1EncodeNext_MODRM_MOD_NE_3(pThis, iEncoding);
-
         /*
          * VEX stuff
@@ -3468 +3543 @@
             break;
 
+            /* Unused or invalid instructions mostly. */
         case BS3CG1ENC_MODRM_MOD_EQ_3:
+            pThis->pfnEncoder = Bs3Cg1EncodeNext_MODRM_MOD_EQ_3;
+            break;
         case BS3CG1ENC_MODRM_MOD_NE_3:
-            /* Unused or invalid instructions mostly. */
+            pThis->pfnEncoder = Bs3Cg1EncodeNext_MODRM_MOD_NE_3;
             break;
 
@@ -3570 +3648 @@
             break;
 
+        case BS3CG1ENC_VEX_MODRM_Vq_WO_HqHi_Mq:
+            pThis->pfnEncoder        = Bs3Cg1EncodeNext_VEX_MODRM_VsomethingWO_Hsomething_Msomething_Wip_OR_ViceVersa;
+            pThis->iRegOp            = 0;
+            pThis->iRmOp             = 2;
+            pThis->aOperands[0].cbOp = 16;
+            pThis->aOperands[1].cbOp = 8;
+            pThis->aOperands[2].cbOp = 8;
+            pThis->aOperands[0].enmLocation  = BS3CG1OPLOC_CTX_ZX_VLMAX;
+            pThis->aOperands[1].enmLocation  = BS3CG1OPLOC_CTX;
+            pThis->aOperands[2].enmLocation  = BS3CG1OPLOC_MEM;
+            pThis->aOperands[0].idxFieldBase = BS3CG1DST_XMM0;
+            pThis->aOperands[1].idxFieldBase = BS3CG1DST_XMM0_HI;
+            pThis->aOperands[2].idxFieldBase = BS3CG1DST_INVALID;
+            break;
+
         case BS3CG1ENC_VEX_MODRM_Md_WO_Vss:
             pThis->pfnEncoder        = Bs3Cg1EncodeNext_VEX_MODRM_VsomethingWO_Msomething_Wip_Lig_OR_ViceVersa;
@@ -3637 +3730 @@
             break;
 
+
+            /* Unused or invalid instructions mostly. */
+        case BS3CG1ENC_VEX_MODRM_MOD_EQ_3:
+            pThis->pfnEncoder = Bs3Cg1EncodeNext_VEX_MODRM_MOD_EQ_3;
+            break;
+        case BS3CG1ENC_VEX_MODRM_MOD_NE_3:
+            pThis->pfnEncoder = Bs3Cg1EncodeNext_VEX_MODRM_MOD_NE_3;
+            break;
 
 #endif /* BS3CG1_WITH_VEX */
@@ -4179 +4280 @@
             /* FPU and FXSAVE format. */
             else if (   pThis->pExtCtx->enmMethod != BS3EXTCTXMETHOD_ANCIENT
-                     && offField - sizeof(BS3REGCTX) <= RT_UOFFSETOF(BS3EXTCTX, Ctx.x87.aXMM[15]) )
+                     && offField - sizeof(BS3REGCTX) < RT_UOFFSET_AFTER(BS3EXTCTX, Ctx.x87.aXMM[15]))
             {
                 if (!pThis->fWorkExtCtx)

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

@@ -64 +64 @@
     BS3CG1OP_HdqCsd,
     BS3CG1OP_HdqCq,
+    BS3CG1OP_HqHi,
     BS3CG1OP_Nq,
     BS3CG1OP_Pq_WO,
@@ -155 +156 @@
     BS3CG1ENC_VEX_MODRM_Vq_WO_HdqCq_UqHi,
     BS3CG1ENC_VEX_MODRM_Vq_WO_HdqCq_Mq,
+    BS3CG1ENC_VEX_MODRM_Vq_WO_HqHi_Mq,
     BS3CG1ENC_VEX_MODRM_VssZx_WO_Md,
     BS3CG1ENC_VEX_MODRM_VsdZx_WO_Mq,
@@ -169 +171 @@
     BS3CG1ENC_FIXED_rAX_Iz,
 
+
     BS3CG1ENC_MODRM_MOD_EQ_3, /**< Unused or invalid instruction. */
     BS3CG1ENC_MODRM_MOD_NE_3, /**< Unused or invalid instruction. */
+    BS3CG1ENC_VEX_MODRM_MOD_EQ_3, /**< Unused or invalid instruction. */
+    BS3CG1ENC_VEX_MODRM_MOD_NE_3, /**< Unused or invalid instruction. */
 
     BS3CG1ENC_END