Index: trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-instr-3.c32
===================================================================
--- trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-instr-3.c32	(revision 106780)
+++ trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-instr-3.c32	(revision 106781)
@@ -642,5 +642,5 @@
 #undef  BS3_SKIPIT_DO_ARGS
 
-static unsigned g_cSeen, g_cSkipped;
+static unsigned g_cSeen, g_cSkipped, g_cAvgSkip = BS3_SKIPIT_AVG_SKIP;
 
 static void bs3CpuInstrX_ShowTallies(bool always)
@@ -663,5 +663,5 @@
     /* Cache calls to the relatively expensive random routine */
     if (!s_uTimes)
-        s_uTimes = bs3CpuInstrX_SimpleRand() % (BS3_SKIPIT_AVG_SKIP * 2 + 1) + 1;
+        s_uTimes = bs3CpuInstrX_SimpleRand() % (g_cAvgSkip * 2 + 1) + 1;
     fSkip = --s_uTimes > 0;
     if (fSkip)
@@ -1537,11 +1537,11 @@
         {  bs3CpuInstr3_vpcmpgtd_YMM10_YMM8_YMM15_icebp_c64,   255,         RM_REG, T_AVX_256, 10, 8,  15, RT_ELEMENTS(s_aValuesD), s_aValuesD },
 
-        {  bs3CpuInstr3_pcmpgtq_XMM1_XMM2_icebp_c64,           255,         RM_REG, T_SSE4_2,   1, 1,   2, RT_ELEMENTS(s_aValuesD), s_aValuesQ },
-        {  bs3CpuInstr3_pcmpgtq_XMM1_FSxBX_icebp_c64,          255,         RM_MEM, T_SSE4_2,   1, 1, 255, RT_ELEMENTS(s_aValuesD), s_aValuesQ },
-        {  bs3CpuInstr3_vpcmpgtq_XMM2_XMM1_XMM0_icebp_c64,     255,         RM_REG, T_AVX_128,  2, 1,   0, RT_ELEMENTS(s_aValuesD), s_aValuesQ },
-        {  bs3CpuInstr3_vpcmpgtq_XMM2_XMM1_FSxBX_icebp_c64,    X86_XCPT_DB, RM_MEM, T_AVX_128,  2, 1, 255, RT_ELEMENTS(s_aValuesD), s_aValuesQ },
-        {  bs3CpuInstr3_vpcmpgtq_YMM2_YMM1_YMM0_icebp_c64,     255,         RM_REG, T_AVX_256,  2, 1,   0, RT_ELEMENTS(s_aValuesD), s_aValuesQ },
-        {  bs3CpuInstr3_vpcmpgtq_YMM2_YMM1_FSxBX_icebp_c64,    X86_XCPT_DB, RM_MEM, T_AVX_256,  2, 1, 255, RT_ELEMENTS(s_aValuesD), s_aValuesQ },
-        {  bs3CpuInstr3_vpcmpgtq_YMM10_YMM8_YMM15_icebp_c64,   255,         RM_REG, T_AVX_256, 10, 8,  15, RT_ELEMENTS(s_aValuesD), s_aValuesQ },
+        {  bs3CpuInstr3_pcmpgtq_XMM1_XMM2_icebp_c64,           255,         RM_REG, T_SSE4_2,   1, 1,   2, RT_ELEMENTS(s_aValuesQ), s_aValuesQ },
+        {  bs3CpuInstr3_pcmpgtq_XMM1_FSxBX_icebp_c64,          255,         RM_MEM, T_SSE4_2,   1, 1, 255, RT_ELEMENTS(s_aValuesQ), s_aValuesQ },
+        {  bs3CpuInstr3_vpcmpgtq_XMM2_XMM1_XMM0_icebp_c64,     255,         RM_REG, T_AVX_128,  2, 1,   0, RT_ELEMENTS(s_aValuesQ), s_aValuesQ },
+        {  bs3CpuInstr3_vpcmpgtq_XMM2_XMM1_FSxBX_icebp_c64,    X86_XCPT_DB, RM_MEM, T_AVX_128,  2, 1, 255, RT_ELEMENTS(s_aValuesQ), s_aValuesQ },
+        {  bs3CpuInstr3_vpcmpgtq_YMM2_YMM1_YMM0_icebp_c64,     255,         RM_REG, T_AVX_256,  2, 1,   0, RT_ELEMENTS(s_aValuesQ), s_aValuesQ },
+        {  bs3CpuInstr3_vpcmpgtq_YMM2_YMM1_FSxBX_icebp_c64,    X86_XCPT_DB, RM_MEM, T_AVX_256,  2, 1, 255, RT_ELEMENTS(s_aValuesQ), s_aValuesQ },
+        {  bs3CpuInstr3_vpcmpgtq_YMM10_YMM8_YMM15_icebp_c64,   255,         RM_REG, T_AVX_256, 10, 8,  15, RT_ELEMENTS(s_aValuesQ), s_aValuesQ },
     };
     static BS3CPUINSTR3_TEST1_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST1_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -4204,7 +4204,7 @@
 
         {  bs3CpuInstr3_vmovlps_XMM1_XMM2_FSxBX_icebp_c16,  X86_XCPT_AC, RM_MEM64, T_AVX_128,     1,   2, 255, RT_ELEMENTS(s_aValuesLd), s_aValuesLd },
-        {  bs3CpuInstr3_vmovlps_FSxBX_XMM1_icebp_c16,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt},
+        {  bs3CpuInstr3_vmovlps_FSxBX_XMM1_icebp_c16,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt },
         {  bs3CpuInstr3_vmovlpd_XMM1_XMM2_FSxBX_icebp_c16,  X86_XCPT_AC, RM_MEM64, T_AVX_128,     1,   2, 255, RT_ELEMENTS(s_aValuesLd), s_aValuesLd },
-        {  bs3CpuInstr3_vmovlpd_FSxBX_XMM1_icebp_c16,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt},
+        {  bs3CpuInstr3_vmovlpd_FSxBX_XMM1_icebp_c16,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt },
     };
     static BS3CPUINSTR3_TEST1_T const s_aTests32[] =
@@ -4216,7 +4216,7 @@
 
         {  bs3CpuInstr3_vmovlps_XMM1_XMM2_FSxBX_icebp_c32,  X86_XCPT_AC, RM_MEM64, T_AVX_128,     1,   2, 255, RT_ELEMENTS(s_aValuesLd), s_aValuesLd },
-        {  bs3CpuInstr3_vmovlps_FSxBX_XMM1_icebp_c32,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt},
+        {  bs3CpuInstr3_vmovlps_FSxBX_XMM1_icebp_c32,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt },
         {  bs3CpuInstr3_vmovlpd_XMM1_XMM2_FSxBX_icebp_c32,  X86_XCPT_AC, RM_MEM64, T_AVX_128,     1,   2, 255, RT_ELEMENTS(s_aValuesLd), s_aValuesLd },
-        {  bs3CpuInstr3_vmovlpd_FSxBX_XMM1_icebp_c32,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt},
+        {  bs3CpuInstr3_vmovlpd_FSxBX_XMM1_icebp_c32,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt },
     };
     static BS3CPUINSTR3_TEST1_T const s_aTests64[] =
@@ -4233,10 +4233,10 @@
         {  bs3CpuInstr3_vmovlps_XMM1_XMM2_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM64, T_AVX_128,     1,   2, 255, RT_ELEMENTS(s_aValuesLd), s_aValuesLd },
         {  bs3CpuInstr3_vmovlps_XMM10_XMM14_FSxBX_icebp_c64,X86_XCPT_AC, RM_MEM64, T_AVX_128,    10,  14, 255, RT_ELEMENTS(s_aValuesLd), s_aValuesLd },
-        {  bs3CpuInstr3_vmovlps_FSxBX_XMM1_icebp_c64,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt},
-        {  bs3CpuInstr3_vmovlps_FSxBX_XMM9_icebp_c64,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   9, RT_ELEMENTS(s_aValuesSt), s_aValuesSt},
+        {  bs3CpuInstr3_vmovlps_FSxBX_XMM1_icebp_c64,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt },
+        {  bs3CpuInstr3_vmovlps_FSxBX_XMM9_icebp_c64,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   9, RT_ELEMENTS(s_aValuesSt), s_aValuesSt },
         {  bs3CpuInstr3_vmovlpd_XMM1_XMM2_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM64, T_AVX_128,     1,   2, 255, RT_ELEMENTS(s_aValuesLd), s_aValuesLd },
         {  bs3CpuInstr3_vmovlpd_XMM10_XMM14_FSxBX_icebp_c64,X86_XCPT_AC, RM_MEM64, T_AVX_128,    10,  14, 255, RT_ELEMENTS(s_aValuesLd), s_aValuesLd },
-        {  bs3CpuInstr3_vmovlpd_FSxBX_XMM1_icebp_c64,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt},
-        {  bs3CpuInstr3_vmovlpd_FSxBX_XMM9_icebp_c64,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   9, RT_ELEMENTS(s_aValuesSt), s_aValuesSt},
+        {  bs3CpuInstr3_vmovlpd_FSxBX_XMM1_icebp_c64,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt },
+        {  bs3CpuInstr3_vmovlpd_FSxBX_XMM9_icebp_c64,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   9, RT_ELEMENTS(s_aValuesSt), s_aValuesSt },
     };
     static BS3CPUINSTR3_TEST1_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST1_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -4295,7 +4295,7 @@
 
         {  bs3CpuInstr3_vmovhps_XMM1_XMM2_FSxBX_icebp_c16,  X86_XCPT_AC, RM_MEM64, T_AVX_128,     1,   2, 255, RT_ELEMENTS(s_aValuesLd), s_aValuesLd },
-        {  bs3CpuInstr3_vmovhps_FSxBX_XMM1_icebp_c16,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt},
+        {  bs3CpuInstr3_vmovhps_FSxBX_XMM1_icebp_c16,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt },
         {  bs3CpuInstr3_vmovhpd_XMM1_XMM2_FSxBX_icebp_c16,  X86_XCPT_AC, RM_MEM64, T_AVX_128,     1,   2, 255, RT_ELEMENTS(s_aValuesLd), s_aValuesLd },
-        {  bs3CpuInstr3_vmovhpd_FSxBX_XMM1_icebp_c16,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt},
+        {  bs3CpuInstr3_vmovhpd_FSxBX_XMM1_icebp_c16,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt },
     };
     static BS3CPUINSTR3_TEST1_T const s_aTests32[] =
@@ -4307,7 +4307,7 @@
 
         {  bs3CpuInstr3_vmovhps_XMM1_XMM2_FSxBX_icebp_c32,  X86_XCPT_AC, RM_MEM64, T_AVX_128,     1,   2, 255, RT_ELEMENTS(s_aValuesLd), s_aValuesLd },
-        {  bs3CpuInstr3_vmovhps_FSxBX_XMM1_icebp_c32,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt},
+        {  bs3CpuInstr3_vmovhps_FSxBX_XMM1_icebp_c32,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt },
         {  bs3CpuInstr3_vmovhpd_XMM1_XMM2_FSxBX_icebp_c32,  X86_XCPT_AC, RM_MEM64, T_AVX_128,     1,   2, 255, RT_ELEMENTS(s_aValuesLd), s_aValuesLd },
-        {  bs3CpuInstr3_vmovhpd_FSxBX_XMM1_icebp_c32,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt},
+        {  bs3CpuInstr3_vmovhpd_FSxBX_XMM1_icebp_c32,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt },
     };
     static BS3CPUINSTR3_TEST1_T const s_aTests64[] =
@@ -4324,10 +4324,10 @@
         {  bs3CpuInstr3_vmovhps_XMM1_XMM2_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM64, T_AVX_128,     1,   2, 255, RT_ELEMENTS(s_aValuesLd), s_aValuesLd },
         {  bs3CpuInstr3_vmovhps_XMM10_XMM14_FSxBX_icebp_c64,X86_XCPT_AC, RM_MEM64, T_AVX_128,    10,  14, 255, RT_ELEMENTS(s_aValuesLd), s_aValuesLd },
-        {  bs3CpuInstr3_vmovhps_FSxBX_XMM1_icebp_c64,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt},
-        {  bs3CpuInstr3_vmovhps_FSxBX_XMM9_icebp_c64,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   9, RT_ELEMENTS(s_aValuesSt), s_aValuesSt},
+        {  bs3CpuInstr3_vmovhps_FSxBX_XMM1_icebp_c64,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt },
+        {  bs3CpuInstr3_vmovhps_FSxBX_XMM9_icebp_c64,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   9, RT_ELEMENTS(s_aValuesSt), s_aValuesSt },
         {  bs3CpuInstr3_vmovhpd_XMM1_XMM2_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM64, T_AVX_128,     1,   2, 255, RT_ELEMENTS(s_aValuesLd), s_aValuesLd },
         {  bs3CpuInstr3_vmovhpd_XMM10_XMM14_FSxBX_icebp_c64,X86_XCPT_AC, RM_MEM64, T_AVX_128,    10,  14, 255, RT_ELEMENTS(s_aValuesLd), s_aValuesLd },
-        {  bs3CpuInstr3_vmovhpd_FSxBX_XMM1_icebp_c64,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt},
-        {  bs3CpuInstr3_vmovhpd_FSxBX_XMM9_icebp_c64,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   9, RT_ELEMENTS(s_aValuesSt), s_aValuesSt},
+        {  bs3CpuInstr3_vmovhpd_FSxBX_XMM1_icebp_c64,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   1, RT_ELEMENTS(s_aValuesSt), s_aValuesSt },
+        {  bs3CpuInstr3_vmovhpd_FSxBX_XMM9_icebp_c64,       X86_XCPT_AC, RM_MEM64, T_AVX_128,   255, 128,   9, RT_ELEMENTS(s_aValuesSt), s_aValuesSt },
     };
     static BS3CPUINSTR3_TEST1_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST1_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -10608,5 +10608,5 @@
 
 /**
- * Test type #1 worker.
+ * Test type #3 worker.
  */
 static uint8_t bs3CpuInstr3_WorkerTestType3(uint8_t bMode, BS3CPUINSTR3_TEST3_T const BS3_FAR *paTests, unsigned cTests,
@@ -10621,4 +10621,5 @@
     PBS3EXTCTX                  pExtCtxOut;
     PBS3EXTCTX                  pExtCtx = bs3CpuInstr3AllocExtCtxs(&pExtCtxOut);
+    BS3SETREGCTX                pSetRegCtx;
     if (!pExtCtx)
         return 0;
@@ -10634,4 +10635,8 @@
     bs3CpuInstr3SetupSseAndAvx(&Ctx, pExtCtx);
     pbBuf = bs3CpuInstr3BufSetup(pbBuf, &cbBuf, bMode);
+
+    pSetRegCtx.pExtCtx = pExtCtx;
+    pSetRegCtx.pCtx = &Ctx;
+    pSetRegCtx.bMode = bMode;
 
     /*
@@ -10663,4 +10668,5 @@
                     bool const      fSseInstr   = paTests[iTest].enmType >= T_SSE && paTests[iTest].enmType < T_AVX_128;
                     bool const      fAvxInstr   = paTests[iTest].enmType >= T_AVX_128;
+                    bool const      fMemOp      = paTests[iTest].enmRm >= RM_MEM;
                     uint8_t const   cbOperand   = paTests[iTest].enmType < T_128BITS ? 64/8
                                                 : paTests[iTest].enmType < T_256BITS ? 128/8 : 256/8;
@@ -10683,4 +10689,9 @@
                         continue;
 
+                    BS3_ASSERT(!fMemOp || BS3_REGISTER_IS_MEMREF(paTests[iTest].iRegDst) || BS3_REGISTER_IS_MEMREF(paTests[iTest].iRegSrc));
+                    BS3_ASSERT(!(BS3_REGISTER_IS_MEMREF(paTests[iTest].iRegDst) && BS3_REGISTER_IS_MEMREF(paTests[iTest].iRegSrc)));
+
+                    pSetRegCtx.fZeroYMMHi = fSseInstr;
+
                     /* #AC is only raised in ring-3.: */
                     if (bXcptExpect == X86_XCPT_AC)
@@ -10713,7 +10724,6 @@
                              */
                             /* dest */
-                            if (paTests[iTest].iRegDst == UINT8_MAX)
+                            if (BS3_REGISTER_IS_MEMREF(paTests[iTest].iRegDst))
                             {
-                                BS3_ASSERT(paTests[iTest].enmRm >= RM_MEM);
                                 Bs3MemSet(puMemOpAlias, 0xcc, cbMemOp);
                                 if (bXcptExpect == X86_XCPT_DB)
@@ -10723,28 +10733,21 @@
                             }
                             else if (fMmxInstr)
-                                Bs3ExtCtxSetMm(pExtCtx, paTests[iTest].iRegSrc, ~paValues[iVal].uDstOut.QWords.qw0, BS3EXTCTXTOPMM_ZERO);
+                            {
+                                uint64_t uInverted = ~paValues[iVal].uDstOut.QWords.qw0;
+                                Bs3ExtCtxSetReg(&pSetRegCtx, paTests[iTest].iRegSrc, (PCRTUINT256U)&uInverted);
+                            }
 
                             /* source */
-                            if (paTests[iTest].iRegSrc == UINT8_MAX)
+                            if (BS3_REGISTER_IS_MEMREF(paTests[iTest].iRegSrc))
                             {
-                                BS3_ASSERT(paTests[iTest].enmRm >= RM_MEM);
-                                BS3_ASSERT(paTests[iTest].iRegDst != UINT8_MAX);
                                 Bs3MemCpy(puMemOpAlias, &paValues[iVal].uSrc, cbMemOp);
                                 uMemOpExpect = paValues[iVal].uSrc;
                             }
-                            else if (fMmxInstr)
-                                Bs3ExtCtxSetMm(pExtCtx, paTests[iTest].iRegSrc, paValues[iVal].uSrc.QWords.qw0, BS3EXTCTXTOPMM_ZERO);
-                            else if (fSseInstr)
-                                Bs3ExtCtxSetXmm(pExtCtx, paTests[iTest].iRegSrc, &paValues[iVal].uSrc.DQWords.dqw0);
                             else
-                                Bs3ExtCtxSetYmm(pExtCtx, paTests[iTest].iRegSrc, &paValues[iVal].uSrc, 32);
+                                Bs3ExtCtxSetReg(&pSetRegCtx, paTests[iTest].iRegSrc, &paValues[iVal].uSrc);
 
                             /* Memory pointer. */
-                            if (paTests[iTest].enmRm >= RM_MEM)
-                            {
-                                BS3_ASSERT(   paTests[iTest].iRegDst == UINT8_MAX
-                                           || paTests[iTest].iRegSrc == UINT8_MAX);
+                            if (fMemOp)
                                 Bs3RegCtxSetGrpSegFromCurPtr(&Ctx, &Ctx.rbx, &Ctx.fs, puMemOp);
-                            }
 
                             /*
@@ -10764,13 +10767,6 @@
                                 Bs3ExtCtxSetAbridgedFtw(pExtCtx, 0xff);
                             }
-                            if (bXcptExpect == X86_XCPT_DB && paTests[iTest].iRegDst != UINT8_MAX)
-                            {
-                                if (fMmxInstr)
-                                    Bs3ExtCtxSetMm(pExtCtx, paTests[iTest].iRegDst, paValues[iVal].uDstOut.QWords.qw0, BS3EXTCTXTOPMM_SET);
-                                else if (fSseInstr)
-                                    Bs3ExtCtxSetXmm(pExtCtx, paTests[iTest].iRegDst, &paValues[iVal].uDstOut.DQWords.dqw0);
-                                else
-                                    Bs3ExtCtxSetYmm(pExtCtx, paTests[iTest].iRegDst, &paValues[iVal].uDstOut, cbOperand);
-                            }
+                            if (bXcptExpect == X86_XCPT_DB && !BS3_REGISTER_IS_MEMREF(paTests[iTest].iRegDst))
+                                Bs3ExtCtxSetReg(&pSetRegCtx, paTests[iTest].iRegDst, &paValues[iVal].uDstOut);
 
                             Bs3TestCheckExtCtx(pExtCtxOut, pExtCtx, 0 /*fFlags*/, pszMode, idTestStep);
@@ -10793,5 +10789,5 @@
                             Ctx.cr2.u = 0;
 
-                            if (   paTests[iTest].enmRm >= RM_MEM
+                            if (   fMemOp
                                 && Bs3MemCmp(puMemOpAlias, &uMemOpExpect, cbMemOp) != 0)
                                 Bs3TestFailedF("Expected uMemOp %.*Rhxs, got %.*Rhxs", cbMemOp, &uMemOpExpect, cbMemOp, puMemOpAlias);
@@ -10866,22 +10862,22 @@
     static BS3CPUINSTR3_TEST3_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_pshufw_MM1_MM2_0FFh_icebp_c16,   255, RM_REG, T_AXMMX_OR_SSE, 1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshufw_MM1_FSxBX_0FFh_icebp_c16, 255, RM_MEM, T_AXMMX_OR_SSE, 1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshufw_MM1_MM2_01Bh_icebp_c16,   255, RM_REG, T_AXMMX_OR_SSE, 1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_pshufw_MM1_FSxBX_01Bh_icebp_c16, 255, RM_MEM, T_AXMMX_OR_SSE, 1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshufw_MM1_MM2_0FFh_icebp_c16,   255, RM_REG, T_AXMMX_OR_SSE, MM1, MM2,   RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshufw_MM1_FSxBX_0FFh_icebp_c16, 255, RM_MEM, T_AXMMX_OR_SSE, MM1, FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshufw_MM1_MM2_01Bh_icebp_c16,   255, RM_REG, T_AXMMX_OR_SSE, MM1, MM2,   RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshufw_MM1_FSxBX_01Bh_icebp_c16, 255, RM_MEM, T_AXMMX_OR_SSE, MM1, FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_pshufw_MM1_MM2_0FFh_icebp_c32,   255, RM_REG, T_AXMMX_OR_SSE, 1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshufw_MM1_FSxBX_0FFh_icebp_c32, 255, RM_MEM, T_AXMMX_OR_SSE, 1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshufw_MM1_MM2_01Bh_icebp_c32,   255, RM_REG, T_AXMMX_OR_SSE, 1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_pshufw_MM1_FSxBX_01Bh_icebp_c32, 255, RM_MEM, T_AXMMX_OR_SSE, 1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshufw_MM1_MM2_0FFh_icebp_c32,   255, RM_REG, T_AXMMX_OR_SSE, MM1, MM2,   RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshufw_MM1_FSxBX_0FFh_icebp_c32, 255, RM_MEM, T_AXMMX_OR_SSE, MM1, FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshufw_MM1_MM2_01Bh_icebp_c32,   255, RM_REG, T_AXMMX_OR_SSE, MM1, MM2,   RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshufw_MM1_FSxBX_01Bh_icebp_c32, 255, RM_MEM, T_AXMMX_OR_SSE, MM1, FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_pshufw_MM1_MM2_0FFh_icebp_c64,   255, RM_REG, T_AXMMX_OR_SSE, 1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshufw_MM1_FSxBX_0FFh_icebp_c64, 255, RM_MEM, T_AXMMX_OR_SSE, 1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshufw_MM1_MM2_01Bh_icebp_c64,   255, RM_REG, T_AXMMX_OR_SSE, 1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_pshufw_MM1_FSxBX_01Bh_icebp_c64, 255, RM_MEM, T_AXMMX_OR_SSE, 1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshufw_MM1_MM2_0FFh_icebp_c64,   255, RM_REG, T_AXMMX_OR_SSE, MM1, MM2,   RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshufw_MM1_FSxBX_0FFh_icebp_c64, 255, RM_MEM, T_AXMMX_OR_SSE, MM1, FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshufw_MM1_MM2_01Bh_icebp_c64,   255, RM_REG, T_AXMMX_OR_SSE, MM1, MM2,   RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshufw_MM1_FSxBX_01Bh_icebp_c64, 255, RM_MEM, T_AXMMX_OR_SSE, MM1, FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
     };
     static BS3CPUINSTR3_TEST3_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST3_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -10923,54 +10919,54 @@
     static BS3CPUINSTR3_TEST3_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_pshufhw_XMM1_XMM2_0FFh_icebp_c16,   255,         RM_REG, T_SSE2,     1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshufhw_XMM1_FSxBX_0FFh_icebp_c16,  255,         RM_MEM, T_SSE2,     1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshufhw_XMM1_XMM2_01Bh_icebp_c16,   255,         RM_REG, T_SSE2,     1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_pshufhw_XMM1_FSxBX_01Bh_icebp_c16,  255,         RM_MEM, T_SSE2,     1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-
-        {  bs3CpuInstr3_vpshufhw_XMM1_XMM2_0FFh_icebp_c16,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufhw_XMM1_FSxBX_0FFh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufhw_XMM1_XMM2_01Bh_icebp_c16,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_vpshufhw_XMM1_FSxBX_01Bh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-
-        {  bs3CpuInstr3_vpshufhw_YMM1_YMM2_0FFh_icebp_c16,  255,         RM_REG, T_AVX2_256, 1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufhw_YMM1_FSxBX_0FFh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX2_256, 1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufhw_YMM1_YMM2_01Bh_icebp_c16,  255,         RM_REG, T_AVX2_256, 1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_vpshufhw_YMM1_FSxBX_01Bh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX2_256, 1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshufhw_XMM1_XMM2_0FFh_icebp_c16,   255,         RM_REG, T_SSE2,     XMM1,  XMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshufhw_XMM1_FSxBX_0FFh_icebp_c16,  255,         RM_MEM, T_SSE2,     XMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshufhw_XMM1_XMM2_01Bh_icebp_c16,   255,         RM_REG, T_SSE2,     XMM1,  XMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshufhw_XMM1_FSxBX_01Bh_icebp_c16,  255,         RM_MEM, T_SSE2,     XMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+
+        {  bs3CpuInstr3_vpshufhw_XMM1_XMM2_0FFh_icebp_c16,  255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufhw_XMM1_FSxBX_0FFh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufhw_XMM1_XMM2_01Bh_icebp_c16,  255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_vpshufhw_XMM1_FSxBX_01Bh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+
+        {  bs3CpuInstr3_vpshufhw_YMM1_YMM2_0FFh_icebp_c16,  255,         RM_REG, T_AVX2_256, YMM1,  YMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufhw_YMM1_FSxBX_0FFh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufhw_YMM1_YMM2_01Bh_icebp_c16,  255,         RM_REG, T_AVX2_256, YMM1,  YMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_vpshufhw_YMM1_FSxBX_01Bh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_pshufhw_XMM1_XMM2_0FFh_icebp_c32,   255,         RM_REG, T_SSE2,     1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshufhw_XMM1_FSxBX_0FFh_icebp_c32,  255,         RM_MEM, T_SSE2,     1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshufhw_XMM1_XMM2_01Bh_icebp_c32,   255,         RM_REG, T_SSE2,     1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_pshufhw_XMM1_FSxBX_01Bh_icebp_c32,  255,         RM_MEM, T_SSE2,     1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-
-        {  bs3CpuInstr3_vpshufhw_XMM1_XMM2_0FFh_icebp_c32,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufhw_XMM1_FSxBX_0FFh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufhw_XMM1_XMM2_01Bh_icebp_c32,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_vpshufhw_XMM1_FSxBX_01Bh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-
-        {  bs3CpuInstr3_vpshufhw_YMM1_YMM2_0FFh_icebp_c32,  255,         RM_REG, T_AVX2_256, 1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufhw_YMM1_FSxBX_0FFh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX2_256, 1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufhw_YMM1_YMM2_01Bh_icebp_c32,  255,         RM_REG, T_AVX2_256, 1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_vpshufhw_YMM1_FSxBX_01Bh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX2_256, 1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshufhw_XMM1_XMM2_0FFh_icebp_c32,   255,         RM_REG, T_SSE2,     XMM1,  XMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshufhw_XMM1_FSxBX_0FFh_icebp_c32,  255,         RM_MEM, T_SSE2,     XMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshufhw_XMM1_XMM2_01Bh_icebp_c32,   255,         RM_REG, T_SSE2,     XMM1,  XMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshufhw_XMM1_FSxBX_01Bh_icebp_c32,  255,         RM_MEM, T_SSE2,     XMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+
+        {  bs3CpuInstr3_vpshufhw_XMM1_XMM2_0FFh_icebp_c32,  255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufhw_XMM1_FSxBX_0FFh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufhw_XMM1_XMM2_01Bh_icebp_c32,  255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_vpshufhw_XMM1_FSxBX_01Bh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+
+        {  bs3CpuInstr3_vpshufhw_YMM1_YMM2_0FFh_icebp_c32,  255,         RM_REG, T_AVX2_256, YMM1,  YMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufhw_YMM1_FSxBX_0FFh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufhw_YMM1_YMM2_01Bh_icebp_c32,  255,         RM_REG, T_AVX2_256, YMM1,  YMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_vpshufhw_YMM1_FSxBX_01Bh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_pshufhw_XMM1_XMM2_0FFh_icebp_c64,   255,         RM_REG, T_SSE2,     1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshufhw_XMM1_FSxBX_0FFh_icebp_c64,  255,         RM_MEM, T_SSE2,     1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshufhw_XMM1_XMM2_01Bh_icebp_c64,   255,         RM_REG, T_SSE2,     1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_pshufhw_XMM1_FSxBX_01Bh_icebp_c64,  255,         RM_MEM, T_SSE2,     1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-
-        {  bs3CpuInstr3_vpshufhw_XMM1_XMM2_0FFh_icebp_c64,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufhw_XMM1_FSxBX_0FFh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufhw_XMM1_XMM2_01Bh_icebp_c64,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_vpshufhw_XMM1_FSxBX_01Bh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-
-        {  bs3CpuInstr3_vpshufhw_YMM1_YMM2_0FFh_icebp_c64,  255,         RM_REG, T_AVX2_256, 1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufhw_YMM1_FSxBX_0FFh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_256, 1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufhw_YMM1_YMM2_01Bh_icebp_c64,  255,         RM_REG, T_AVX2_256, 1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_vpshufhw_YMM1_FSxBX_01Bh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_256, 1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_vpshufhw_YMM12_YMM7_0FFh_icebp_c64, 255,         RM_REG, T_AVX2_256, 12,  7, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufhw_YMM9_YMM12_01Bh_icebp_c64, 255,         RM_REG, T_AVX2_256, 9,  12, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshufhw_XMM1_XMM2_0FFh_icebp_c64,   255,         RM_REG, T_SSE2,     XMM1,  XMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshufhw_XMM1_FSxBX_0FFh_icebp_c64,  255,         RM_MEM, T_SSE2,     XMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshufhw_XMM1_XMM2_01Bh_icebp_c64,   255,         RM_REG, T_SSE2,     XMM1,  XMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshufhw_XMM1_FSxBX_01Bh_icebp_c64,  255,         RM_MEM, T_SSE2,     XMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+
+        {  bs3CpuInstr3_vpshufhw_XMM1_XMM2_0FFh_icebp_c64,  255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufhw_XMM1_FSxBX_0FFh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufhw_XMM1_XMM2_01Bh_icebp_c64,  255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_vpshufhw_XMM1_FSxBX_01Bh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+
+        {  bs3CpuInstr3_vpshufhw_YMM1_YMM2_0FFh_icebp_c64,  255,         RM_REG, T_AVX2_256, YMM1,  YMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufhw_YMM1_FSxBX_0FFh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufhw_YMM1_YMM2_01Bh_icebp_c64,  255,         RM_REG, T_AVX2_256, YMM1,  YMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_vpshufhw_YMM1_FSxBX_01Bh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_vpshufhw_YMM12_YMM7_0FFh_icebp_c64, 255,         RM_REG, T_AVX2_256, YMM12, YMM7,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufhw_YMM9_YMM12_01Bh_icebp_c64, 255,         RM_REG, T_AVX2_256, YMM9,  YMM12, RT_ELEMENTS(s_aValues1B), s_aValues1B },
     };
     static BS3CPUINSTR3_TEST3_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST3_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -11012,54 +11008,54 @@
     static BS3CPUINSTR3_TEST3_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_pshuflw_XMM1_XMM2_0FFh_icebp_c16,   255,         RM_REG, T_SSE2,     1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshuflw_XMM1_FSxBX_0FFh_icebp_c16,  255,         RM_MEM, T_SSE2,     1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshuflw_XMM1_XMM2_01Bh_icebp_c16,   255,         RM_REG, T_SSE2,     1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_pshuflw_XMM1_FSxBX_01Bh_icebp_c16,  255,         RM_MEM, T_SSE2,     1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-
-        {  bs3CpuInstr3_vpshuflw_XMM1_XMM2_0FFh_icebp_c16,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshuflw_XMM1_FSxBX_0FFh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshuflw_XMM1_XMM2_01Bh_icebp_c16,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_vpshuflw_XMM1_FSxBX_01Bh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-
-        {  bs3CpuInstr3_vpshuflw_YMM1_YMM2_0FFh_icebp_c16,  255,         RM_REG, T_AVX2_256, 1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshuflw_YMM1_FSxBX_0FFh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX2_256, 1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshuflw_YMM1_YMM2_01Bh_icebp_c16,  255,         RM_REG, T_AVX2_256, 1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_vpshuflw_YMM1_FSxBX_01Bh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX2_256, 1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshuflw_XMM1_XMM2_0FFh_icebp_c16,   255,         RM_REG, T_SSE2,     XMM1,  XMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshuflw_XMM1_FSxBX_0FFh_icebp_c16,  255,         RM_MEM, T_SSE2,     XMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshuflw_XMM1_XMM2_01Bh_icebp_c16,   255,         RM_REG, T_SSE2,     XMM1,  XMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshuflw_XMM1_FSxBX_01Bh_icebp_c16,  255,         RM_MEM, T_SSE2,     XMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+
+        {  bs3CpuInstr3_vpshuflw_XMM1_XMM2_0FFh_icebp_c16,  255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshuflw_XMM1_FSxBX_0FFh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshuflw_XMM1_XMM2_01Bh_icebp_c16,  255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_vpshuflw_XMM1_FSxBX_01Bh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+
+        {  bs3CpuInstr3_vpshuflw_YMM1_YMM2_0FFh_icebp_c16,  255,         RM_REG, T_AVX2_256, YMM1,  YMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshuflw_YMM1_FSxBX_0FFh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshuflw_YMM1_YMM2_01Bh_icebp_c16,  255,         RM_REG, T_AVX2_256, YMM1,  YMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_vpshuflw_YMM1_FSxBX_01Bh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_pshuflw_XMM1_XMM2_0FFh_icebp_c32,   255,         RM_REG, T_SSE2,     1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshuflw_XMM1_FSxBX_0FFh_icebp_c32,  255,         RM_MEM, T_SSE2,     1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshuflw_XMM1_XMM2_01Bh_icebp_c32,   255,         RM_REG, T_SSE2,     1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_pshuflw_XMM1_FSxBX_01Bh_icebp_c32,  255,         RM_MEM, T_SSE2,     1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-
-        {  bs3CpuInstr3_vpshuflw_XMM1_XMM2_0FFh_icebp_c32,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshuflw_XMM1_FSxBX_0FFh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshuflw_XMM1_XMM2_01Bh_icebp_c32,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_vpshuflw_XMM1_FSxBX_01Bh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-
-        {  bs3CpuInstr3_vpshuflw_YMM1_YMM2_0FFh_icebp_c32,  255,         RM_REG, T_AVX2_256, 1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshuflw_YMM1_FSxBX_0FFh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX2_256, 1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshuflw_YMM1_YMM2_01Bh_icebp_c32,  255,         RM_REG, T_AVX2_256, 1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_vpshuflw_YMM1_FSxBX_01Bh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX2_256, 1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshuflw_XMM1_XMM2_0FFh_icebp_c32,   255,         RM_REG, T_SSE2,     XMM1,  XMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshuflw_XMM1_FSxBX_0FFh_icebp_c32,  255,         RM_MEM, T_SSE2,     XMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshuflw_XMM1_XMM2_01Bh_icebp_c32,   255,         RM_REG, T_SSE2,     XMM1,  XMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshuflw_XMM1_FSxBX_01Bh_icebp_c32,  255,         RM_MEM, T_SSE2,     XMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+
+        {  bs3CpuInstr3_vpshuflw_XMM1_XMM2_0FFh_icebp_c32,  255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshuflw_XMM1_FSxBX_0FFh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshuflw_XMM1_XMM2_01Bh_icebp_c32,  255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_vpshuflw_XMM1_FSxBX_01Bh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+
+        {  bs3CpuInstr3_vpshuflw_YMM1_YMM2_0FFh_icebp_c32,  255,         RM_REG, T_AVX2_256, YMM1,  YMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshuflw_YMM1_FSxBX_0FFh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshuflw_YMM1_YMM2_01Bh_icebp_c32,  255,         RM_REG, T_AVX2_256, YMM1,  YMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_vpshuflw_YMM1_FSxBX_01Bh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_pshuflw_XMM1_XMM2_0FFh_icebp_c64,   255,         RM_REG, T_SSE2,     1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshuflw_XMM1_FSxBX_0FFh_icebp_c64,  255,         RM_MEM, T_SSE2,     1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshuflw_XMM1_XMM2_01Bh_icebp_c64,   255,         RM_REG, T_SSE2,     1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_pshuflw_XMM1_FSxBX_01Bh_icebp_c64,  255,         RM_MEM, T_SSE2,     1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-
-        {  bs3CpuInstr3_vpshuflw_XMM1_XMM2_0FFh_icebp_c64,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshuflw_XMM1_FSxBX_0FFh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshuflw_XMM1_XMM2_01Bh_icebp_c64,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_vpshuflw_XMM1_FSxBX_01Bh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-
-        {  bs3CpuInstr3_vpshuflw_YMM1_YMM2_0FFh_icebp_c64,  255,         RM_REG, T_AVX2_256, 1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshuflw_YMM1_FSxBX_0FFh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_256, 1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshuflw_YMM1_YMM2_01Bh_icebp_c64,  255,         RM_REG, T_AVX2_256, 1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_vpshuflw_YMM1_FSxBX_01Bh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_256, 1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_vpshuflw_YMM12_YMM7_0FFh_icebp_c64, 255,         RM_REG, T_AVX2_256, 12,  7, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshuflw_YMM9_YMM12_01Bh_icebp_c64, 255,         RM_REG, T_AVX2_256, 9,  12, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshuflw_XMM1_XMM2_0FFh_icebp_c64,   255,         RM_REG, T_SSE2,     XMM1,  XMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshuflw_XMM1_FSxBX_0FFh_icebp_c64,  255,         RM_MEM, T_SSE2,     XMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshuflw_XMM1_XMM2_01Bh_icebp_c64,   255,         RM_REG, T_SSE2,     XMM1,  XMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshuflw_XMM1_FSxBX_01Bh_icebp_c64,  255,         RM_MEM, T_SSE2,     XMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+
+        {  bs3CpuInstr3_vpshuflw_XMM1_XMM2_0FFh_icebp_c64,  255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshuflw_XMM1_FSxBX_0FFh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshuflw_XMM1_XMM2_01Bh_icebp_c64,  255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_vpshuflw_XMM1_FSxBX_01Bh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+
+        {  bs3CpuInstr3_vpshuflw_YMM1_YMM2_0FFh_icebp_c64,  255,         RM_REG, T_AVX2_256, YMM1,  YMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshuflw_YMM1_FSxBX_0FFh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshuflw_YMM1_YMM2_01Bh_icebp_c64,  255,         RM_REG, T_AVX2_256, YMM1,  YMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_vpshuflw_YMM1_FSxBX_01Bh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_vpshuflw_YMM12_YMM7_0FFh_icebp_c64, 255,         RM_REG, T_AVX2_256, YMM12, YMM7,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshuflw_YMM9_YMM12_01Bh_icebp_c64, 255,         RM_REG, T_AVX2_256, YMM9,  YMM12, RT_ELEMENTS(s_aValues1B), s_aValues1B },
     };
     static BS3CPUINSTR3_TEST3_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST3_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -11101,54 +11097,54 @@
     static BS3CPUINSTR3_TEST3_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_pshufd_XMM1_XMM2_0FFh_icebp_c16,   255,         RM_REG, T_SSE2,     1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshufd_XMM1_FSxBX_0FFh_icebp_c16,  255,         RM_MEM, T_SSE2,     1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshufd_XMM1_XMM2_01Bh_icebp_c16,   255,         RM_REG, T_SSE2,     1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_pshufd_XMM1_FSxBX_01Bh_icebp_c16,  255,         RM_MEM, T_SSE2,     1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-
-        {  bs3CpuInstr3_vpshufd_XMM1_XMM2_0FFh_icebp_c16,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufd_XMM1_FSxBX_0FFh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufd_XMM1_XMM2_01Bh_icebp_c16,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_vpshufd_XMM1_FSxBX_01Bh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-
-        {  bs3CpuInstr3_vpshufd_YMM1_YMM2_0FFh_icebp_c16,  255,         RM_REG, T_AVX2_256, 1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufd_YMM1_FSxBX_0FFh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX2_256, 1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufd_YMM1_YMM2_01Bh_icebp_c16,  255,         RM_REG, T_AVX2_256, 1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_vpshufd_YMM1_FSxBX_01Bh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX2_256, 1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshufd_XMM1_XMM2_0FFh_icebp_c16,   255,         RM_REG, T_SSE2,     XMM1,  XMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshufd_XMM1_FSxBX_0FFh_icebp_c16,  255,         RM_MEM, T_SSE2,     XMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshufd_XMM1_XMM2_01Bh_icebp_c16,   255,         RM_REG, T_SSE2,     XMM1,  XMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshufd_XMM1_FSxBX_01Bh_icebp_c16,  255,         RM_MEM, T_SSE2,     XMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+
+        {  bs3CpuInstr3_vpshufd_XMM1_XMM2_0FFh_icebp_c16,  255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufd_XMM1_FSxBX_0FFh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufd_XMM1_XMM2_01Bh_icebp_c16,  255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_vpshufd_XMM1_FSxBX_01Bh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+
+        {  bs3CpuInstr3_vpshufd_YMM1_YMM2_0FFh_icebp_c16,  255,         RM_REG, T_AVX2_256, YMM1,  YMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufd_YMM1_FSxBX_0FFh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufd_YMM1_YMM2_01Bh_icebp_c16,  255,         RM_REG, T_AVX2_256, YMM1,  YMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_vpshufd_YMM1_FSxBX_01Bh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_pshufd_XMM1_XMM2_0FFh_icebp_c32,   255,         RM_REG, T_SSE2,     1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshufd_XMM1_FSxBX_0FFh_icebp_c32,  255,         RM_MEM, T_SSE2,     1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshufd_XMM1_XMM2_01Bh_icebp_c32,   255,         RM_REG, T_SSE2,     1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_pshufd_XMM1_FSxBX_01Bh_icebp_c32,  255,         RM_MEM, T_SSE2,     1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-
-        {  bs3CpuInstr3_vpshufd_XMM1_XMM2_0FFh_icebp_c32,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufd_XMM1_FSxBX_0FFh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufd_XMM1_XMM2_01Bh_icebp_c32,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_vpshufd_XMM1_FSxBX_01Bh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-
-        {  bs3CpuInstr3_vpshufd_YMM1_YMM2_0FFh_icebp_c32,  255,         RM_REG, T_AVX2_256, 1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufd_YMM1_FSxBX_0FFh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX2_256, 1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufd_YMM1_YMM2_01Bh_icebp_c32,  255,         RM_REG, T_AVX2_256, 1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_vpshufd_YMM1_FSxBX_01Bh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX2_256, 1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshufd_XMM1_XMM2_0FFh_icebp_c32,   255,         RM_REG, T_SSE2,     XMM1,  XMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshufd_XMM1_FSxBX_0FFh_icebp_c32,  255,         RM_MEM, T_SSE2,     XMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshufd_XMM1_XMM2_01Bh_icebp_c32,   255,         RM_REG, T_SSE2,     XMM1,  XMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshufd_XMM1_FSxBX_01Bh_icebp_c32,  255,         RM_MEM, T_SSE2,     XMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+
+        {  bs3CpuInstr3_vpshufd_XMM1_XMM2_0FFh_icebp_c32,  255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufd_XMM1_FSxBX_0FFh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufd_XMM1_XMM2_01Bh_icebp_c32,  255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_vpshufd_XMM1_FSxBX_01Bh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+
+        {  bs3CpuInstr3_vpshufd_YMM1_YMM2_0FFh_icebp_c32,  255,         RM_REG, T_AVX2_256, YMM1,  YMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufd_YMM1_FSxBX_0FFh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufd_YMM1_YMM2_01Bh_icebp_c32,  255,         RM_REG, T_AVX2_256, YMM1,  YMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_vpshufd_YMM1_FSxBX_01Bh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_pshufd_XMM1_XMM2_0FFh_icebp_c64,   255,         RM_REG, T_SSE2,     1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshufd_XMM1_FSxBX_0FFh_icebp_c64,  255,         RM_MEM, T_SSE2,     1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_pshufd_XMM1_XMM2_01Bh_icebp_c64,   255,         RM_REG, T_SSE2,     1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_pshufd_XMM1_FSxBX_01Bh_icebp_c64,  255,         RM_MEM, T_SSE2,     1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-
-        {  bs3CpuInstr3_vpshufd_XMM1_XMM2_0FFh_icebp_c64,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufd_XMM1_FSxBX_0FFh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufd_XMM1_XMM2_01Bh_icebp_c64,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_vpshufd_XMM1_FSxBX_01Bh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-
-        {  bs3CpuInstr3_vpshufd_YMM1_YMM2_0FFh_icebp_c64,  255,         RM_REG, T_AVX2_256, 1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufd_YMM1_FSxBX_0FFh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_256, 1, 255, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufd_YMM1_YMM2_01Bh_icebp_c64,  255,         RM_REG, T_AVX2_256, 1,   2, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_vpshufd_YMM1_FSxBX_01Bh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_256, 1, 255, RT_ELEMENTS(s_aValues1B), s_aValues1B },
-        {  bs3CpuInstr3_vpshufd_YMM12_YMM7_0FFh_icebp_c64, 255,         RM_REG, T_AVX2_256, 12,  7, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vpshufd_YMM9_YMM12_01Bh_icebp_c64, 255,         RM_REG, T_AVX2_256, 9,  12, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshufd_XMM1_XMM2_0FFh_icebp_c64,   255,         RM_REG, T_SSE2,     XMM1,  XMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshufd_XMM1_FSxBX_0FFh_icebp_c64,  255,         RM_MEM, T_SSE2,     XMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_pshufd_XMM1_XMM2_01Bh_icebp_c64,   255,         RM_REG, T_SSE2,     XMM1,  XMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_pshufd_XMM1_FSxBX_01Bh_icebp_c64,  255,         RM_MEM, T_SSE2,     XMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+
+        {  bs3CpuInstr3_vpshufd_XMM1_XMM2_0FFh_icebp_c64,  255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufd_XMM1_FSxBX_0FFh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufd_XMM1_XMM2_01Bh_icebp_c64,  255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_vpshufd_XMM1_FSxBX_01Bh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+
+        {  bs3CpuInstr3_vpshufd_YMM1_YMM2_0FFh_icebp_c64,  255,         RM_REG, T_AVX2_256, YMM1,  YMM2,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufd_YMM1_FSxBX_0FFh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1,  FSxBX, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufd_YMM1_YMM2_01Bh_icebp_c64,  255,         RM_REG, T_AVX2_256, YMM1,  YMM2,  RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_vpshufd_YMM1_FSxBX_01Bh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1,  FSxBX, RT_ELEMENTS(s_aValues1B), s_aValues1B },
+        {  bs3CpuInstr3_vpshufd_YMM12_YMM7_0FFh_icebp_c64, 255,         RM_REG, T_AVX2_256, YMM12, YMM7,  RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vpshufd_YMM9_YMM12_01Bh_icebp_c64, 255,         RM_REG, T_AVX2_256, YMM9,  YMM12, RT_ELEMENTS(s_aValues1B), s_aValues1B },
     };
     static BS3CPUINSTR3_TEST3_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST3_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -11182,22 +11178,22 @@
     static BS3CPUINSTR3_TEST3_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_movntdqa_XMM1_FSxBX_icebp_c16,   X86_XCPT_GP, RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntdqa_XMM1_FSxBX_icebp_c16,  X86_XCPT_GP, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntdqa_YMM1_FSxBX_icebp_c16,  X86_XCPT_GP, RM_MEM, T_AVX2_256,  1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movntdqa_XMM1_FSxBX_icebp_c16,   X86_XCPT_GP, RM_MEM, T_SSE4_1,   XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntdqa_XMM1_FSxBX_icebp_c16,  X86_XCPT_GP, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntdqa_YMM1_FSxBX_icebp_c16,  X86_XCPT_GP, RM_MEM, T_AVX2_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_movntdqa_XMM1_FSxBX_icebp_c32,   X86_XCPT_GP, RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntdqa_XMM1_FSxBX_icebp_c32,  X86_XCPT_GP, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntdqa_YMM1_FSxBX_icebp_c32,  X86_XCPT_GP, RM_MEM, T_AVX2_256,  1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movntdqa_XMM1_FSxBX_icebp_c32,   X86_XCPT_GP, RM_MEM, T_SSE4_1,   XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntdqa_XMM1_FSxBX_icebp_c32,  X86_XCPT_GP, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntdqa_YMM1_FSxBX_icebp_c32,  X86_XCPT_GP, RM_MEM, T_AVX2_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_movntdqa_XMM1_FSxBX_icebp_c64,   X86_XCPT_GP, RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movntdqa_XMM10_FSxBX_icebp_c64,  X86_XCPT_GP, RM_MEM, T_SSE4_1,   10, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntdqa_XMM1_FSxBX_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntdqa_XMM11_FSxBX_icebp_c64, X86_XCPT_GP, RM_MEM, T_AVX_128,  11, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntdqa_YMM1_FSxBX_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX2_256,  1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntdqa_YMM12_FSxBX_icebp_c64, X86_XCPT_GP, RM_MEM, T_AVX2_256, 12, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movntdqa_XMM1_FSxBX_icebp_c64,   X86_XCPT_GP, RM_MEM, T_SSE4_1,   XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movntdqa_XMM10_FSxBX_icebp_c64,  X86_XCPT_GP, RM_MEM, T_SSE4_1,   XMM10, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntdqa_XMM1_FSxBX_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntdqa_XMM11_FSxBX_icebp_c64, X86_XCPT_GP, RM_MEM, T_AVX_128,  XMM11, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntdqa_YMM1_FSxBX_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX2_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntdqa_YMM12_FSxBX_icebp_c64, X86_XCPT_GP, RM_MEM, T_AVX2_256, YMM12, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST3_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -11215,22 +11211,22 @@
     static BS3CPUINSTR3_TEST3_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_movntdq_FSxBX_XMM1_icebp_c16,    X86_XCPT_GP, RM_MEM, T_SSE2,    255,  1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntdq_FSxBX_XMM1_icebp_c16,   X86_XCPT_GP, RM_MEM, T_AVX_128, 255,  1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntdq_FSxBX_YMM1_icebp_c16,   X86_XCPT_GP, RM_MEM, T_AVX_256, 255,  1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movntdq_FSxBX_XMM1_icebp_c16,    X86_XCPT_GP, RM_MEM, T_SSE2,    FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntdq_FSxBX_XMM1_icebp_c16,   X86_XCPT_GP, RM_MEM, T_AVX_128, FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntdq_FSxBX_YMM1_icebp_c16,   X86_XCPT_GP, RM_MEM, T_AVX_256, FSxBX, YMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_movntdq_FSxBX_XMM1_icebp_c32,    X86_XCPT_GP, RM_MEM, T_SSE2,    255,  1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntdq_FSxBX_XMM1_icebp_c32,   X86_XCPT_GP, RM_MEM, T_AVX_128, 255,  1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntdq_FSxBX_YMM1_icebp_c32,   X86_XCPT_GP, RM_MEM, T_AVX_256, 255,  1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movntdq_FSxBX_XMM1_icebp_c32,    X86_XCPT_GP, RM_MEM, T_SSE2,    FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntdq_FSxBX_XMM1_icebp_c32,   X86_XCPT_GP, RM_MEM, T_AVX_128, FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntdq_FSxBX_YMM1_icebp_c32,   X86_XCPT_GP, RM_MEM, T_AVX_256, FSxBX, YMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_movntdq_FSxBX_XMM1_icebp_c64,    X86_XCPT_GP, RM_MEM, T_SSE2,    255,  1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movntdq_FSxBX_XMM10_icebp_c64,   X86_XCPT_GP, RM_MEM, T_SSE2,    255, 10, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntdq_FSxBX_XMM1_icebp_c64,   X86_XCPT_GP, RM_MEM, T_AVX_128, 255,  1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntdq_FSxBX_XMM10_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX_128, 255, 10, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntdq_FSxBX_YMM1_icebp_c64,   X86_XCPT_GP, RM_MEM, T_AVX_256, 255,  1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntdq_FSxBX_YMM10_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX_256, 255, 10, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movntdq_FSxBX_XMM1_icebp_c64,    X86_XCPT_GP, RM_MEM, T_SSE2,    FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movntdq_FSxBX_XMM10_icebp_c64,   X86_XCPT_GP, RM_MEM, T_SSE2,    FSxBX, XMM10, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntdq_FSxBX_XMM1_icebp_c64,   X86_XCPT_GP, RM_MEM, T_AVX_128, FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntdq_FSxBX_XMM10_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX_128, FSxBX, XMM10, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntdq_FSxBX_YMM1_icebp_c64,   X86_XCPT_GP, RM_MEM, T_AVX_256, FSxBX, YMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntdq_FSxBX_YMM10_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX_256, FSxBX, YMM10, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST3_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -11249,37 +11245,37 @@
     static BS3CPUINSTR3_TEST3_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_movntps_FSxBX_XMM1_icebp_c16,   X86_XCPT_GP, RM_MEM, T_SSE,     255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntps_FSxBX_XMM1_icebp_c16,  X86_XCPT_GP, RM_MEM, T_AVX_128, 255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntps_FSxBX_YMM1_icebp_c16,  X86_XCPT_GP, RM_MEM, T_AVX_256, 255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_movntpd_FSxBX_XMM1_icebp_c16,   X86_XCPT_GP, RM_MEM, T_SSE,     255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntpd_FSxBX_XMM1_icebp_c16,  X86_XCPT_GP, RM_MEM, T_AVX_128, 255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntpd_FSxBX_YMM1_icebp_c16,  X86_XCPT_GP, RM_MEM, T_AVX_256, 255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movntps_FSxBX_XMM1_icebp_c16,   X86_XCPT_GP, RM_MEM, T_SSE,     FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntps_FSxBX_XMM1_icebp_c16,  X86_XCPT_GP, RM_MEM, T_AVX_128, FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntps_FSxBX_YMM1_icebp_c16,  X86_XCPT_GP, RM_MEM, T_AVX_256, FSxBX, YMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_movntpd_FSxBX_XMM1_icebp_c16,   X86_XCPT_GP, RM_MEM, T_SSE,     FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntpd_FSxBX_XMM1_icebp_c16,  X86_XCPT_GP, RM_MEM, T_AVX_128, FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntpd_FSxBX_YMM1_icebp_c16,  X86_XCPT_GP, RM_MEM, T_AVX_256, FSxBX, YMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_movntps_FSxBX_XMM1_icebp_c32,   X86_XCPT_GP, RM_MEM, T_SSE,     255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntps_FSxBX_XMM1_icebp_c32,  X86_XCPT_GP, RM_MEM, T_AVX_128, 255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntps_FSxBX_YMM1_icebp_c32,  X86_XCPT_GP, RM_MEM, T_AVX_256, 255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_movntpd_FSxBX_XMM1_icebp_c32,   X86_XCPT_GP, RM_MEM, T_SSE,     255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntpd_FSxBX_XMM1_icebp_c32,  X86_XCPT_GP, RM_MEM, T_AVX_128, 255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntpd_FSxBX_YMM1_icebp_c32,  X86_XCPT_GP, RM_MEM, T_AVX_256, 255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movntps_FSxBX_XMM1_icebp_c32,   X86_XCPT_GP, RM_MEM, T_SSE,     FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntps_FSxBX_XMM1_icebp_c32,  X86_XCPT_GP, RM_MEM, T_AVX_128, FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntps_FSxBX_YMM1_icebp_c32,  X86_XCPT_GP, RM_MEM, T_AVX_256, FSxBX, YMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_movntpd_FSxBX_XMM1_icebp_c32,   X86_XCPT_GP, RM_MEM, T_SSE,     FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntpd_FSxBX_XMM1_icebp_c32,  X86_XCPT_GP, RM_MEM, T_AVX_128, FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntpd_FSxBX_YMM1_icebp_c32,  X86_XCPT_GP, RM_MEM, T_AVX_256, FSxBX, YMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_movntps_FSxBX_XMM1_icebp_c64,   X86_XCPT_GP, RM_MEM, T_SSE,     255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movntps_FSxBX_XMM10_icebp_c64,  X86_XCPT_GP, RM_MEM, T_SSE,     255,  10, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntps_FSxBX_XMM1_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX_128, 255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntps_FSxBX_XMM11_icebp_c64, X86_XCPT_GP, RM_MEM, T_AVX_128, 255,  11, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntps_FSxBX_YMM1_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX_256, 255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntps_FSxBX_YMM12_icebp_c64, X86_XCPT_GP, RM_MEM, T_AVX_256, 255,  12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_movntpd_FSxBX_XMM1_icebp_c64,   X86_XCPT_GP, RM_MEM, T_SSE,     255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movntpd_FSxBX_XMM10_icebp_c64,  X86_XCPT_GP, RM_MEM, T_SSE,     255,  10, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntpd_FSxBX_XMM1_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX_128, 255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntpd_FSxBX_XMM11_icebp_c64, X86_XCPT_GP, RM_MEM, T_AVX_128, 255,  11, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntpd_FSxBX_YMM1_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX_256, 255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovntpd_FSxBX_YMM12_icebp_c64, X86_XCPT_GP, RM_MEM, T_AVX_256, 255,  12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movntps_FSxBX_XMM1_icebp_c64,   X86_XCPT_GP, RM_MEM, T_SSE,     FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movntps_FSxBX_XMM10_icebp_c64,  X86_XCPT_GP, RM_MEM, T_SSE,     FSxBX, XMM10, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntps_FSxBX_XMM1_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX_128, FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntps_FSxBX_XMM11_icebp_c64, X86_XCPT_GP, RM_MEM, T_AVX_128, FSxBX, XMM11, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntps_FSxBX_YMM1_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX_256, FSxBX, YMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntps_FSxBX_YMM12_icebp_c64, X86_XCPT_GP, RM_MEM, T_AVX_256, FSxBX, YMM12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_movntpd_FSxBX_XMM1_icebp_c64,   X86_XCPT_GP, RM_MEM, T_SSE,     FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movntpd_FSxBX_XMM10_icebp_c64,  X86_XCPT_GP, RM_MEM, T_SSE,     FSxBX, XMM10, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntpd_FSxBX_XMM1_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX_128, FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntpd_FSxBX_XMM11_icebp_c64, X86_XCPT_GP, RM_MEM, T_AVX_128, FSxBX, XMM11, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntpd_FSxBX_YMM1_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX_256, FSxBX, YMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovntpd_FSxBX_YMM12_icebp_c64, X86_XCPT_GP, RM_MEM, T_AVX_256, FSxBX, YMM12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST3_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -11300,52 +11296,52 @@
     static BS3CPUINSTR3_TEST3_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_movups_XMM1_XMM2_icebp_c16,    255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movups_XMM1_FSxBX_icebp_c16,   X86_XCPT_DB, RM_MEM, T_SSE,       1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movups_FSxBX_XMM1_icebp_c16,   X86_XCPT_DB, RM_MEM, T_SSE,       255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovups_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovups_XMM1_FSxBX_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovups_FSxBX_XMM1_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_128,   255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovups_YMM1_YMM2_icebp_c16,   255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovups_YMM1_FSxBX_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovups_FSxBX_YMM1_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_256,   255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movups_XMM1_XMM2_icebp_c16,    255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movups_XMM1_FSxBX_icebp_c16,   X86_XCPT_DB, RM_MEM, T_SSE,     XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movups_FSxBX_XMM1_icebp_c16,   X86_XCPT_DB, RM_MEM, T_SSE,     FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovups_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovups_XMM1_FSxBX_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovups_FSxBX_XMM1_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_128, FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovups_YMM1_YMM2_icebp_c16,   255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovups_YMM1_FSxBX_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovups_FSxBX_YMM1_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_256, FSxBX, YMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_movups_XMM1_XMM2_icebp_c32,    255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movups_XMM1_FSxBX_icebp_c32,   X86_XCPT_DB, RM_MEM, T_SSE,       1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movups_FSxBX_XMM1_icebp_c32,   X86_XCPT_DB, RM_MEM, T_SSE,       255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovups_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovups_XMM1_FSxBX_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovups_FSxBX_XMM1_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_128,   255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovups_YMM1_YMM2_icebp_c32,   255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovups_YMM1_FSxBX_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovups_FSxBX_YMM1_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_256,   255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movups_XMM1_XMM2_icebp_c32,    255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movups_XMM1_FSxBX_icebp_c32,   X86_XCPT_DB, RM_MEM, T_SSE,     XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movups_FSxBX_XMM1_icebp_c32,   X86_XCPT_DB, RM_MEM, T_SSE,     FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovups_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovups_XMM1_FSxBX_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovups_FSxBX_XMM1_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_128, FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovups_YMM1_YMM2_icebp_c32,   255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovups_YMM1_FSxBX_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovups_FSxBX_YMM1_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_256, FSxBX, YMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_movups_XMM1_XMM2_icebp_c64,    255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movups_XMM8_XMM12_icebp_c64,   255,         RM_REG, T_SSE,       8,  12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movups_XMM1_FSxBX_icebp_c64,   X86_XCPT_DB, RM_MEM, T_SSE,       1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movups_XMM10_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_SSE,      10, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movups_FSxBX_XMM1_icebp_c64,   X86_XCPT_DB, RM_MEM, T_SSE,     255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movups_FSxBX_XMM10_icebp_c64,  X86_XCPT_DB, RM_MEM, T_SSE,     255,  10, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovups_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovups_XMM7_XMM14_icebp_c64,  255,         RM_REG, T_AVX_128,   7,  14, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovups_XMM1_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovups_XMM11_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  11, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovups_FSxBX_XMM1_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_128, 255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovups_FSxBX_XMM11_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128, 255,  11, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovups_YMM1_YMM2_icebp_c64,   255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovups_YMM12_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256,  12,   8, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovups_YMM1_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovups_YMM12_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,  12, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovups_FSxBX_YMM1_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_256, 255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovups_FSxBX_YMM12_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, 255,  12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movups_XMM1_XMM2_icebp_c64,    255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movups_XMM8_XMM12_icebp_c64,   255,         RM_REG, T_SSE,     XMM8,  XMM12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movups_XMM1_FSxBX_icebp_c64,   X86_XCPT_DB, RM_MEM, T_SSE,     XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movups_XMM10_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_SSE,     XMM10, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movups_FSxBX_XMM1_icebp_c64,   X86_XCPT_DB, RM_MEM, T_SSE,     FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movups_FSxBX_XMM10_icebp_c64,  X86_XCPT_DB, RM_MEM, T_SSE,     FSxBX, XMM10, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovups_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovups_XMM7_XMM14_icebp_c64,  255,         RM_REG, T_AVX_128, XMM7,  XMM14, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovups_XMM1_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovups_XMM11_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128, XMM11, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovups_FSxBX_XMM1_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_128, FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovups_FSxBX_XMM11_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128, FSxBX, XMM11, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovups_YMM1_YMM2_icebp_c64,   255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovups_YMM12_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256, YMM12, YMM8,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovups_YMM1_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovups_YMM12_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM12, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovups_FSxBX_YMM1_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_256, FSxBX, YMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovups_FSxBX_YMM12_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, FSxBX, YMM12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST3_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -11366,52 +11362,52 @@
     static BS3CPUINSTR3_TEST3_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_movupd_XMM1_XMM2_icebp_c16,    255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movupd_XMM1_FSxBX_icebp_c16,   X86_XCPT_DB, RM_MEM, T_SSE,       1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movupd_FSxBX_XMM1_icebp_c16,   X86_XCPT_DB, RM_MEM, T_SSE,       255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovupd_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovupd_XMM1_FSxBX_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovupd_FSxBX_XMM1_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_128,   255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovupd_YMM1_YMM2_icebp_c16,   255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovupd_YMM1_FSxBX_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovupd_FSxBX_YMM1_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_256,   255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movupd_XMM1_XMM2_icebp_c16,    255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movupd_XMM1_FSxBX_icebp_c16,   X86_XCPT_DB, RM_MEM, T_SSE,     XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movupd_FSxBX_XMM1_icebp_c16,   X86_XCPT_DB, RM_MEM, T_SSE,     FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovupd_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovupd_XMM1_FSxBX_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovupd_FSxBX_XMM1_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_128, FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovupd_YMM1_YMM2_icebp_c16,   255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovupd_YMM1_FSxBX_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovupd_FSxBX_YMM1_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_256, FSxBX, YMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_movupd_XMM1_XMM2_icebp_c32,    255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movupd_XMM1_FSxBX_icebp_c32,   X86_XCPT_DB, RM_MEM, T_SSE,       1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movupd_FSxBX_XMM1_icebp_c32,   X86_XCPT_DB, RM_MEM, T_SSE,       255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovupd_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovupd_XMM1_FSxBX_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovupd_FSxBX_XMM1_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_128,   255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovupd_YMM1_YMM2_icebp_c32,   255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovupd_YMM1_FSxBX_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovupd_FSxBX_YMM1_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_256,   255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movupd_XMM1_XMM2_icebp_c32,    255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movupd_XMM1_FSxBX_icebp_c32,   X86_XCPT_DB, RM_MEM, T_SSE,     XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movupd_FSxBX_XMM1_icebp_c32,   X86_XCPT_DB, RM_MEM, T_SSE,     FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovupd_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovupd_XMM1_FSxBX_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovupd_FSxBX_XMM1_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_128, FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovupd_YMM1_YMM2_icebp_c32,   255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovupd_YMM1_FSxBX_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovupd_FSxBX_YMM1_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_256, FSxBX, YMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_movupd_XMM1_XMM2_icebp_c64,    255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movupd_XMM8_XMM12_icebp_c64,   255,         RM_REG, T_SSE,       8,  12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movupd_XMM1_FSxBX_icebp_c64,   X86_XCPT_DB, RM_MEM, T_SSE,       1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movupd_XMM10_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_SSE,      10, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movupd_FSxBX_XMM1_icebp_c64,   X86_XCPT_DB, RM_MEM, T_SSE,     255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movupd_FSxBX_XMM10_icebp_c64,  X86_XCPT_DB, RM_MEM, T_SSE,     255,  10, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovupd_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovupd_XMM7_XMM14_icebp_c64,  255,         RM_REG, T_AVX_128,   7,  14, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovupd_XMM1_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovupd_XMM11_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  11, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovupd_FSxBX_XMM1_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_128, 255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovupd_FSxBX_XMM11_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128, 255,  11, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovupd_YMM1_YMM2_icebp_c64,   255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovupd_YMM12_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256,  12,   8, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovupd_YMM1_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovupd_YMM12_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,  12, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovupd_FSxBX_YMM1_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_256, 255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovupd_FSxBX_YMM12_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, 255,  12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movupd_XMM1_XMM2_icebp_c64,    255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movupd_XMM8_XMM12_icebp_c64,   255,         RM_REG, T_SSE,     XMM8,  XMM12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movupd_XMM1_FSxBX_icebp_c64,   X86_XCPT_DB, RM_MEM, T_SSE,     XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movupd_XMM10_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_SSE,     XMM10, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movupd_FSxBX_XMM1_icebp_c64,   X86_XCPT_DB, RM_MEM, T_SSE,     FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movupd_FSxBX_XMM10_icebp_c64,  X86_XCPT_DB, RM_MEM, T_SSE,     FSxBX, XMM10, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovupd_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovupd_XMM7_XMM14_icebp_c64,  255,         RM_REG, T_AVX_128, XMM7,  XMM14, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovupd_XMM1_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovupd_XMM11_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128, XMM11, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovupd_FSxBX_XMM1_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_128, FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovupd_FSxBX_XMM11_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128, FSxBX, XMM11, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovupd_YMM1_YMM2_icebp_c64,   255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovupd_YMM12_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256, YMM12, YMM8,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovupd_YMM1_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovupd_YMM12_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM12, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovupd_FSxBX_YMM1_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_256, FSxBX, YMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovupd_FSxBX_YMM12_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, FSxBX, YMM12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST3_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -11441,40 +11437,40 @@
     static BS3CPUINSTR3_TEST3_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_movsldup_XMM1_XMM2_icebp_c16,    255,         RM_REG, T_SSE3,      1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_movsldup_XMM1_FSxBX_icebp_c16,   X86_XCPT_DB, RM_MEM, T_SSE3,      1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-
-        {  bs3CpuInstr3_vmovsldup_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovsldup_XMM1_FSxBX_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-
-        {  bs3CpuInstr3_vmovsldup_YMM1_YMM2_icebp_c16,   255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovsldup_YMM1_FSxBX_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movsldup_XMM1_XMM2_icebp_c16,    255,         RM_REG, T_SSE3,     XMM1,  XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movsldup_XMM1_FSxBX_icebp_c16,   X86_XCPT_DB, RM_MEM, T_SSE3,     XMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+
+        {  bs3CpuInstr3_vmovsldup_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovsldup_XMM1_FSxBX_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+
+        {  bs3CpuInstr3_vmovsldup_YMM1_YMM2_icebp_c16,   255,         RM_REG, T_AVX_256,  YMM1,  YMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovsldup_YMM1_FSxBX_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_256,  YMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_movsldup_XMM1_XMM2_icebp_c32,    255,         RM_REG, T_SSE3,      1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_movsldup_XMM1_FSxBX_icebp_c32,   X86_XCPT_DB, RM_MEM, T_SSE3,      1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-
-        {  bs3CpuInstr3_vmovsldup_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovsldup_XMM1_FSxBX_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-
-        {  bs3CpuInstr3_vmovsldup_YMM1_YMM2_icebp_c32,   255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovsldup_YMM1_FSxBX_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movsldup_XMM1_XMM2_icebp_c32,    255,         RM_REG, T_SSE3,     XMM1,  XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movsldup_XMM1_FSxBX_icebp_c32,   X86_XCPT_DB, RM_MEM, T_SSE3,     XMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+
+        {  bs3CpuInstr3_vmovsldup_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovsldup_XMM1_FSxBX_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+
+        {  bs3CpuInstr3_vmovsldup_YMM1_YMM2_icebp_c32,   255,         RM_REG, T_AVX_256,  YMM1,  YMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovsldup_YMM1_FSxBX_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_256,  YMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_movsldup_XMM1_XMM2_icebp_c64,    255,         RM_REG, T_SSE3,      1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_movsldup_XMM8_XMM12_icebp_c64,   255,         RM_REG, T_SSE3,      8,  12, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_movsldup_XMM1_FSxBX_icebp_c64,   X86_XCPT_DB, RM_MEM, T_SSE3,      1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_movsldup_XMM10_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_SSE3,     10, 255, RT_ELEMENTS(s_aValues), s_aValues },
-
-        {  bs3CpuInstr3_vmovsldup_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovsldup_XMM7_XMM14_icebp_c64,  255,         RM_REG, T_AVX_128,   7,  14, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovsldup_XMM1_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovsldup_XMM11_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  11, 255, RT_ELEMENTS(s_aValues), s_aValues },
-
-        {  bs3CpuInstr3_vmovsldup_YMM1_YMM2_icebp_c64,   255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovsldup_YMM12_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256,  12,   8, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovsldup_YMM1_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovsldup_YMM12_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,  12, 255, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movsldup_XMM1_XMM2_icebp_c64,    255,         RM_REG, T_SSE3,     XMM1,  XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movsldup_XMM8_XMM12_icebp_c64,   255,         RM_REG, T_SSE3,     XMM8,  XMM12, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movsldup_XMM1_FSxBX_icebp_c64,   X86_XCPT_DB, RM_MEM, T_SSE3,     XMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movsldup_XMM10_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_SSE3,     XMM10, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+
+        {  bs3CpuInstr3_vmovsldup_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovsldup_XMM7_XMM14_icebp_c64,  255,         RM_REG, T_AVX_128,  XMM7,  XMM14, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovsldup_XMM1_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovsldup_XMM11_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM11, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+
+        {  bs3CpuInstr3_vmovsldup_YMM1_YMM2_icebp_c64,   255,         RM_REG, T_AVX_256,  YMM1,  YMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovsldup_YMM12_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256,  YMM12, YMM8,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovsldup_YMM1_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_256,  YMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovsldup_YMM12_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,  YMM12, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
     };
     static BS3CPUINSTR3_TEST3_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST3_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -11504,40 +11500,40 @@
     static BS3CPUINSTR3_TEST3_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_movshdup_XMM1_XMM2_icebp_c16,    255,         RM_REG, T_SSE3,      1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_movshdup_XMM1_FSxBX_icebp_c16,   X86_XCPT_DB, RM_MEM, T_SSE3,      1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-
-        {  bs3CpuInstr3_vmovshdup_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovshdup_XMM1_FSxBX_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-
-        {  bs3CpuInstr3_vmovshdup_YMM1_YMM2_icebp_c16,   255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovshdup_YMM1_FSxBX_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movshdup_XMM1_XMM2_icebp_c16,    255,         RM_REG, T_SSE3,     XMM1,  XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movshdup_XMM1_FSxBX_icebp_c16,   X86_XCPT_DB, RM_MEM, T_SSE3,     XMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+
+        {  bs3CpuInstr3_vmovshdup_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovshdup_XMM1_FSxBX_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+
+        {  bs3CpuInstr3_vmovshdup_YMM1_YMM2_icebp_c16,   255,         RM_REG, T_AVX_256,  YMM1,  YMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovshdup_YMM1_FSxBX_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_256,  YMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_movshdup_XMM1_XMM2_icebp_c32,    255,         RM_REG, T_SSE3,      1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_movshdup_XMM1_FSxBX_icebp_c32,   X86_XCPT_DB, RM_MEM, T_SSE3,      1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-
-        {  bs3CpuInstr3_vmovshdup_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovshdup_XMM1_FSxBX_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-
-        {  bs3CpuInstr3_vmovshdup_YMM1_YMM2_icebp_c32,   255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovshdup_YMM1_FSxBX_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movshdup_XMM1_XMM2_icebp_c32,    255,         RM_REG, T_SSE3,     XMM1,  XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movshdup_XMM1_FSxBX_icebp_c32,   X86_XCPT_DB, RM_MEM, T_SSE3,     XMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+
+        {  bs3CpuInstr3_vmovshdup_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovshdup_XMM1_FSxBX_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+
+        {  bs3CpuInstr3_vmovshdup_YMM1_YMM2_icebp_c32,   255,         RM_REG, T_AVX_256,  YMM1,  YMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovshdup_YMM1_FSxBX_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_256,  YMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_movshdup_XMM1_XMM2_icebp_c64,    255,         RM_REG, T_SSE3,      1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_movshdup_XMM8_XMM12_icebp_c64,   255,         RM_REG, T_SSE3,      8,  12, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_movshdup_XMM1_FSxBX_icebp_c64,   X86_XCPT_DB, RM_MEM, T_SSE3,      1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_movshdup_XMM10_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_SSE3,     10, 255, RT_ELEMENTS(s_aValues), s_aValues },
-
-        {  bs3CpuInstr3_vmovshdup_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovshdup_XMM7_XMM14_icebp_c64,  255,         RM_REG, T_AVX_128,   7,  14, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovshdup_XMM1_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovshdup_XMM11_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  11, 255, RT_ELEMENTS(s_aValues), s_aValues },
-
-        {  bs3CpuInstr3_vmovshdup_YMM1_YMM2_icebp_c64,   255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovshdup_YMM12_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256,  12,   8, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovshdup_YMM1_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovshdup_YMM12_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,  12, 255, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movshdup_XMM1_XMM2_icebp_c64,    255,         RM_REG, T_SSE3,     XMM1,  XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movshdup_XMM8_XMM12_icebp_c64,   255,         RM_REG, T_SSE3,     XMM8,  XMM12, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movshdup_XMM1_FSxBX_icebp_c64,   X86_XCPT_DB, RM_MEM, T_SSE3,     XMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movshdup_XMM10_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_SSE3,     XMM10, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+
+        {  bs3CpuInstr3_vmovshdup_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovshdup_XMM7_XMM14_icebp_c64,  255,         RM_REG, T_AVX_128,  XMM7,  XMM14, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovshdup_XMM1_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovshdup_XMM11_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  XMM11, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+
+        {  bs3CpuInstr3_vmovshdup_YMM1_YMM2_icebp_c64,   255,         RM_REG, T_AVX_256,  YMM1,  YMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovshdup_YMM12_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256,  YMM12, YMM8,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovshdup_YMM1_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_256,  YMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovshdup_YMM12_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,  YMM12, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
     };
     static BS3CPUINSTR3_TEST3_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST3_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -11570,40 +11566,40 @@
     static BS3CPUINSTR3_TEST3_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_movddup_XMM1_XMM2_icebp_c16,    255,         RM_REG, T_SSE3,      1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_movddup_XMM1_FSxBX_icebp_c16,   X86_XCPT_DB, RM_MEM, T_SSE3,      1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-
-        {  bs3CpuInstr3_vmovddup_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovddup_XMM1_FSxBX_icebp_c16,  X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-
-        {  bs3CpuInstr3_vmovddup_YMM1_YMM2_icebp_c16,   255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovddup_YMM1_FSxBX_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movddup_XMM1_XMM2_icebp_c16,    255,         RM_REG, T_SSE3,     XMM1,  XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movddup_XMM1_FSxBX_icebp_c16,   X86_XCPT_DB, RM_MEM, T_SSE3,     XMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+
+        {  bs3CpuInstr3_vmovddup_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovddup_XMM1_FSxBX_icebp_c16,  X86_XCPT_AC, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+
+        {  bs3CpuInstr3_vmovddup_YMM1_YMM2_icebp_c16,   255,         RM_REG, T_AVX_256,  YMM1,  YMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovddup_YMM1_FSxBX_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_256,  YMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_movddup_XMM1_XMM2_icebp_c32,    255,         RM_REG, T_SSE3,      1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_movddup_XMM1_FSxBX_icebp_c32,   X86_XCPT_DB, RM_MEM, T_SSE3,      1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-
-        {  bs3CpuInstr3_vmovddup_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovddup_XMM1_FSxBX_icebp_c32,  X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-
-        {  bs3CpuInstr3_vmovddup_YMM1_YMM2_icebp_c32,   255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovddup_YMM1_FSxBX_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movddup_XMM1_XMM2_icebp_c32,    255,         RM_REG, T_SSE3,     XMM1,  XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movddup_XMM1_FSxBX_icebp_c32,   X86_XCPT_DB, RM_MEM, T_SSE3,     XMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+
+        {  bs3CpuInstr3_vmovddup_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovddup_XMM1_FSxBX_icebp_c32,  X86_XCPT_AC, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+
+        {  bs3CpuInstr3_vmovddup_YMM1_YMM2_icebp_c32,   255,         RM_REG, T_AVX_256,  YMM1,  YMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovddup_YMM1_FSxBX_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_256,  YMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_movddup_XMM1_XMM2_icebp_c64,    255,         RM_REG, T_SSE3,      1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_movddup_XMM8_XMM12_icebp_c64,   255,         RM_REG, T_SSE3,      8,  12, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_movddup_XMM1_FSxBX_icebp_c64,   X86_XCPT_DB, RM_MEM, T_SSE3,      1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_movddup_XMM10_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_SSE3,     10, 255, RT_ELEMENTS(s_aValues), s_aValues },
-
-        {  bs3CpuInstr3_vmovddup_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovddup_XMM7_XMM14_icebp_c64,  255,         RM_REG, T_AVX_128,   7,  14, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovddup_XMM1_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovddup_XMM11_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,  11, 255, RT_ELEMENTS(s_aValues), s_aValues },
-
-        {  bs3CpuInstr3_vmovddup_YMM1_YMM2_icebp_c64,   255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovddup_YMM12_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256,  12,   8, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovddup_YMM1_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vmovddup_YMM12_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,  12, 255, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movddup_XMM1_XMM2_icebp_c64,    255,         RM_REG, T_SSE3,     XMM1,  XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movddup_XMM8_XMM12_icebp_c64,   255,         RM_REG, T_SSE3,     XMM8,  XMM12, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movddup_XMM1_FSxBX_icebp_c64,   X86_XCPT_DB, RM_MEM, T_SSE3,     XMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_movddup_XMM10_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_SSE3,     XMM10, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+
+        {  bs3CpuInstr3_vmovddup_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX_128,  XMM1,  XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovddup_XMM7_XMM14_icebp_c64,  255,         RM_REG, T_AVX_128,  XMM7,  XMM14, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovddup_XMM1_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM, T_AVX_128,  XMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovddup_XMM11_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,  XMM11, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+
+        {  bs3CpuInstr3_vmovddup_YMM1_YMM2_icebp_c64,   255,         RM_REG, T_AVX_256,  YMM1,  YMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovddup_YMM12_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256,  YMM12, YMM8,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovddup_YMM1_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_256,  YMM1,  FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vmovddup_YMM12_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,  YMM12, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
     };
     static BS3CPUINSTR3_TEST3_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST3_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -11622,64 +11618,64 @@
     static BS3CPUINSTR3_TEST3_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_movaps_XMM1_XMM2_icebp_c16,    255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movaps_XMM1_FSxBX_icebp_c16,   X86_XCPT_GP, RM_MEM, T_SSE,       1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movapd_XMM1_XMM2_icebp_c16,    255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movapd_XMM1_FSxBX_icebp_c16,   X86_XCPT_GP, RM_MEM, T_SSE,       1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovaps_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovaps_XMM1_FSxBX_icebp_c16,  X86_XCPT_GP, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovapd_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovapd_XMM1_FSxBX_icebp_c16,  X86_XCPT_GP, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovaps_YMM1_YMM2_icebp_c16,   255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovaps_YMM1_FSxBX_icebp_c16,  X86_XCPT_GP, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovapd_YMM1_YMM2_icebp_c16,   255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovapd_YMM1_FSxBX_icebp_c16,  X86_XCPT_GP, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movaps_XMM1_XMM2_icebp_c16,    255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movaps_XMM1_FSxBX_icebp_c16,   X86_XCPT_GP, RM_MEM, T_SSE,     XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movapd_XMM1_XMM2_icebp_c16,    255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movapd_XMM1_FSxBX_icebp_c16,   X86_XCPT_GP, RM_MEM, T_SSE,     XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovaps_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovaps_XMM1_FSxBX_icebp_c16,  X86_XCPT_GP, RM_MEM, T_AVX_128, XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovapd_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovapd_XMM1_FSxBX_icebp_c16,  X86_XCPT_GP, RM_MEM, T_AVX_128, XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovaps_YMM1_YMM2_icebp_c16,   255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovaps_YMM1_FSxBX_icebp_c16,  X86_XCPT_GP, RM_MEM, T_AVX_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovapd_YMM1_YMM2_icebp_c16,   255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovapd_YMM1_FSxBX_icebp_c16,  X86_XCPT_GP, RM_MEM, T_AVX_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_movaps_XMM1_XMM2_icebp_c32,    255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movaps_XMM1_FSxBX_icebp_c32,   X86_XCPT_GP, RM_MEM, T_SSE,       1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movapd_XMM1_XMM2_icebp_c32,    255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movapd_XMM1_FSxBX_icebp_c32,   X86_XCPT_GP, RM_MEM, T_SSE,       1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovaps_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovaps_XMM1_FSxBX_icebp_c32,  X86_XCPT_GP, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovapd_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovapd_XMM1_FSxBX_icebp_c32,  X86_XCPT_GP, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovaps_YMM1_YMM2_icebp_c32,   255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovaps_YMM1_FSxBX_icebp_c32,  X86_XCPT_GP, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovapd_YMM1_YMM2_icebp_c32,   255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovapd_YMM1_FSxBX_icebp_c32,  X86_XCPT_GP, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movaps_XMM1_XMM2_icebp_c32,    255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movaps_XMM1_FSxBX_icebp_c32,   X86_XCPT_GP, RM_MEM, T_SSE,     XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movapd_XMM1_XMM2_icebp_c32,    255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movapd_XMM1_FSxBX_icebp_c32,   X86_XCPT_GP, RM_MEM, T_SSE,     XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovaps_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovaps_XMM1_FSxBX_icebp_c32,  X86_XCPT_GP, RM_MEM, T_AVX_128, XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovapd_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovapd_XMM1_FSxBX_icebp_c32,  X86_XCPT_GP, RM_MEM, T_AVX_128, XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovaps_YMM1_YMM2_icebp_c32,   255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovaps_YMM1_FSxBX_icebp_c32,  X86_XCPT_GP, RM_MEM, T_AVX_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovapd_YMM1_YMM2_icebp_c32,   255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovapd_YMM1_FSxBX_icebp_c32,  X86_XCPT_GP, RM_MEM, T_AVX_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_movaps_XMM1_XMM2_icebp_c64,    255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movaps_XMM8_XMM12_icebp_c64,   255,         RM_REG, T_SSE,       8,  12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movaps_XMM1_FSxBX_icebp_c64,   X86_XCPT_GP, RM_MEM, T_SSE,       1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movaps_XMM10_FSxBX_icebp_c64,  X86_XCPT_GP, RM_MEM, T_SSE,      10, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movapd_XMM1_XMM2_icebp_c64,    255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movapd_XMM8_XMM12_icebp_c64,   255,         RM_REG, T_SSE,       8,  12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movapd_XMM1_FSxBX_icebp_c64,   X86_XCPT_GP, RM_MEM, T_SSE,       1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movapd_XMM10_FSxBX_icebp_c64,  X86_XCPT_GP, RM_MEM, T_SSE,      10, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovaps_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovaps_XMM7_XMM14_icebp_c64,  255,         RM_REG, T_AVX_128,   7,  14, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovaps_XMM1_FSxBX_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovaps_XMM11_FSxBX_icebp_c64, X86_XCPT_GP, RM_MEM, T_AVX_128,  11, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovapd_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovapd_XMM7_XMM14_icebp_c64,  255,         RM_REG, T_AVX_128,   7,  14, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovapd_XMM1_FSxBX_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovapd_XMM11_FSxBX_icebp_c64, X86_XCPT_GP, RM_MEM, T_AVX_128,  11, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovaps_YMM1_YMM2_icebp_c64,   255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovaps_YMM12_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256,  12,   8, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovaps_YMM1_FSxBX_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovaps_YMM12_FSxBX_icebp_c64, X86_XCPT_GP, RM_MEM, T_AVX_256,  12, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovapd_YMM1_YMM2_icebp_c64,   255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovapd_YMM12_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256,  12,   8, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovapd_YMM1_FSxBX_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovapd_YMM12_FSxBX_icebp_c64, X86_XCPT_GP, RM_MEM, T_AVX_256,  12, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movaps_XMM1_XMM2_icebp_c64,    255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movaps_XMM8_XMM12_icebp_c64,   255,         RM_REG, T_SSE,     XMM8,  XMM12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movaps_XMM1_FSxBX_icebp_c64,   X86_XCPT_GP, RM_MEM, T_SSE,     XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movaps_XMM10_FSxBX_icebp_c64,  X86_XCPT_GP, RM_MEM, T_SSE,     XMM10, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movapd_XMM1_XMM2_icebp_c64,    255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movapd_XMM8_XMM12_icebp_c64,   255,         RM_REG, T_SSE,     XMM8,  XMM12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movapd_XMM1_FSxBX_icebp_c64,   X86_XCPT_GP, RM_MEM, T_SSE,     XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movapd_XMM10_FSxBX_icebp_c64,  X86_XCPT_GP, RM_MEM, T_SSE,     XMM10, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovaps_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovaps_XMM7_XMM14_icebp_c64,  255,         RM_REG, T_AVX_128, XMM7,  XMM14, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovaps_XMM1_FSxBX_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX_128, XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovaps_XMM11_FSxBX_icebp_c64, X86_XCPT_GP, RM_MEM, T_AVX_128, XMM11, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovapd_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovapd_XMM7_XMM14_icebp_c64,  255,         RM_REG, T_AVX_128, XMM7,  XMM14, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovapd_XMM1_FSxBX_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX_128, XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovapd_XMM11_FSxBX_icebp_c64, X86_XCPT_GP, RM_MEM, T_AVX_128, XMM11, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovaps_YMM1_YMM2_icebp_c64,   255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovaps_YMM12_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256, YMM12, YMM8,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovaps_YMM1_FSxBX_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovaps_YMM12_FSxBX_icebp_c64, X86_XCPT_GP, RM_MEM, T_AVX_256, YMM12, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovapd_YMM1_YMM2_icebp_c64,   255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovapd_YMM12_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256, YMM12, YMM8,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovapd_YMM1_FSxBX_icebp_c64,  X86_XCPT_GP, RM_MEM, T_AVX_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovapd_YMM12_FSxBX_icebp_c64, X86_XCPT_GP, RM_MEM, T_AVX_256, YMM12, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST3_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -11697,62 +11693,62 @@
     static BS3CPUINSTR3_TEST3_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_movdqu_XMM1_XMM2_icebp_c16,         255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_07f_movdqu_XMM1_XMM2_icebp_c16,     255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movdqu_XMM1_FSxBX_icebp_c16,        X86_XCPT_DB, RM_MEM, T_SSE,       1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movdqu_FSxBX_XMM1_icebp_c16,        X86_XCPT_DB, RM_MEM, T_SSE,       255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovdqu_XMM1_XMM2_icebp_c16,        255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_07f_vmovdqu_XMM1_XMM2_icebp_c16,    255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqu_XMM1_FSxBX_icebp_c16,       X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqu_FSxBX_XMM1_icebp_c16,       X86_XCPT_DB, RM_MEM, T_AVX_128,   255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovdqu_YMM1_YMM2_icebp_c16,        255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_07f_vmovdqu_YMM1_YMM2_icebp_c16,    255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqu_YMM1_FSxBX_icebp_c16,       X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqu_FSxBX_YMM1_icebp_c16,       X86_XCPT_DB, RM_MEM, T_AVX_256,   255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqu_XMM1_XMM2_icebp_c16,      255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_07f_movdqu_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqu_XMM1_FSxBX_icebp_c16,     X86_XCPT_DB, RM_MEM, T_SSE,     XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqu_FSxBX_XMM1_icebp_c16,     X86_XCPT_DB, RM_MEM, T_SSE,     FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovdqu_XMM1_XMM2_icebp_c16,     255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_07f_vmovdqu_XMM1_XMM2_icebp_c16, 255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqu_XMM1_FSxBX_icebp_c16,    X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqu_FSxBX_XMM1_icebp_c16,    X86_XCPT_DB, RM_MEM, T_AVX_128, FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovdqu_YMM1_YMM2_icebp_c16,     255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_07f_vmovdqu_YMM1_YMM2_icebp_c16, 255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqu_YMM1_FSxBX_icebp_c16,    X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqu_FSxBX_YMM1_icebp_c16,    X86_XCPT_DB, RM_MEM, T_AVX_256, FSxBX, YMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_movdqu_XMM1_XMM2_icebp_c32,         255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_07f_movdqu_XMM1_XMM2_icebp_c32,     255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movdqu_XMM1_FSxBX_icebp_c32,        X86_XCPT_DB, RM_MEM, T_SSE,       1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movdqu_FSxBX_XMM1_icebp_c32,        X86_XCPT_DB, RM_MEM, T_SSE,       255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovdqu_XMM1_XMM2_icebp_c32,        255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_07f_vmovdqu_XMM1_XMM2_icebp_c32,    255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqu_XMM1_FSxBX_icebp_c32,       X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqu_FSxBX_XMM1_icebp_c32,       X86_XCPT_DB, RM_MEM, T_AVX_128,   255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovdqu_YMM1_YMM2_icebp_c32,        255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_07f_vmovdqu_YMM1_YMM2_icebp_c32,    255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqu_YMM1_FSxBX_icebp_c32,       X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqu_FSxBX_YMM1_icebp_c32,       X86_XCPT_DB, RM_MEM, T_AVX_256,   255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqu_XMM1_XMM2_icebp_c32,      255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_07f_movdqu_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqu_XMM1_FSxBX_icebp_c32,     X86_XCPT_DB, RM_MEM, T_SSE,     XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqu_FSxBX_XMM1_icebp_c32,     X86_XCPT_DB, RM_MEM, T_SSE,     FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovdqu_XMM1_XMM2_icebp_c32,     255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_07f_vmovdqu_XMM1_XMM2_icebp_c32, 255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqu_XMM1_FSxBX_icebp_c32,    X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqu_FSxBX_XMM1_icebp_c32,    X86_XCPT_DB, RM_MEM, T_AVX_128, FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovdqu_YMM1_YMM2_icebp_c32,     255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_07f_vmovdqu_YMM1_YMM2_icebp_c32, 255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqu_YMM1_FSxBX_icebp_c32,    X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqu_FSxBX_YMM1_icebp_c32,    X86_XCPT_DB, RM_MEM, T_AVX_256, FSxBX, YMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_movdqu_XMM1_XMM2_icebp_c64,         255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_07f_movdqu_XMM1_XMM2_icebp_c64,     255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movdqu_XMM8_XMM12_icebp_c64,        255,         RM_REG, T_SSE,       8,  12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_07f_movdqu_XMM8_XMM12_icebp_c64,    255,         RM_REG, T_SSE,       8,  12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movdqu_XMM1_FSxBX_icebp_c64,        X86_XCPT_DB, RM_MEM, T_SSE,       1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movdqu_XMM10_FSxBX_icebp_c64,       X86_XCPT_DB, RM_MEM, T_SSE,      10, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movdqu_FSxBX_XMM1_icebp_c64,        X86_XCPT_DB, RM_MEM, T_SSE,     255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movdqu_FSxBX_XMM10_icebp_c64,       X86_XCPT_DB, RM_MEM, T_SSE,     255,  10, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovdqu_XMM1_XMM2_icebp_c64,        255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_07f_vmovdqu_XMM1_XMM2_icebp_c64,    255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqu_XMM7_XMM14_icebp_c64,       255,         RM_REG, T_AVX_128,   7,  14, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqu_XMM1_FSxBX_icebp_c64,       X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqu_XMM11_FSxBX_icebp_c64,      X86_XCPT_DB, RM_MEM, T_AVX_128,  11, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqu_FSxBX_XMM1_icebp_c64,       X86_XCPT_DB, RM_MEM, T_AVX_128, 255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqu_FSxBX_XMM11_icebp_c64,      X86_XCPT_DB, RM_MEM, T_AVX_128, 255,  11, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovdqu_YMM1_YMM2_icebp_c64,        255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_07f_vmovdqu_YMM1_YMM2_icebp_c64,    255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqu_YMM12_YMM8_icebp_c64,       255,         RM_REG, T_AVX_256,  12,   8, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqu_YMM1_FSxBX_icebp_c64,       X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqu_YMM12_FSxBX_icebp_c64,      X86_XCPT_DB, RM_MEM, T_AVX_256,  12, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqu_FSxBX_YMM1_icebp_c64,       X86_XCPT_DB, RM_MEM, T_AVX_256, 255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqu_FSxBX_YMM12_icebp_c64,      X86_XCPT_DB, RM_MEM, T_AVX_256, 255,  12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqu_XMM1_XMM2_icebp_c64,      255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_07f_movdqu_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqu_XMM8_XMM12_icebp_c64,     255,         RM_REG, T_SSE,     XMM8,  XMM12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_07f_movdqu_XMM8_XMM12_icebp_c64, 255,         RM_REG, T_SSE,     XMM8,  XMM12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqu_XMM1_FSxBX_icebp_c64,     X86_XCPT_DB, RM_MEM, T_SSE,     XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqu_XMM10_FSxBX_icebp_c64,    X86_XCPT_DB, RM_MEM, T_SSE,     XMM10, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqu_FSxBX_XMM1_icebp_c64,     X86_XCPT_DB, RM_MEM, T_SSE,     FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqu_FSxBX_XMM10_icebp_c64,    X86_XCPT_DB, RM_MEM, T_SSE,     FSxBX, XMM10, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovdqu_XMM1_XMM2_icebp_c64,     255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_07f_vmovdqu_XMM1_XMM2_icebp_c64, 255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqu_XMM7_XMM14_icebp_c64,    255,         RM_REG, T_AVX_128, XMM7,  XMM14, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqu_XMM1_FSxBX_icebp_c64,    X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqu_XMM11_FSxBX_icebp_c64,   X86_XCPT_DB, RM_MEM, T_AVX_128, XMM11, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqu_FSxBX_XMM1_icebp_c64,    X86_XCPT_DB, RM_MEM, T_AVX_128, FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqu_FSxBX_XMM11_icebp_c64,   X86_XCPT_DB, RM_MEM, T_AVX_128, FSxBX, XMM11, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovdqu_YMM1_YMM2_icebp_c64,     255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_07f_vmovdqu_YMM1_YMM2_icebp_c64, 255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqu_YMM12_YMM8_icebp_c64,    255,         RM_REG, T_AVX_256, YMM12, YMM8,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqu_YMM1_FSxBX_icebp_c64,    X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqu_YMM12_FSxBX_icebp_c64,   X86_XCPT_DB, RM_MEM, T_AVX_256, YMM12, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqu_FSxBX_YMM1_icebp_c64,    X86_XCPT_DB, RM_MEM, T_AVX_256, FSxBX, YMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqu_FSxBX_YMM12_icebp_c64,   X86_XCPT_DB, RM_MEM, T_AVX_256, FSxBX, YMM12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST3_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -11770,64 +11766,64 @@
     static BS3CPUINSTR3_TEST3_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_movdqa_XMM1_XMM2_icebp_c16,         255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_07f_movdqa_XMM1_XMM2_icebp_c16,     255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movdqa_XMM1_FSxBX_icebp_c16,        255,         RM_MEM, T_SSE,       1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movdqa_FSxBX_XMM1_icebp_c16,        255,         RM_MEM, T_SSE,       255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovdqa_XMM1_XMM2_icebp_c16,        255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_07f_vmovdqa_XMM1_XMM2_icebp_c16,    255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqa_XMM1_FSxBX_icebp_c16,       X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqa_FSxBX_XMM1_icebp_c16,       X86_XCPT_AC, RM_MEM, T_AVX_128,   255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovdqa_YMM1_YMM2_icebp_c16,        255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_07f_vmovdqa_YMM1_YMM2_icebp_c16,    255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqa_YMM1_FSxBX_icebp_c16,       X86_XCPT_AC, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqa_FSxBX_YMM1_icebp_c16,       X86_XCPT_AC, RM_MEM, T_AVX_256,   255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqa_XMM1_XMM2_icebp_c16,       255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_07f_movdqa_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqa_XMM1_FSxBX_icebp_c16,      255,         RM_MEM, T_SSE,     XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqa_FSxBX_XMM1_icebp_c16,      255,         RM_MEM, T_SSE,     FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovdqa_XMM1_XMM2_icebp_c16,      255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_07f_vmovdqa_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqa_XMM1_FSxBX_icebp_c16,     X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqa_FSxBX_XMM1_icebp_c16,     X86_XCPT_AC, RM_MEM, T_AVX_128, FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovdqa_YMM1_YMM2_icebp_c16,      255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_07f_vmovdqa_YMM1_YMM2_icebp_c16,  255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqa_YMM1_FSxBX_icebp_c16,     X86_XCPT_AC, RM_MEM, T_AVX_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqa_FSxBX_YMM1_icebp_c16,     X86_XCPT_AC, RM_MEM, T_AVX_256, FSxBX, YMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_movdqa_XMM1_XMM2_icebp_c32,         255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_07f_movdqa_XMM1_XMM2_icebp_c32,     255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movdqa_XMM1_FSxBX_icebp_c32,        255,         RM_MEM, T_SSE,       1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movdqa_FSxBX_XMM1_icebp_c32,        255,         RM_MEM, T_SSE,       255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovdqa_XMM1_XMM2_icebp_c32,        255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_07f_vmovdqa_XMM1_XMM2_icebp_c32,    255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqa_XMM1_FSxBX_icebp_c32,       X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqa_FSxBX_XMM1_icebp_c32,       X86_XCPT_AC, RM_MEM, T_AVX_128,   255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovdqa_YMM1_YMM2_icebp_c32,        255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_07f_vmovdqa_YMM1_YMM2_icebp_c32,    255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqa_YMM1_FSxBX_icebp_c32,       X86_XCPT_AC, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqa_FSxBX_YMM1_icebp_c32,       X86_XCPT_AC, RM_MEM, T_AVX_256,   255, 1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqa_XMM1_XMM2_icebp_c32,       255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_07f_movdqa_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqa_XMM1_FSxBX_icebp_c32,      255,         RM_MEM, T_SSE,     XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqa_FSxBX_XMM1_icebp_c32,      255,         RM_MEM, T_SSE,     FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovdqa_XMM1_XMM2_icebp_c32,      255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_07f_vmovdqa_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqa_XMM1_FSxBX_icebp_c32,     X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqa_FSxBX_XMM1_icebp_c32,     X86_XCPT_AC, RM_MEM, T_AVX_128, FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovdqa_YMM1_YMM2_icebp_c32,      255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_07f_vmovdqa_YMM1_YMM2_icebp_c32,  255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqa_YMM1_FSxBX_icebp_c32,     X86_XCPT_AC, RM_MEM, T_AVX_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqa_FSxBX_YMM1_icebp_c32,     X86_XCPT_AC, RM_MEM, T_AVX_256, FSxBX, YMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_movdqa_XMM1_XMM2_icebp_c64,         255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_07f_movdqa_XMM1_XMM2_icebp_c64,     255,         RM_REG, T_SSE,       1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movdqa_XMM8_XMM12_icebp_c64,        255,         RM_REG, T_SSE,       8,  12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_07f_movdqa_XMM8_XMM12_icebp_c64,    255,         RM_REG, T_SSE,       8,  12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movdqa_XMM1_FSxBX_icebp_c64,        255,         RM_MEM, T_SSE,       1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movdqa_XMM10_FSxBX_icebp_c64,       255,         RM_MEM, T_SSE,      10, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movdqa_FSxBX_XMM1_icebp_c64,        255,         RM_MEM, T_SSE,     255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_movdqa_FSxBX_XMM10_icebp_c64,       255,         RM_MEM, T_SSE,     255,  10, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovdqa_XMM1_XMM2_icebp_c64,        255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_07f_vmovdqa_XMM1_XMM2_icebp_c64,    255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqa_XMM8_XMM14_icebp_c64,       255,         RM_REG, T_AVX_128,   8,  14, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_07f_vmovdqa_XMM8_XMM14_icebp_c64,   255,         RM_REG, T_AVX_128,   8,  14, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqa_XMM1_FSxBX_icebp_c64,       X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqa_XMM11_FSxBX_icebp_c64,      X86_XCPT_AC, RM_MEM, T_AVX_128,  11, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqa_FSxBX_XMM1_icebp_c64,       X86_XCPT_AC, RM_MEM, T_AVX_128, 255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqa_FSxBX_XMM11_icebp_c64,      X86_XCPT_AC, RM_MEM, T_AVX_128, 255,  11, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vmovdqa_YMM1_YMM2_icebp_c64,        255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_07f_vmovdqa_YMM1_YMM2_icebp_c64,    255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqa_YMM12_YMM8_icebp_c64,       255,         RM_REG, T_AVX_256,  12,   8, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_07f_vmovdqa_YMM12_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256,  12,   8, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqa_YMM1_FSxBX_icebp_c64,       X86_XCPT_AC, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqa_YMM12_FSxBX_icebp_c64,      X86_XCPT_AC, RM_MEM, T_AVX_256,  12, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqa_FSxBX_YMM1_icebp_c64,       X86_XCPT_AC, RM_MEM, T_AVX_256, 255,   1, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vmovdqa_FSxBX_YMM12_icebp_c64,      X86_XCPT_AC, RM_MEM, T_AVX_256, 255,  12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqa_XMM1_XMM2_icebp_c64,       255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_07f_movdqa_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE,     XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqa_XMM8_XMM12_icebp_c64,      255,         RM_REG, T_SSE,     XMM8,  XMM12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_07f_movdqa_XMM8_XMM12_icebp_c64,  255,         RM_REG, T_SSE,     XMM8,  XMM12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqa_XMM1_FSxBX_icebp_c64,      255,         RM_MEM, T_SSE,     XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqa_XMM10_FSxBX_icebp_c64,     255,         RM_MEM, T_SSE,     XMM10, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqa_FSxBX_XMM1_icebp_c64,      255,         RM_MEM, T_SSE,     FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_movdqa_FSxBX_XMM10_icebp_c64,     255,         RM_MEM, T_SSE,     FSxBX, XMM10, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovdqa_XMM1_XMM2_icebp_c64,      255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_07f_vmovdqa_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128, XMM1,  XMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqa_XMM8_XMM14_icebp_c64,     255,         RM_REG, T_AVX_128, XMM8,  XMM14, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_07f_vmovdqa_XMM8_XMM14_icebp_c64, 255,         RM_REG, T_AVX_128, XMM8,  XMM14, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqa_XMM1_FSxBX_icebp_c64,     X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqa_XMM11_FSxBX_icebp_c64,    X86_XCPT_AC, RM_MEM, T_AVX_128, XMM11, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqa_FSxBX_XMM1_icebp_c64,     X86_XCPT_AC, RM_MEM, T_AVX_128, FSxBX, XMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqa_FSxBX_XMM11_icebp_c64,    X86_XCPT_AC, RM_MEM, T_AVX_128, FSxBX, XMM11, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vmovdqa_YMM1_YMM2_icebp_c64,      255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_07f_vmovdqa_YMM1_YMM2_icebp_c64,  255,         RM_REG, T_AVX_256, YMM1,  YMM2,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqa_YMM12_YMM8_icebp_c64,     255,         RM_REG, T_AVX_256, YMM12, YMM8,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_07f_vmovdqa_YMM12_YMM8_icebp_c64, 255,         RM_REG, T_AVX_256, YMM12, YMM8,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqa_YMM1_FSxBX_icebp_c64,     X86_XCPT_AC, RM_MEM, T_AVX_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqa_YMM12_FSxBX_icebp_c64,    X86_XCPT_AC, RM_MEM, T_AVX_256, YMM12, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqa_FSxBX_YMM1_icebp_c64,     X86_XCPT_AC, RM_MEM, T_AVX_256, FSxBX, YMM1,  RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vmovdqa_FSxBX_YMM12_icebp_c64,    X86_XCPT_AC, RM_MEM, T_AVX_256, FSxBX, YMM12, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST3_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -11879,106 +11875,106 @@
     static BS3CPUINSTR3_TEST3_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_pabsb_MM1_MM2_icebp_c16,     255,         RM_REG, T_MMX_SSSE3, 1,   2, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_pabsb_MM1_FSxBX_icebp_c16,   255,         RM_MEM, T_MMX_SSSE3, 1, 255, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_pabsb_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSSE3,     1,   2, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_pabsb_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSSE3,     1, 255, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_vpabsb_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_vpabsb_XMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_vpabsb_YMM1_YMM2_icebp_c16,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_vpabsb_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-
-        {  bs3CpuInstr3_pabsw_MM1_MM2_icebp_c16,     255,         RM_REG, T_MMX_SSSE3, 1,   2, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_pabsw_MM1_FSxBX_icebp_c16,   255,         RM_MEM, T_MMX_SSSE3, 1, 255, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_pabsw_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSSE3,     1,   2, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_pabsw_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSSE3,     1, 255, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_vpabsw_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_vpabsw_XMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_vpabsw_YMM1_YMM2_icebp_c16,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_vpabsw_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-
-        {  bs3CpuInstr3_pabsd_MM1_MM2_icebp_c16,     255,         RM_REG, T_MMX_SSSE3, 1,   2, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_pabsd_MM1_FSxBX_icebp_c16,   255,         RM_MEM, T_MMX_SSSE3, 1, 255, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_pabsd_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSSE3,     1,   2, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_pabsd_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSSE3,     1, 255, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_vpabsd_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_vpabsd_XMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_vpabsd_YMM1_YMM2_icebp_c16,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_vpabsd_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_pabsb_MM1_MM2_icebp_c16,     255,         RM_REG, T_MMX_SSSE3, MM1,  MM2,   RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_pabsb_MM1_FSxBX_icebp_c16,   255,         RM_MEM, T_MMX_SSSE3, MM1,  FSxBX, RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_pabsb_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSSE3,     XMM1, XMM2,  RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_pabsb_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSSE3,     XMM1, FSxBX, RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_vpabsb_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128,   XMM1, XMM2,  RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_vpabsb_XMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128,   XMM1, FSxBX, RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_vpabsb_YMM1_YMM2_icebp_c16,  255,         RM_REG, T_AVX_256,   YMM1, YMM2,  RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_vpabsb_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256,   YMM1, FSxBX, RT_ELEMENTS(s_aValuesB), s_aValuesB },
+
+        {  bs3CpuInstr3_pabsw_MM1_MM2_icebp_c16,     255,         RM_REG, T_MMX_SSSE3, MM1,  MM2,   RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_pabsw_MM1_FSxBX_icebp_c16,   255,         RM_MEM, T_MMX_SSSE3, MM1,  FSxBX, RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_pabsw_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSSE3,     XMM1, XMM2,  RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_pabsw_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSSE3,     XMM1, FSxBX, RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_vpabsw_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128,   XMM1, XMM2,  RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_vpabsw_XMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128,   XMM1, FSxBX, RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_vpabsw_YMM1_YMM2_icebp_c16,  255,         RM_REG, T_AVX_256,   YMM1, YMM2,  RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_vpabsw_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256,   YMM1, FSxBX, RT_ELEMENTS(s_aValuesW), s_aValuesW },
+
+        {  bs3CpuInstr3_pabsd_MM1_MM2_icebp_c16,     255,         RM_REG, T_MMX_SSSE3, MM1,  MM2,   RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_pabsd_MM1_FSxBX_icebp_c16,   255,         RM_MEM, T_MMX_SSSE3, MM1,  FSxBX, RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_pabsd_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSSE3,     XMM1, XMM2,  RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_pabsd_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSSE3,     XMM1, FSxBX, RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_vpabsd_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128,   XMM1, XMM2,  RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_vpabsd_XMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128,   XMM1, FSxBX, RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_vpabsd_YMM1_YMM2_icebp_c16,  255,         RM_REG, T_AVX_256,   YMM1, YMM2,  RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_vpabsd_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256,   YMM1, FSxBX, RT_ELEMENTS(s_aValuesD), s_aValuesD },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_pabsb_MM1_MM2_icebp_c32,     255,         RM_REG, T_MMX_SSSE3, 1,   2, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_pabsb_MM1_FSxBX_icebp_c32,   255,         RM_MEM, T_MMX_SSSE3, 1, 255, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_pabsb_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSSE3,     1,   2, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_pabsb_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSSE3,     1, 255, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_vpabsb_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_vpabsb_XMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_vpabsb_YMM1_YMM2_icebp_c32,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_vpabsb_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-
-        {  bs3CpuInstr3_pabsw_MM1_MM2_icebp_c32,     255,         RM_REG, T_MMX_SSSE3, 1,   2, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_pabsw_MM1_FSxBX_icebp_c32,   255,         RM_MEM, T_MMX_SSSE3, 1, 255, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_pabsw_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSSE3,     1,   2, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_pabsw_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSSE3,     1, 255, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_vpabsw_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_vpabsw_XMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_vpabsw_YMM1_YMM2_icebp_c32,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_vpabsw_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-
-        {  bs3CpuInstr3_pabsd_MM1_MM2_icebp_c32,     255,         RM_REG, T_MMX_SSSE3, 1,   2, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_pabsd_MM1_FSxBX_icebp_c32,   255,         RM_MEM, T_MMX_SSSE3, 1, 255, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_pabsd_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSSE3,     1,   2, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_pabsd_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSSE3,     1, 255, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_vpabsd_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_vpabsd_XMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_vpabsd_YMM1_YMM2_icebp_c32,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_vpabsd_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_pabsb_MM1_MM2_icebp_c32,     255,         RM_REG, T_MMX_SSSE3, MM1,  MM2,   RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_pabsb_MM1_FSxBX_icebp_c32,   255,         RM_MEM, T_MMX_SSSE3, MM1,  FSxBX, RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_pabsb_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSSE3,     XMM1, XMM2,  RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_pabsb_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSSE3,     XMM1, FSxBX, RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_vpabsb_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128,   XMM1, XMM2,  RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_vpabsb_XMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128,   XMM1, FSxBX, RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_vpabsb_YMM1_YMM2_icebp_c32,  255,         RM_REG, T_AVX_256,   YMM1, YMM2,  RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_vpabsb_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256,   YMM1, FSxBX, RT_ELEMENTS(s_aValuesB), s_aValuesB },
+
+        {  bs3CpuInstr3_pabsw_MM1_MM2_icebp_c32,     255,         RM_REG, T_MMX_SSSE3, MM1,  MM2,   RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_pabsw_MM1_FSxBX_icebp_c32,   255,         RM_MEM, T_MMX_SSSE3, MM1,  FSxBX, RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_pabsw_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSSE3,     XMM1, XMM2,  RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_pabsw_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSSE3,     XMM1, FSxBX, RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_vpabsw_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128,   XMM1, XMM2,  RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_vpabsw_XMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128,   XMM1, FSxBX, RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_vpabsw_YMM1_YMM2_icebp_c32,  255,         RM_REG, T_AVX_256,   YMM1, YMM2,  RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_vpabsw_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256,   YMM1, FSxBX, RT_ELEMENTS(s_aValuesW), s_aValuesW },
+
+        {  bs3CpuInstr3_pabsd_MM1_MM2_icebp_c32,     255,         RM_REG, T_MMX_SSSE3, MM1,  MM2,   RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_pabsd_MM1_FSxBX_icebp_c32,   255,         RM_MEM, T_MMX_SSSE3, MM1,  FSxBX, RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_pabsd_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSSE3,     XMM1, XMM2,  RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_pabsd_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSSE3,     XMM1, FSxBX, RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_vpabsd_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128,   XMM1, XMM2,  RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_vpabsd_XMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128,   XMM1, FSxBX, RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_vpabsd_YMM1_YMM2_icebp_c32,  255,         RM_REG, T_AVX_256,   YMM1, YMM2,  RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_vpabsd_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256,   YMM1, FSxBX, RT_ELEMENTS(s_aValuesD), s_aValuesD },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_pabsb_MM1_MM2_icebp_c64,     255,         RM_REG, T_MMX_SSSE3, 1,   2, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_pabsb_MM1_FSxBX_icebp_c64,   255,         RM_MEM, T_MMX_SSSE3, 1, 255, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_pabsb_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSSE3,     1,   2, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_pabsb_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSSE3,     1, 255, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_pabsb_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSSE3,     9,   8, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_pabsb_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSSE3,     9, 255, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_vpabsb_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_vpabsb_XMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_vpabsb_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128,   9,   8, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_vpabsb_XMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,   9, 255, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_vpabsb_YMM1_YMM2_icebp_c64,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_vpabsb_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_vpabsb_YMM9_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256,   9,   8, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-        {  bs3CpuInstr3_vpabsb_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   9, 255, RT_ELEMENTS(s_aValuesB), s_aValuesB },
-
-        {  bs3CpuInstr3_pabsw_MM1_MM2_icebp_c64,     255,         RM_REG, T_MMX_SSSE3, 1,   2, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_pabsw_MM1_FSxBX_icebp_c64,   255,         RM_MEM, T_MMX_SSSE3, 1, 255, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_pabsw_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSSE3,     1,   2, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_pabsw_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSSE3,     1, 255, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_pabsw_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSSE3,     9,   8, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_pabsw_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSSE3,     9, 255, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_vpabsw_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_vpabsw_XMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_vpabsw_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128,   9,   8, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_vpabsw_XMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,   9, 255, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_vpabsw_YMM1_YMM2_icebp_c64,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_vpabsw_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_vpabsw_YMM9_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256,   9,   8, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-        {  bs3CpuInstr3_vpabsw_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   9, 255, RT_ELEMENTS(s_aValuesW), s_aValuesW },
-
-        {  bs3CpuInstr3_pabsd_MM1_MM2_icebp_c64,     255,         RM_REG, T_MMX_SSSE3, 1,   2, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_pabsd_MM1_FSxBX_icebp_c64,   255,         RM_MEM, T_MMX_SSSE3, 1, 255, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_pabsd_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSSE3,     1,   2, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_pabsd_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSSE3,     1, 255, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_pabsd_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSSE3,     9,   8, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_pabsd_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSSE3,     9, 255, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_vpabsd_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_vpabsd_XMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_vpabsd_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128,   9,   8, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_vpabsd_XMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,   9, 255, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_vpabsd_YMM1_YMM2_icebp_c64,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_vpabsd_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_vpabsd_YMM9_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256,   9,   8, RT_ELEMENTS(s_aValuesD), s_aValuesD },
-        {  bs3CpuInstr3_vpabsd_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   9, 255, RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_pabsb_MM1_MM2_icebp_c64,     255,         RM_REG, T_MMX_SSSE3, MM1,  MM2,   RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_pabsb_MM1_FSxBX_icebp_c64,   255,         RM_MEM, T_MMX_SSSE3, MM1,  FSxBX, RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_pabsb_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSSE3,     XMM1, XMM2,  RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_pabsb_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSSE3,     XMM1, FSxBX, RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_pabsb_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSSE3,     XMM9, XMM8,  RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_pabsb_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSSE3,     XMM9, FSxBX, RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_vpabsb_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128,   XMM1, XMM2,  RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_vpabsb_XMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,   XMM1, FSxBX, RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_vpabsb_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128,   XMM9, XMM8,  RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_vpabsb_XMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,   XMM9, FSxBX, RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_vpabsb_YMM1_YMM2_icebp_c64,  255,         RM_REG, T_AVX_256,   YMM1, YMM2,  RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_vpabsb_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   YMM1, FSxBX, RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_vpabsb_YMM9_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256,   YMM9, YMM8,  RT_ELEMENTS(s_aValuesB), s_aValuesB },
+        {  bs3CpuInstr3_vpabsb_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   YMM9, FSxBX, RT_ELEMENTS(s_aValuesB), s_aValuesB },
+
+        {  bs3CpuInstr3_pabsw_MM1_MM2_icebp_c64,     255,         RM_REG, T_MMX_SSSE3, MM1,  MM2,   RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_pabsw_MM1_FSxBX_icebp_c64,   255,         RM_MEM, T_MMX_SSSE3, MM1,  FSxBX, RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_pabsw_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSSE3,     XMM1, XMM2,  RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_pabsw_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSSE3,     XMM1, FSxBX, RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_pabsw_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSSE3,     XMM9, XMM8,  RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_pabsw_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSSE3,     XMM9, FSxBX, RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_vpabsw_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128,   XMM1, XMM2,  RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_vpabsw_XMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,   XMM1, FSxBX, RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_vpabsw_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128,   XMM9, XMM8,  RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_vpabsw_XMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,   XMM9, FSxBX, RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_vpabsw_YMM1_YMM2_icebp_c64,  255,         RM_REG, T_AVX_256,   YMM1, YMM2,  RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_vpabsw_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   YMM1, FSxBX, RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_vpabsw_YMM9_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256,   YMM9, YMM8,  RT_ELEMENTS(s_aValuesW), s_aValuesW },
+        {  bs3CpuInstr3_vpabsw_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   YMM9, FSxBX, RT_ELEMENTS(s_aValuesW), s_aValuesW },
+
+        {  bs3CpuInstr3_pabsd_MM1_MM2_icebp_c64,     255,         RM_REG, T_MMX_SSSE3, MM1,  MM2,   RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_pabsd_MM1_FSxBX_icebp_c64,   255,         RM_MEM, T_MMX_SSSE3, MM1,  FSxBX, RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_pabsd_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSSE3,     XMM1, XMM2,  RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_pabsd_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSSE3,     XMM1, FSxBX, RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_pabsd_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSSE3,     XMM9, XMM8,  RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_pabsd_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSSE3,     XMM9, FSxBX, RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_vpabsd_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128,   XMM1, XMM2,  RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_vpabsd_XMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,   XMM1, FSxBX, RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_vpabsd_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128,   XMM9, XMM8,  RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_vpabsd_XMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,   XMM9, FSxBX, RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_vpabsd_YMM1_YMM2_icebp_c64,  255,         RM_REG, T_AVX_256,   YMM1, YMM2,  RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_vpabsd_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   YMM1, FSxBX, RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_vpabsd_YMM9_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256,   YMM9, YMM8,  RT_ELEMENTS(s_aValuesD), s_aValuesD },
+        {  bs3CpuInstr3_vpabsd_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   YMM9, FSxBX, RT_ELEMENTS(s_aValuesD), s_aValuesD },
     };
     static BS3CPUINSTR3_TEST3_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST3_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -12063,169 +12059,169 @@
     static BS3CPUINSTR3_TEST3_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_pmovsxbw_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_pmovsxbw_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovsxbw_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovsxbw_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovsxbw_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovsxbw_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-
-        {  bs3CpuInstr3_pmovsxbd_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_pmovsxbd_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovsxbd_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovsxbd_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovsxbd_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovsxbd_YMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-
-        {  bs3CpuInstr3_pmovsxbq_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_pmovsxbq_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovsxbq_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovsxbq_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovsxbq_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovsxbq_YMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-
-        {  bs3CpuInstr3_pmovsxwd_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_pmovsxwd_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovsxwd_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovsxwd_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovsxwd_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovsxwd_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-
-        {  bs3CpuInstr3_pmovsxwq_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_pmovsxwq_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovsxwq_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovsxwq_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovsxwq_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovsxwq_YMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-
-        {  bs3CpuInstr3_pmovsxdq_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_pmovsxdq_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovsxdq_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovsxdq_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovsxdq_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovsxdq_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_pmovsxbw_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_pmovsxbw_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovsxbw_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovsxbw_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovsxbw_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovsxbw_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+
+        {  bs3CpuInstr3_pmovsxbd_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_pmovsxbd_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovsxbd_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovsxbd_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovsxbd_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovsxbd_YMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+
+        {  bs3CpuInstr3_pmovsxbq_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_pmovsxbq_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovsxbq_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovsxbq_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovsxbq_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovsxbq_YMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+
+        {  bs3CpuInstr3_pmovsxwd_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_pmovsxwd_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovsxwd_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovsxwd_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovsxwd_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovsxwd_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+
+        {  bs3CpuInstr3_pmovsxwq_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_pmovsxwq_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovsxwq_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovsxwq_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovsxwq_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovsxwq_YMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+
+        {  bs3CpuInstr3_pmovsxdq_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_pmovsxdq_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovsxdq_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovsxdq_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovsxdq_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovsxdq_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_pmovsxbw_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_pmovsxbw_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovsxbw_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovsxbw_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovsxbw_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovsxbw_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-
-        {  bs3CpuInstr3_pmovsxbd_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_pmovsxbd_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovsxbd_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovsxbd_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovsxbd_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovsxbd_YMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-
-        {  bs3CpuInstr3_pmovsxbq_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_pmovsxbq_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovsxbq_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovsxbq_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovsxbq_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovsxbq_YMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-
-        {  bs3CpuInstr3_pmovsxwd_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_pmovsxwd_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovsxwd_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovsxwd_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovsxwd_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovsxwd_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-
-        {  bs3CpuInstr3_pmovsxwq_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_pmovsxwq_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovsxwq_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovsxwq_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovsxwq_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovsxwq_YMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-
-        {  bs3CpuInstr3_pmovsxdq_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_pmovsxdq_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovsxdq_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovsxdq_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovsxdq_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovsxdq_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_pmovsxbw_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_pmovsxbw_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovsxbw_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovsxbw_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovsxbw_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovsxbw_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+
+        {  bs3CpuInstr3_pmovsxbd_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_pmovsxbd_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovsxbd_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovsxbd_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovsxbd_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovsxbd_YMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+
+        {  bs3CpuInstr3_pmovsxbq_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_pmovsxbq_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovsxbq_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovsxbq_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovsxbq_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovsxbq_YMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+
+        {  bs3CpuInstr3_pmovsxwd_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_pmovsxwd_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovsxwd_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovsxwd_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovsxwd_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovsxwd_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+
+        {  bs3CpuInstr3_pmovsxwq_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_pmovsxwq_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovsxwq_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovsxwq_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovsxwq_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovsxwq_YMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+
+        {  bs3CpuInstr3_pmovsxdq_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_pmovsxdq_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovsxdq_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovsxdq_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovsxdq_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovsxdq_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_pmovsxbw_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_pmovsxbw_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_pmovsxbw_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,    9,   8, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_pmovsxbw_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    9, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovsxbw_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovsxbw_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovsxbw_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128,   9,   8, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovsxbw_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   9, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovsxbw_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovsxbw_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovsxbw_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256,   9,   8, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovsxbw_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   9, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-
-        {  bs3CpuInstr3_pmovsxbd_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_pmovsxbd_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_pmovsxbd_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,    9,   8, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_pmovsxbd_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    9, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovsxbd_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovsxbd_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovsxbd_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128,   9,   8, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovsxbd_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   9, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovsxbd_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovsxbd_YMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovsxbd_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256,   9,   8, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovsxbd_YMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256,   9, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-
-        {  bs3CpuInstr3_pmovsxbq_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_pmovsxbq_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_pmovsxbq_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,    9,   8, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_pmovsxbq_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    9, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovsxbq_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovsxbq_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovsxbq_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128,   9,   8, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovsxbq_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   9, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovsxbq_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovsxbq_YMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovsxbq_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256,   9,   8, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovsxbq_YMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256,   9, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-
-        {  bs3CpuInstr3_pmovsxwd_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_pmovsxwd_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_pmovsxwd_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,    9,   8, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_pmovsxwd_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    9, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovsxwd_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovsxwd_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovsxwd_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128,   9,   8, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovsxwd_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   9, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovsxwd_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovsxwd_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovsxwd_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256,   9,   8, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovsxwd_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   9, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-
-        {  bs3CpuInstr3_pmovsxwq_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_pmovsxwq_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_pmovsxwq_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,    9,   8, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_pmovsxwq_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    9, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovsxwq_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovsxwq_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovsxwq_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128,   9,   8, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovsxwq_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   9, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovsxwq_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovsxwq_YMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovsxwq_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256,   9,   8, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovsxwq_YMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256,   9, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-
-        {  bs3CpuInstr3_pmovsxdq_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_pmovsxdq_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_pmovsxdq_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,    9,   8, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_pmovsxdq_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    9, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovsxdq_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovsxdq_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovsxdq_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128,   9,   8, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovsxdq_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   9, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovsxdq_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovsxdq_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovsxdq_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256,   9,   8, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovsxdq_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   9, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_pmovsxbw_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_pmovsxbw_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_pmovsxbw_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM9, XMM8,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_pmovsxbw_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM9, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovsxbw_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovsxbw_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovsxbw_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128, XMM9, XMM8,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovsxbw_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM9, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovsxbw_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovsxbw_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovsxbw_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256, YMM9, XMM8,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovsxbw_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM9, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+
+        {  bs3CpuInstr3_pmovsxbd_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_pmovsxbd_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_pmovsxbd_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM9, XMM8,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_pmovsxbd_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM9, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovsxbd_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovsxbd_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovsxbd_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128, XMM9, XMM8,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovsxbd_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM9, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovsxbd_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovsxbd_YMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovsxbd_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256, YMM9, XMM8,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovsxbd_YMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM9, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+
+        {  bs3CpuInstr3_pmovsxbq_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_pmovsxbq_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_pmovsxbq_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM9, XMM8,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_pmovsxbq_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM9, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovsxbq_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovsxbq_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovsxbq_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128, XMM9, XMM8,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovsxbq_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM9, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovsxbq_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovsxbq_YMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovsxbq_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256, YMM9, XMM8,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovsxbq_YMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM9, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+
+        {  bs3CpuInstr3_pmovsxwd_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_pmovsxwd_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_pmovsxwd_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM9, XMM8,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_pmovsxwd_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM9, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovsxwd_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovsxwd_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovsxwd_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128, XMM9, XMM8,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovsxwd_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM9, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovsxwd_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovsxwd_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovsxwd_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256, YMM9, XMM8,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovsxwd_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM9, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+
+        {  bs3CpuInstr3_pmovsxwq_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_pmovsxwq_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_pmovsxwq_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM9, XMM8,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_pmovsxwq_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM9, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovsxwq_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovsxwq_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovsxwq_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128, XMM9, XMM8,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovsxwq_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM9, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovsxwq_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovsxwq_YMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovsxwq_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256, YMM9, XMM8,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovsxwq_YMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM9, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+
+        {  bs3CpuInstr3_pmovsxdq_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_pmovsxdq_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_pmovsxdq_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM9, XMM8,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_pmovsxdq_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM9, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovsxdq_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovsxdq_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovsxdq_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128, XMM9, XMM8,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovsxdq_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM9, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovsxdq_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovsxdq_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovsxdq_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256, YMM9, XMM8,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovsxdq_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM9, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
     };
     static BS3CPUINSTR3_TEST3_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST3_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -12310,169 +12306,169 @@
     static BS3CPUINSTR3_TEST3_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_pmovzxbw_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_pmovzxbw_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovzxbw_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovzxbw_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovzxbw_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovzxbw_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-
-        {  bs3CpuInstr3_pmovzxbd_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_pmovzxbd_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovzxbd_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovzxbd_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovzxbd_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovzxbd_YMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-
-        {  bs3CpuInstr3_pmovzxbq_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_pmovzxbq_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovzxbq_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovzxbq_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovzxbq_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovzxbq_YMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-
-        {  bs3CpuInstr3_pmovzxwd_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_pmovzxwd_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovzxwd_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovzxwd_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovzxwd_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovzxwd_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-
-        {  bs3CpuInstr3_pmovzxwq_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_pmovzxwq_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovzxwq_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovzxwq_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovzxwq_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovzxwq_YMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-
-        {  bs3CpuInstr3_pmovzxdq_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_pmovzxdq_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovzxdq_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovzxdq_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovzxdq_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovzxdq_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_pmovzxbw_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_pmovzxbw_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovzxbw_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovzxbw_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovzxbw_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovzxbw_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+
+        {  bs3CpuInstr3_pmovzxbd_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_pmovzxbd_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovzxbd_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovzxbd_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovzxbd_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovzxbd_YMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+
+        {  bs3CpuInstr3_pmovzxbq_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_pmovzxbq_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovzxbq_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovzxbq_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovzxbq_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovzxbq_YMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+
+        {  bs3CpuInstr3_pmovzxwd_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_pmovzxwd_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovzxwd_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovzxwd_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovzxwd_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovzxwd_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+
+        {  bs3CpuInstr3_pmovzxwq_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_pmovzxwq_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovzxwq_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovzxwq_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovzxwq_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovzxwq_YMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+
+        {  bs3CpuInstr3_pmovzxdq_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_pmovzxdq_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovzxdq_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovzxdq_XMM1_FSxBX_icebp_c16, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovzxdq_YMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovzxdq_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_pmovzxbw_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_pmovzxbw_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovzxbw_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovzxbw_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovzxbw_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovzxbw_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-
-        {  bs3CpuInstr3_pmovzxbd_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_pmovzxbd_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovzxbd_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovzxbd_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovzxbd_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovzxbd_YMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-
-        {  bs3CpuInstr3_pmovzxbq_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_pmovzxbq_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovzxbq_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovzxbq_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovzxbq_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovzxbq_YMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-
-        {  bs3CpuInstr3_pmovzxwd_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_pmovzxwd_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovzxwd_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovzxwd_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovzxwd_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovzxwd_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-
-        {  bs3CpuInstr3_pmovzxwq_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_pmovzxwq_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovzxwq_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovzxwq_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovzxwq_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovzxwq_YMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-
-        {  bs3CpuInstr3_pmovzxdq_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_pmovzxdq_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovzxdq_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovzxdq_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovzxdq_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovzxdq_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_pmovzxbw_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_pmovzxbw_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovzxbw_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovzxbw_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovzxbw_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovzxbw_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+
+        {  bs3CpuInstr3_pmovzxbd_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_pmovzxbd_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovzxbd_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovzxbd_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovzxbd_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovzxbd_YMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+
+        {  bs3CpuInstr3_pmovzxbq_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_pmovzxbq_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovzxbq_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovzxbq_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovzxbq_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovzxbq_YMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+
+        {  bs3CpuInstr3_pmovzxwd_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_pmovzxwd_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovzxwd_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovzxwd_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovzxwd_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovzxwd_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+
+        {  bs3CpuInstr3_pmovzxwq_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_pmovzxwq_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovzxwq_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovzxwq_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovzxwq_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovzxwq_YMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+
+        {  bs3CpuInstr3_pmovzxdq_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_pmovzxdq_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovzxdq_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovzxdq_XMM1_FSxBX_icebp_c32, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovzxdq_YMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovzxdq_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_pmovzxbw_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_pmovzxbw_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_pmovzxbw_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,    9,   8, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_pmovzxbw_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    9, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovzxbw_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovzxbw_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovzxbw_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128,   9,   8, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovzxbw_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   9, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovzxbw_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovzxbw_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovzxbw_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256,   9,   8, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-        {  bs3CpuInstr3_vpmovzxbw_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   9, 255, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
-
-        {  bs3CpuInstr3_pmovzxbd_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_pmovzxbd_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_pmovzxbd_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,    9,   8, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_pmovzxbd_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    9, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovzxbd_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovzxbd_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovzxbd_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128,   9,   8, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovzxbd_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   9, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovzxbd_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovzxbd_YMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovzxbd_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256,   9,   8, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-        {  bs3CpuInstr3_vpmovzxbd_YMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256,   9, 255, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
-
-        {  bs3CpuInstr3_pmovzxbq_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_pmovzxbq_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_pmovzxbq_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,    9,   8, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_pmovzxbq_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    9, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovzxbq_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovzxbq_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovzxbq_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128,   9,   8, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovzxbq_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   9, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovzxbq_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovzxbq_YMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovzxbq_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256,   9,   8, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-        {  bs3CpuInstr3_vpmovzxbq_YMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256,   9, 255, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
-
-        {  bs3CpuInstr3_pmovzxwd_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_pmovzxwd_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_pmovzxwd_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,    9,   8, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_pmovzxwd_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    9, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovzxwd_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovzxwd_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovzxwd_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128,   9,   8, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovzxwd_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   9, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovzxwd_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovzxwd_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovzxwd_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256,   9,   8, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-        {  bs3CpuInstr3_vpmovzxwd_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   9, 255, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
-
-        {  bs3CpuInstr3_pmovzxwq_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_pmovzxwq_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_pmovzxwq_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,    9,   8, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_pmovzxwq_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    9, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovzxwq_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovzxwq_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovzxwq_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128,   9,   8, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovzxwq_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   9, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovzxwq_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovzxwq_YMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovzxwq_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256,   9,   8, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-        {  bs3CpuInstr3_vpmovzxwq_YMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256,   9, 255, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
-
-        {  bs3CpuInstr3_pmovzxdq_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_pmovzxdq_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_pmovzxdq_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,    9,   8, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_pmovzxdq_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    9, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovzxdq_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovzxdq_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovzxdq_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128,   9,   8, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovzxdq_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128,   9, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovzxdq_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256,   1,   2, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovzxdq_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovzxdq_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256,   9,   8, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
-        {  bs3CpuInstr3_vpmovzxdq_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,   9, 255, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_pmovzxbw_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_pmovzxbw_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_pmovzxbw_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM9, XMM8,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_pmovzxbw_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM9, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovzxbw_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovzxbw_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovzxbw_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128, XMM9, XMM8,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovzxbw_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM9, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovzxbw_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovzxbw_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovzxbw_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256, YMM9, XMM8,  RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+        {  bs3CpuInstr3_vpmovzxbw_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM9, FSxBX, RT_ELEMENTS(s_aValuesBW), s_aValuesBW },
+
+        {  bs3CpuInstr3_pmovzxbd_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_pmovzxbd_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_pmovzxbd_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM9, XMM8,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_pmovzxbd_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM9, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovzxbd_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovzxbd_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovzxbd_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128, XMM9, XMM8,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovzxbd_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM9, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovzxbd_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovzxbd_YMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovzxbd_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256, YMM9, XMM8,  RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+        {  bs3CpuInstr3_vpmovzxbd_YMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM9, FSxBX, RT_ELEMENTS(s_aValuesBD), s_aValuesBD },
+
+        {  bs3CpuInstr3_pmovzxbq_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_pmovzxbq_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_pmovzxbq_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM9, XMM8,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_pmovzxbq_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM9, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovzxbq_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovzxbq_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovzxbq_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128, XMM9, XMM8,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovzxbq_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM9, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovzxbq_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovzxbq_YMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovzxbq_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256, YMM9, XMM8,  RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+        {  bs3CpuInstr3_vpmovzxbq_YMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM9, FSxBX, RT_ELEMENTS(s_aValuesBQ), s_aValuesBQ },
+
+        {  bs3CpuInstr3_pmovzxwd_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_pmovzxwd_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_pmovzxwd_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM9, XMM8,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_pmovzxwd_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM9, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovzxwd_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovzxwd_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovzxwd_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128, XMM9, XMM8,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovzxwd_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM9, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovzxwd_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovzxwd_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovzxwd_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256, YMM9, XMM8,  RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+        {  bs3CpuInstr3_vpmovzxwd_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM9, FSxBX, RT_ELEMENTS(s_aValuesWD), s_aValuesWD },
+
+        {  bs3CpuInstr3_pmovzxwq_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_pmovzxwq_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_pmovzxwq_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM9, XMM8,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_pmovzxwq_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM9, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovzxwq_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovzxwq_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovzxwq_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128, XMM9, XMM8,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovzxwq_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM9, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovzxwq_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovzxwq_YMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovzxwq_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256, YMM9, XMM8,  RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+        {  bs3CpuInstr3_vpmovzxwq_YMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_256, YMM9, FSxBX, RT_ELEMENTS(s_aValuesWQ), s_aValuesWQ },
+
+        {  bs3CpuInstr3_pmovzxdq_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_pmovzxdq_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_pmovzxdq_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM9, XMM8,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_pmovzxdq_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM9, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovzxdq_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovzxdq_XMM1_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovzxdq_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128, XMM9, XMM8,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovzxdq_XMM9_FSxBX_icebp_c64, X86_XCPT_AC, RM_MEM, T_AVX_128, XMM9, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovzxdq_YMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_256, YMM1, XMM2,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovzxdq_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovzxdq_YMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_256, YMM9, XMM8,  RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
+        {  bs3CpuInstr3_vpmovzxdq_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM9, FSxBX, RT_ELEMENTS(s_aValuesDQ), s_aValuesDQ },
     };
     static BS3CPUINSTR3_TEST3_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST3_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -12490,27 +12486,28 @@
     static BS3CPUINSTR3_TEST3_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_lddqu_XMM1_FSxBX_icebp_c16,       X86_XCPT_DB, RM_MEM, T_SSE3,      1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vlddqu_XMM1_FSxBX_icebp_c16,      X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vlddqu_YMM1_FSxBX_icebp_c16,      X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_lddqu_XMM1_FSxBX_icebp_c16,   X86_XCPT_DB, RM_MEM, T_SSE3,    XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vlddqu_XMM1_FSxBX_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vlddqu_YMM1_FSxBX_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_lddqu_XMM1_FSxBX_icebp_c32,       X86_XCPT_DB, RM_MEM, T_SSE3,      1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vlddqu_XMM1_FSxBX_icebp_c32,      X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vlddqu_YMM1_FSxBX_icebp_c32,      X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_lddqu_XMM1_FSxBX_icebp_c32,   X86_XCPT_DB, RM_MEM, T_SSE3,    XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vlddqu_XMM1_FSxBX_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vlddqu_YMM1_FSxBX_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_lddqu_XMM1_FSxBX_icebp_c64,       X86_XCPT_DB, RM_MEM, T_SSE3,      1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_lddqu_XMM10_FSxBX_icebp_c64,      X86_XCPT_DB, RM_MEM, T_SSE3,     10, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vlddqu_XMM1_FSxBX_icebp_c64,      X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vlddqu_XMM11_FSxBX_icebp_c64,     X86_XCPT_DB, RM_MEM, T_AVX_128,  11, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-
-        {  bs3CpuInstr3_vlddqu_YMM1_FSxBX_icebp_c64,      X86_XCPT_DB, RM_MEM, T_AVX_256,   1, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
-        {  bs3CpuInstr3_vlddqu_YMM12_FSxBX_icebp_c64,     X86_XCPT_DB, RM_MEM, T_AVX_256,  12, 255, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_lddqu_XMM1_FSxBX_icebp_c64,   X86_XCPT_DB, RM_MEM, T_SSE3,    XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_lddqu_XMM10_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_SSE3,    XMM10, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vlddqu_XMM1_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vlddqu_XMM11_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128, XMM11, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+
+        {  bs3CpuInstr3_vlddqu_YMM1_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1,  FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
+        {  bs3CpuInstr3_vlddqu_YMM12_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM12, FSxBX, RT_ELEMENTS(g_aMoveValues3), g_aMoveValues3 },
     };
     static BS3CPUINSTR3_TEST3_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST3_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -12540,26 +12537,26 @@
     static BS3CPUINSTR3_TEST3_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_phminposuw_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_phminposuw_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vphminposuw_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vphminposuw_XMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_phminposuw_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_phminposuw_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vphminposuw_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vphminposuw_XMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_phminposuw_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_phminposuw_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vphminposuw_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vphminposuw_XMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_phminposuw_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_phminposuw_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vphminposuw_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vphminposuw_XMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_phminposuw_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,    1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_phminposuw_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_phminposuw_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,    9,   8, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_phminposuw_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,    9, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vphminposuw_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vphminposuw_XMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vphminposuw_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128,   9,   8, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vphminposuw_XMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,   9, 255, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_phminposuw_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_phminposuw_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_phminposuw_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM9, XMM8,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_phminposuw_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM9, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vphminposuw_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vphminposuw_XMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vphminposuw_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128, XMM9, XMM8,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vphminposuw_XMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128, XMM9, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
     };
     static BS3CPUINSTR3_TEST3_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST3_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -12571,5 +12568,5 @@
 
 /*
- * VBROADCASTSS/VBROADCASTSD
+ * VBROADCASTSS/VBROADCASTSD/VBROADCASTF128
  */
 BS3_DECL_FAR(uint8_t) bs3CpuInstr3_vbroadcastss_vbroadcastsd_vbroadcastf128(uint8_t bMode)
@@ -12601,45 +12598,44 @@
     static BS3CPUINSTR3_TEST3_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_vbroadcastss_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX2_128,    1,   2, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vbroadcastss_XMM1_FSxBX_icebp_c16,  X86_XCPT_AC, RM_MEM, T_AVX_128,     1, 255, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vbroadcastss_YMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX2_256,    1,   2, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vbroadcastss_YMM1_FSxBX_icebp_c16,  X86_XCPT_AC, RM_MEM, T_AVX_256,     1, 255, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-
-        {  bs3CpuInstr3_vbroadcastsd_YMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX2_256,    1,   2, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-        {  bs3CpuInstr3_vbroadcastsd_YMM1_FSxBX_icebp_c16,  X86_XCPT_AC, RM_MEM, T_AVX_256,     1, 255, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-
-        {  bs3CpuInstr3_vbroadcastf128_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256,    1, 255, RT_ELEMENTS(s_aValues128), s_aValues128 },
+        {  bs3CpuInstr3_vbroadcastss_XMM1_XMM2_icebp_c16,    255,         RM_REG, T_AVX2_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vbroadcastss_XMM1_FSxBX_icebp_c16,   X86_XCPT_AC, RM_MEM, T_AVX_128,  XMM1, FSxBX, RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vbroadcastss_YMM1_XMM2_icebp_c16,    255,         RM_REG, T_AVX2_256, YMM1, XMM2,  RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vbroadcastss_YMM1_FSxBX_icebp_c16,   X86_XCPT_AC, RM_MEM, T_AVX_256,  YMM1, FSxBX, RT_ELEMENTS(s_aValues32),  s_aValues32  },
+
+        {  bs3CpuInstr3_vbroadcastsd_YMM1_XMM2_icebp_c16,    255,         RM_REG, T_AVX2_256, YMM1, XMM2,  RT_ELEMENTS(s_aValues64),  s_aValues64  },
+        {  bs3CpuInstr3_vbroadcastsd_YMM1_FSxBX_icebp_c16,   X86_XCPT_AC, RM_MEM, T_AVX_256,  YMM1, FSxBX, RT_ELEMENTS(s_aValues64),  s_aValues64  },
+
+        {  bs3CpuInstr3_vbroadcastf128_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256,  YMM1, FSxBX, RT_ELEMENTS(s_aValues128), s_aValues128 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_vbroadcastss_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX2_128,    1,   2, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vbroadcastss_XMM1_FSxBX_icebp_c32,  X86_XCPT_AC, RM_MEM, T_AVX_128,     1, 255, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vbroadcastss_YMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX2_256,    1,   2, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vbroadcastss_YMM1_FSxBX_icebp_c32,  X86_XCPT_AC, RM_MEM, T_AVX_256,     1, 255, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-
-        {  bs3CpuInstr3_vbroadcastsd_YMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX2_256,    1,   2, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-        {  bs3CpuInstr3_vbroadcastsd_YMM1_FSxBX_icebp_c32,  X86_XCPT_AC, RM_MEM, T_AVX_256,     1, 255, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-
-        {  bs3CpuInstr3_vbroadcastf128_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256,    1, 255, RT_ELEMENTS(s_aValues128), s_aValues128 },
+        {  bs3CpuInstr3_vbroadcastss_XMM1_XMM2_icebp_c32,    255,         RM_REG, T_AVX2_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vbroadcastss_XMM1_FSxBX_icebp_c32,   X86_XCPT_AC, RM_MEM, T_AVX_128,  XMM1, FSxBX, RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vbroadcastss_YMM1_XMM2_icebp_c32,    255,         RM_REG, T_AVX2_256, YMM1, XMM2,  RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vbroadcastss_YMM1_FSxBX_icebp_c32,   X86_XCPT_AC, RM_MEM, T_AVX_256,  YMM1, FSxBX, RT_ELEMENTS(s_aValues32),  s_aValues32  },
+
+        {  bs3CpuInstr3_vbroadcastsd_YMM1_XMM2_icebp_c32,    255,         RM_REG, T_AVX2_256, YMM1, XMM2,  RT_ELEMENTS(s_aValues64),  s_aValues64  },
+        {  bs3CpuInstr3_vbroadcastsd_YMM1_FSxBX_icebp_c32,   X86_XCPT_AC, RM_MEM, T_AVX_256,  YMM1, FSxBX, RT_ELEMENTS(s_aValues64),  s_aValues64  },
+
+        {  bs3CpuInstr3_vbroadcastf128_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256,  YMM1, FSxBX, RT_ELEMENTS(s_aValues128), s_aValues128 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_vbroadcastss_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX2_128,    1,   2, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vbroadcastss_XMM1_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM, T_AVX_128,     1, 255, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vbroadcastss_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_AVX2_128,    9,   8, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vbroadcastss_XMM9_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM, T_AVX_128,     9, 255, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vbroadcastss_YMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX2_256,    1,   2, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vbroadcastss_YMM1_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM, T_AVX_256,     1, 255, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vbroadcastss_YMM9_XMM8_icebp_c64,   255,         RM_REG, T_AVX2_256,    9,   8, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vbroadcastss_YMM9_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM, T_AVX_256,     9, 255, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-
-        {  bs3CpuInstr3_vbroadcastsd_YMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX2_256,    1,   2, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-        {  bs3CpuInstr3_vbroadcastsd_YMM1_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM, T_AVX_256,     1, 255, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-        {  bs3CpuInstr3_vbroadcastsd_YMM9_XMM8_icebp_c64,   255,         RM_REG, T_AVX2_256,    9,   8, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-        {  bs3CpuInstr3_vbroadcastsd_YMM9_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM, T_AVX_256,     9, 255, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-
-        {  bs3CpuInstr3_vbroadcastf128_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,    1, 255, RT_ELEMENTS(s_aValues128), s_aValues128 },
-        {  bs3CpuInstr3_vbroadcastf128_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,    9, 255, RT_ELEMENTS(s_aValues128), s_aValues128 },
-
+        {  bs3CpuInstr3_vbroadcastss_XMM1_XMM2_icebp_c64,    255,         RM_REG, T_AVX2_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vbroadcastss_XMM1_FSxBX_icebp_c64,   X86_XCPT_AC, RM_MEM, T_AVX_128,  XMM1, FSxBX, RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vbroadcastss_XMM9_XMM8_icebp_c64,    255,         RM_REG, T_AVX2_128, XMM9, XMM8,  RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vbroadcastss_XMM9_FSxBX_icebp_c64,   X86_XCPT_AC, RM_MEM, T_AVX_128,  XMM9, FSxBX, RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vbroadcastss_YMM1_XMM2_icebp_c64,    255,         RM_REG, T_AVX2_256, YMM1, XMM2,  RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vbroadcastss_YMM1_FSxBX_icebp_c64,   X86_XCPT_AC, RM_MEM, T_AVX_256,  YMM1, FSxBX, RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vbroadcastss_YMM9_XMM8_icebp_c64,    255,         RM_REG, T_AVX2_256, YMM9, XMM8,  RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vbroadcastss_YMM9_FSxBX_icebp_c64,   X86_XCPT_AC, RM_MEM, T_AVX_256,  YMM9, FSxBX, RT_ELEMENTS(s_aValues32),  s_aValues32  },
+
+        {  bs3CpuInstr3_vbroadcastsd_YMM1_XMM2_icebp_c64,    255,         RM_REG, T_AVX2_256, YMM1, XMM2,  RT_ELEMENTS(s_aValues64),  s_aValues64  },
+        {  bs3CpuInstr3_vbroadcastsd_YMM1_FSxBX_icebp_c64,   X86_XCPT_AC, RM_MEM, T_AVX_256,  YMM1, FSxBX, RT_ELEMENTS(s_aValues64),  s_aValues64  },
+        {  bs3CpuInstr3_vbroadcastsd_YMM9_XMM8_icebp_c64,    255,         RM_REG, T_AVX2_256, YMM9, XMM8,  RT_ELEMENTS(s_aValues64),  s_aValues64  },
+        {  bs3CpuInstr3_vbroadcastsd_YMM9_FSxBX_icebp_c64,   X86_XCPT_AC, RM_MEM, T_AVX_256,  YMM9, FSxBX, RT_ELEMENTS(s_aValues64),  s_aValues64  },
+
+        {  bs3CpuInstr3_vbroadcastf128_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,  YMM1, FSxBX, RT_ELEMENTS(s_aValues128), s_aValues128 },
+        {  bs3CpuInstr3_vbroadcastf128_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,  YMM9, FSxBX, RT_ELEMENTS(s_aValues128), s_aValues128 },
     };
     static BS3CPUINSTR3_TEST3_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST3_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -12697,90 +12693,90 @@
     static BS3CPUINSTR3_TEST3_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_vpbroadcastb_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX2_128,    1,   2, RT_ELEMENTS(s_aValues8),   s_aValues8   },
-        {  bs3CpuInstr3_vpbroadcastb_XMM1_FSxBX_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX2_128,    1, 255, RT_ELEMENTS(s_aValues8),   s_aValues8   },
-        {  bs3CpuInstr3_vpbroadcastb_YMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX2_256,    1,   2, RT_ELEMENTS(s_aValues8),   s_aValues8   },
-        {  bs3CpuInstr3_vpbroadcastb_YMM1_FSxBX_icebp_c16,  X86_XCPT_DB, RM_MEM, T_AVX2_256,    1, 255, RT_ELEMENTS(s_aValues8),   s_aValues8   },
-
-        {  bs3CpuInstr3_vpbroadcastw_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX2_128,    1,   2, RT_ELEMENTS(s_aValues16),  s_aValues16  },
-        {  bs3CpuInstr3_vpbroadcastw_XMM1_FSxBX_icebp_c16,  X86_XCPT_AC, RM_MEM, T_AVX2_128,    1, 255, RT_ELEMENTS(s_aValues16),  s_aValues16  },
-        {  bs3CpuInstr3_vpbroadcastw_YMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX2_256,    1,   2, RT_ELEMENTS(s_aValues16),  s_aValues16  },
-        {  bs3CpuInstr3_vpbroadcastw_YMM1_FSxBX_icebp_c16,  X86_XCPT_AC, RM_MEM, T_AVX2_256,    1, 255, RT_ELEMENTS(s_aValues16),  s_aValues16  },
-
-        {  bs3CpuInstr3_vpbroadcastd_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX2_128,    1,   2, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vpbroadcastd_XMM1_FSxBX_icebp_c16,  X86_XCPT_AC, RM_MEM, T_AVX2_128,    1, 255, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vpbroadcastd_YMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX2_256,    1,   2, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vpbroadcastd_YMM1_FSxBX_icebp_c16,  X86_XCPT_AC, RM_MEM, T_AVX2_256,    1, 255, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-
-        {  bs3CpuInstr3_vpbroadcastq_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX2_128,    1,   2, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-        {  bs3CpuInstr3_vpbroadcastq_XMM1_FSxBX_icebp_c16,  X86_XCPT_AC, RM_MEM, T_AVX2_128,    1, 255, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-        {  bs3CpuInstr3_vpbroadcastq_YMM1_XMM2_icebp_c16,   255,         RM_REG, T_AVX2_256,    1,   2, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-        {  bs3CpuInstr3_vpbroadcastq_YMM1_FSxBX_icebp_c16,  X86_XCPT_AC, RM_MEM, T_AVX2_256,    1, 255, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-
-        {  bs3CpuInstr3_vbroadcasti128_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256,    1, 255, RT_ELEMENTS(s_aValues128), s_aValues128 },
+        {  bs3CpuInstr3_vpbroadcastb_XMM1_XMM2_icebp_c16,    255,         RM_REG, T_AVX2_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues8),   s_aValues8   },
+        {  bs3CpuInstr3_vpbroadcastb_XMM1_FSxBX_icebp_c16,   X86_XCPT_DB, RM_MEM, T_AVX2_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues8),   s_aValues8   },
+        {  bs3CpuInstr3_vpbroadcastb_YMM1_XMM2_icebp_c16,    255,         RM_REG, T_AVX2_256, YMM1, XMM2,  RT_ELEMENTS(s_aValues8),   s_aValues8   },
+        {  bs3CpuInstr3_vpbroadcastb_YMM1_FSxBX_icebp_c16,   X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues8),   s_aValues8   },
+
+        {  bs3CpuInstr3_vpbroadcastw_XMM1_XMM2_icebp_c16,    255,         RM_REG, T_AVX2_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues16),  s_aValues16  },
+        {  bs3CpuInstr3_vpbroadcastw_XMM1_FSxBX_icebp_c16,   X86_XCPT_AC, RM_MEM, T_AVX2_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues16),  s_aValues16  },
+        {  bs3CpuInstr3_vpbroadcastw_YMM1_XMM2_icebp_c16,    255,         RM_REG, T_AVX2_256, YMM1, XMM2,  RT_ELEMENTS(s_aValues16),  s_aValues16  },
+        {  bs3CpuInstr3_vpbroadcastw_YMM1_FSxBX_icebp_c16,   X86_XCPT_AC, RM_MEM, T_AVX2_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues16),  s_aValues16  },
+
+        {  bs3CpuInstr3_vpbroadcastd_XMM1_XMM2_icebp_c16,    255,         RM_REG, T_AVX2_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vpbroadcastd_XMM1_FSxBX_icebp_c16,   X86_XCPT_AC, RM_MEM, T_AVX2_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vpbroadcastd_YMM1_XMM2_icebp_c16,    255,         RM_REG, T_AVX2_256, YMM1, XMM2,  RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vpbroadcastd_YMM1_FSxBX_icebp_c16,   X86_XCPT_AC, RM_MEM, T_AVX2_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues32),  s_aValues32  },
+
+        {  bs3CpuInstr3_vpbroadcastq_XMM1_XMM2_icebp_c16,    255,         RM_REG, T_AVX2_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues64),  s_aValues64  },
+        {  bs3CpuInstr3_vpbroadcastq_XMM1_FSxBX_icebp_c16,   X86_XCPT_AC, RM_MEM, T_AVX2_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues64),  s_aValues64  },
+        {  bs3CpuInstr3_vpbroadcastq_YMM1_XMM2_icebp_c16,    255,         RM_REG, T_AVX2_256, YMM1, XMM2,  RT_ELEMENTS(s_aValues64),  s_aValues64  },
+        {  bs3CpuInstr3_vpbroadcastq_YMM1_FSxBX_icebp_c16,   X86_XCPT_AC, RM_MEM, T_AVX2_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues64),  s_aValues64  },
+
+        {  bs3CpuInstr3_vbroadcasti128_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues128), s_aValues128 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_vpbroadcastb_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX2_128,    1,   2, RT_ELEMENTS(s_aValues8),   s_aValues8   },
-        {  bs3CpuInstr3_vpbroadcastb_XMM1_FSxBX_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX2_128,    1, 255, RT_ELEMENTS(s_aValues8),   s_aValues8   },
-        {  bs3CpuInstr3_vpbroadcastb_YMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX2_256,    1,   2, RT_ELEMENTS(s_aValues8),   s_aValues8   },
-        {  bs3CpuInstr3_vpbroadcastb_YMM1_FSxBX_icebp_c32,  X86_XCPT_DB, RM_MEM, T_AVX2_256,    1, 255, RT_ELEMENTS(s_aValues8),   s_aValues8   },
-
-        {  bs3CpuInstr3_vpbroadcastw_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX2_128,    1,   2, RT_ELEMENTS(s_aValues16),  s_aValues16  },
-        {  bs3CpuInstr3_vpbroadcastw_XMM1_FSxBX_icebp_c32,  X86_XCPT_AC, RM_MEM, T_AVX2_128,    1, 255, RT_ELEMENTS(s_aValues16),  s_aValues16  },
-        {  bs3CpuInstr3_vpbroadcastw_YMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX2_256,    1,   2, RT_ELEMENTS(s_aValues16),  s_aValues16  },
-        {  bs3CpuInstr3_vpbroadcastw_YMM1_FSxBX_icebp_c32,  X86_XCPT_AC, RM_MEM, T_AVX2_256,    1, 255, RT_ELEMENTS(s_aValues16),  s_aValues16  },
-
-        {  bs3CpuInstr3_vpbroadcastd_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX2_128,    1,   2, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vpbroadcastd_XMM1_FSxBX_icebp_c32,  X86_XCPT_AC, RM_MEM, T_AVX2_128,    1, 255, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vpbroadcastd_YMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX2_256,    1,   2, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vpbroadcastd_YMM1_FSxBX_icebp_c32,  X86_XCPT_AC, RM_MEM, T_AVX2_256,    1, 255, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-
-        {  bs3CpuInstr3_vpbroadcastq_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX2_128,    1,   2, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-        {  bs3CpuInstr3_vpbroadcastq_XMM1_FSxBX_icebp_c32,  X86_XCPT_AC, RM_MEM, T_AVX2_128,    1, 255, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-        {  bs3CpuInstr3_vpbroadcastq_YMM1_XMM2_icebp_c32,   255,         RM_REG, T_AVX2_256,    1,   2, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-        {  bs3CpuInstr3_vpbroadcastq_YMM1_FSxBX_icebp_c32,  X86_XCPT_AC, RM_MEM, T_AVX2_256,    1, 255, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-
-        {  bs3CpuInstr3_vbroadcasti128_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256,    1, 255, RT_ELEMENTS(s_aValues128), s_aValues128 },
+        {  bs3CpuInstr3_vpbroadcastb_XMM1_XMM2_icebp_c32,    255,         RM_REG, T_AVX2_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues8),   s_aValues8   },
+        {  bs3CpuInstr3_vpbroadcastb_XMM1_FSxBX_icebp_c32,   X86_XCPT_DB, RM_MEM, T_AVX2_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues8),   s_aValues8   },
+        {  bs3CpuInstr3_vpbroadcastb_YMM1_XMM2_icebp_c32,    255,         RM_REG, T_AVX2_256, YMM1, XMM2,  RT_ELEMENTS(s_aValues8),   s_aValues8   },
+        {  bs3CpuInstr3_vpbroadcastb_YMM1_FSxBX_icebp_c32,   X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues8),   s_aValues8   },
+
+        {  bs3CpuInstr3_vpbroadcastw_XMM1_XMM2_icebp_c32,    255,         RM_REG, T_AVX2_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues16),  s_aValues16  },
+        {  bs3CpuInstr3_vpbroadcastw_XMM1_FSxBX_icebp_c32,   X86_XCPT_AC, RM_MEM, T_AVX2_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues16),  s_aValues16  },
+        {  bs3CpuInstr3_vpbroadcastw_YMM1_XMM2_icebp_c32,    255,         RM_REG, T_AVX2_256, YMM1, XMM2,  RT_ELEMENTS(s_aValues16),  s_aValues16  },
+        {  bs3CpuInstr3_vpbroadcastw_YMM1_FSxBX_icebp_c32,   X86_XCPT_AC, RM_MEM, T_AVX2_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues16),  s_aValues16  },
+
+        {  bs3CpuInstr3_vpbroadcastd_XMM1_XMM2_icebp_c32,    255,         RM_REG, T_AVX2_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vpbroadcastd_XMM1_FSxBX_icebp_c32,   X86_XCPT_AC, RM_MEM, T_AVX2_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vpbroadcastd_YMM1_XMM2_icebp_c32,    255,         RM_REG, T_AVX2_256, YMM1, XMM2,  RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vpbroadcastd_YMM1_FSxBX_icebp_c32,   X86_XCPT_AC, RM_MEM, T_AVX2_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues32),  s_aValues32  },
+
+        {  bs3CpuInstr3_vpbroadcastq_XMM1_XMM2_icebp_c32,    255,         RM_REG, T_AVX2_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues64),  s_aValues64  },
+        {  bs3CpuInstr3_vpbroadcastq_XMM1_FSxBX_icebp_c32,   X86_XCPT_AC, RM_MEM, T_AVX2_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues64),  s_aValues64  },
+        {  bs3CpuInstr3_vpbroadcastq_YMM1_XMM2_icebp_c32,    255,         RM_REG, T_AVX2_256, YMM1, XMM2,  RT_ELEMENTS(s_aValues64),  s_aValues64  },
+        {  bs3CpuInstr3_vpbroadcastq_YMM1_FSxBX_icebp_c32,   X86_XCPT_AC, RM_MEM, T_AVX2_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues64),  s_aValues64  },
+
+        {  bs3CpuInstr3_vbroadcasti128_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues128), s_aValues128 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_vpbroadcastb_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX2_128,    1,   2, RT_ELEMENTS(s_aValues8),   s_aValues8   },
-        {  bs3CpuInstr3_vpbroadcastb_XMM1_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX2_128,    1, 255, RT_ELEMENTS(s_aValues8),   s_aValues8   },
-        {  bs3CpuInstr3_vpbroadcastb_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_AVX2_128,    9,   8, RT_ELEMENTS(s_aValues8),   s_aValues8   },
-        {  bs3CpuInstr3_vpbroadcastb_XMM9_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX2_128,    9, 255, RT_ELEMENTS(s_aValues8),   s_aValues8   },
-        {  bs3CpuInstr3_vpbroadcastb_YMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX2_256,    1,   2, RT_ELEMENTS(s_aValues8),   s_aValues8   },
-        {  bs3CpuInstr3_vpbroadcastb_YMM1_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX2_256,    1, 255, RT_ELEMENTS(s_aValues8),   s_aValues8   },
-        {  bs3CpuInstr3_vpbroadcastb_YMM9_XMM8_icebp_c64,   255,         RM_REG, T_AVX2_256,    9,   8, RT_ELEMENTS(s_aValues8),   s_aValues8   },
-        {  bs3CpuInstr3_vpbroadcastb_YMM9_FSxBX_icebp_c64,  X86_XCPT_DB, RM_MEM, T_AVX2_256,    9, 255, RT_ELEMENTS(s_aValues8),   s_aValues8   },
-
-        {  bs3CpuInstr3_vpbroadcastw_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX2_128,    1,   2, RT_ELEMENTS(s_aValues16),  s_aValues16  },
-        {  bs3CpuInstr3_vpbroadcastw_XMM1_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM, T_AVX2_128,    1, 255, RT_ELEMENTS(s_aValues16),  s_aValues16  },
-        {  bs3CpuInstr3_vpbroadcastw_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_AVX2_128,    9,   8, RT_ELEMENTS(s_aValues16),  s_aValues16  },
-        {  bs3CpuInstr3_vpbroadcastw_XMM9_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM, T_AVX2_128,    9, 255, RT_ELEMENTS(s_aValues16),  s_aValues16  },
-        {  bs3CpuInstr3_vpbroadcastw_YMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX2_256,    1,   2, RT_ELEMENTS(s_aValues16),  s_aValues16  },
-        {  bs3CpuInstr3_vpbroadcastw_YMM1_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM, T_AVX2_256,    1, 255, RT_ELEMENTS(s_aValues16),  s_aValues16  },
-        {  bs3CpuInstr3_vpbroadcastw_YMM9_XMM8_icebp_c64,   255,         RM_REG, T_AVX2_256,    9,   8, RT_ELEMENTS(s_aValues16),  s_aValues16  },
-        {  bs3CpuInstr3_vpbroadcastw_YMM9_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM, T_AVX2_256,    9, 255, RT_ELEMENTS(s_aValues16),  s_aValues16  },
-
-        {  bs3CpuInstr3_vpbroadcastd_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX2_128,    1,   2, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vpbroadcastd_XMM1_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM, T_AVX2_128,    1, 255, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vpbroadcastd_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_AVX2_128,    9,   8, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vpbroadcastd_XMM9_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM, T_AVX2_128,    9, 255, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vpbroadcastd_YMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX2_256,    1,   2, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vpbroadcastd_YMM1_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM, T_AVX2_256,    1, 255, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vpbroadcastd_YMM9_XMM8_icebp_c64,   255,         RM_REG, T_AVX2_256,    9,   8, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-        {  bs3CpuInstr3_vpbroadcastd_YMM9_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM, T_AVX2_256,    9, 255, RT_ELEMENTS(s_aValues32),  s_aValues32  },
-
-        {  bs3CpuInstr3_vpbroadcastq_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX2_128,    1,   2, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-        {  bs3CpuInstr3_vpbroadcastq_XMM1_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM, T_AVX2_128,    1, 255, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-        {  bs3CpuInstr3_vpbroadcastq_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_AVX2_128,    9,   8, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-        {  bs3CpuInstr3_vpbroadcastq_XMM9_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM, T_AVX2_128,    9, 255, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-        {  bs3CpuInstr3_vpbroadcastq_YMM1_XMM2_icebp_c64,   255,         RM_REG, T_AVX2_256,    1,   2, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-        {  bs3CpuInstr3_vpbroadcastq_YMM1_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM, T_AVX2_256,    1, 255, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-        {  bs3CpuInstr3_vpbroadcastq_YMM9_XMM8_icebp_c64,   255,         RM_REG, T_AVX2_256,    9,   8, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-        {  bs3CpuInstr3_vpbroadcastq_YMM9_FSxBX_icebp_c64,  X86_XCPT_AC, RM_MEM, T_AVX2_256,    9, 255, RT_ELEMENTS(s_aValues64),  s_aValues64  },
-
-        {  bs3CpuInstr3_vbroadcasti128_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_256,   1, 255, RT_ELEMENTS(s_aValues128), s_aValues128 },
-        {  bs3CpuInstr3_vbroadcasti128_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_256,   9, 255, RT_ELEMENTS(s_aValues128), s_aValues128 },
+        {  bs3CpuInstr3_vpbroadcastb_XMM1_XMM2_icebp_c64,    255,         RM_REG, T_AVX2_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues8),   s_aValues8   },
+        {  bs3CpuInstr3_vpbroadcastb_XMM1_FSxBX_icebp_c64,   X86_XCPT_DB, RM_MEM, T_AVX2_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues8),   s_aValues8   },
+        {  bs3CpuInstr3_vpbroadcastb_XMM9_XMM8_icebp_c64,    255,         RM_REG, T_AVX2_128, XMM9, XMM8,  RT_ELEMENTS(s_aValues8),   s_aValues8   },
+        {  bs3CpuInstr3_vpbroadcastb_XMM9_FSxBX_icebp_c64,   X86_XCPT_DB, RM_MEM, T_AVX2_128, XMM9, FSxBX, RT_ELEMENTS(s_aValues8),   s_aValues8   },
+        {  bs3CpuInstr3_vpbroadcastb_YMM1_XMM2_icebp_c64,    255,         RM_REG, T_AVX2_256, YMM1, XMM2,  RT_ELEMENTS(s_aValues8),   s_aValues8   },
+        {  bs3CpuInstr3_vpbroadcastb_YMM1_FSxBX_icebp_c64,   X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues8),   s_aValues8   },
+        {  bs3CpuInstr3_vpbroadcastb_YMM9_XMM8_icebp_c64,    255,         RM_REG, T_AVX2_256, YMM9, XMM8,  RT_ELEMENTS(s_aValues8),   s_aValues8   },
+        {  bs3CpuInstr3_vpbroadcastb_YMM9_FSxBX_icebp_c64,   X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM9, FSxBX, RT_ELEMENTS(s_aValues8),   s_aValues8   },
+
+        {  bs3CpuInstr3_vpbroadcastw_XMM1_XMM2_icebp_c64,    255,         RM_REG, T_AVX2_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues16),  s_aValues16  },
+        {  bs3CpuInstr3_vpbroadcastw_XMM1_FSxBX_icebp_c64,   X86_XCPT_AC, RM_MEM, T_AVX2_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues16),  s_aValues16  },
+        {  bs3CpuInstr3_vpbroadcastw_XMM9_XMM8_icebp_c64,    255,         RM_REG, T_AVX2_128, XMM9, XMM8,  RT_ELEMENTS(s_aValues16),  s_aValues16  },
+        {  bs3CpuInstr3_vpbroadcastw_XMM9_FSxBX_icebp_c64,   X86_XCPT_AC, RM_MEM, T_AVX2_128, XMM9, FSxBX, RT_ELEMENTS(s_aValues16),  s_aValues16  },
+        {  bs3CpuInstr3_vpbroadcastw_YMM1_XMM2_icebp_c64,    255,         RM_REG, T_AVX2_256, YMM1, XMM2,  RT_ELEMENTS(s_aValues16),  s_aValues16  },
+        {  bs3CpuInstr3_vpbroadcastw_YMM1_FSxBX_icebp_c64,   X86_XCPT_AC, RM_MEM, T_AVX2_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues16),  s_aValues16  },
+        {  bs3CpuInstr3_vpbroadcastw_YMM9_XMM8_icebp_c64,    255,         RM_REG, T_AVX2_256, YMM9, XMM8,  RT_ELEMENTS(s_aValues16),  s_aValues16  },
+        {  bs3CpuInstr3_vpbroadcastw_YMM9_FSxBX_icebp_c64,   X86_XCPT_AC, RM_MEM, T_AVX2_256, YMM9, FSxBX, RT_ELEMENTS(s_aValues16),  s_aValues16  },
+
+        {  bs3CpuInstr3_vpbroadcastd_XMM1_XMM2_icebp_c64,    255,         RM_REG, T_AVX2_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vpbroadcastd_XMM1_FSxBX_icebp_c64,   X86_XCPT_AC, RM_MEM, T_AVX2_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vpbroadcastd_XMM9_XMM8_icebp_c64,    255,         RM_REG, T_AVX2_128, XMM9, XMM8,  RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vpbroadcastd_XMM9_FSxBX_icebp_c64,   X86_XCPT_AC, RM_MEM, T_AVX2_128, XMM9, FSxBX, RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vpbroadcastd_YMM1_XMM2_icebp_c64,    255,         RM_REG, T_AVX2_256, YMM1, XMM2,  RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vpbroadcastd_YMM1_FSxBX_icebp_c64,   X86_XCPT_AC, RM_MEM, T_AVX2_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vpbroadcastd_YMM9_XMM8_icebp_c64,    255,         RM_REG, T_AVX2_256, YMM9, XMM8,  RT_ELEMENTS(s_aValues32),  s_aValues32  },
+        {  bs3CpuInstr3_vpbroadcastd_YMM9_FSxBX_icebp_c64,   X86_XCPT_AC, RM_MEM, T_AVX2_256, YMM9, FSxBX, RT_ELEMENTS(s_aValues32),  s_aValues32  },
+
+        {  bs3CpuInstr3_vpbroadcastq_XMM1_XMM2_icebp_c64,    255,         RM_REG, T_AVX2_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues64),  s_aValues64  },
+        {  bs3CpuInstr3_vpbroadcastq_XMM1_FSxBX_icebp_c64,   X86_XCPT_AC, RM_MEM, T_AVX2_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues64),  s_aValues64  },
+        {  bs3CpuInstr3_vpbroadcastq_XMM9_XMM8_icebp_c64,    255,         RM_REG, T_AVX2_128, XMM9, XMM8,  RT_ELEMENTS(s_aValues64),  s_aValues64  },
+        {  bs3CpuInstr3_vpbroadcastq_XMM9_FSxBX_icebp_c64,   X86_XCPT_AC, RM_MEM, T_AVX2_128, XMM9, FSxBX, RT_ELEMENTS(s_aValues64),  s_aValues64  },
+        {  bs3CpuInstr3_vpbroadcastq_YMM1_XMM2_icebp_c64,    255,         RM_REG, T_AVX2_256, YMM1, XMM2,  RT_ELEMENTS(s_aValues64),  s_aValues64  },
+        {  bs3CpuInstr3_vpbroadcastq_YMM1_FSxBX_icebp_c64,   X86_XCPT_AC, RM_MEM, T_AVX2_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues64),  s_aValues64  },
+        {  bs3CpuInstr3_vpbroadcastq_YMM9_XMM8_icebp_c64,    255,         RM_REG, T_AVX2_256, YMM9, XMM8,  RT_ELEMENTS(s_aValues64),  s_aValues64  },
+        {  bs3CpuInstr3_vpbroadcastq_YMM9_FSxBX_icebp_c64,   X86_XCPT_AC, RM_MEM, T_AVX2_256, YMM9, FSxBX, RT_ELEMENTS(s_aValues64),  s_aValues64  },
+
+        {  bs3CpuInstr3_vbroadcasti128_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues128), s_aValues128 },
+        {  bs3CpuInstr3_vbroadcasti128_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_256, YMM9, FSxBX, RT_ELEMENTS(s_aValues128), s_aValues128 },
     };
     static BS3CPUINSTR3_TEST3_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST3_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -12822,47 +12818,47 @@
     static BS3CPUINSTR3_TEST3_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_vextracti128_XMM1_YMM2_0FFh_icebp_c16,  255,         RM_REG, T_AVX2_128, 1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vextracti128_FSxBX_YMM2_0FFh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX2_128, 255, 2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vextracti128_XMM1_YMM2_000h_icebp_c16,  255,         RM_REG, T_AVX2_128, 1,   2, RT_ELEMENTS(s_aValues00), s_aValues00 },
-        {  bs3CpuInstr3_vextracti128_FSxBX_YMM2_000h_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX2_128, 255, 2, RT_ELEMENTS(s_aValues00), s_aValues00 },
-
-        {  bs3CpuInstr3_vextractf128_XMM1_YMM2_0FFh_icebp_c16,  255,         RM_REG, T_AVX2_128, 1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vextractf128_FSxBX_YMM2_0FFh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX2_128, 255, 2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vextractf128_XMM1_YMM2_000h_icebp_c16,  255,         RM_REG, T_AVX2_128, 1,   2, RT_ELEMENTS(s_aValues00), s_aValues00 },
-        {  bs3CpuInstr3_vextractf128_FSxBX_YMM2_000h_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX2_128, 255, 2, RT_ELEMENTS(s_aValues00), s_aValues00 },
+        {  bs3CpuInstr3_vextracti128_XMM1_YMM2_0FFh_icebp_c16,  255,         RM_REG, T_AVX2_128, XMM1,  YMM2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vextracti128_FSxBX_YMM2_0FFh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX2_128, FSxBX, YMM2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vextracti128_XMM1_YMM2_000h_icebp_c16,  255,         RM_REG, T_AVX2_128, XMM1,  YMM2, RT_ELEMENTS(s_aValues00), s_aValues00 },
+        {  bs3CpuInstr3_vextracti128_FSxBX_YMM2_000h_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX2_128, FSxBX, YMM2, RT_ELEMENTS(s_aValues00), s_aValues00 },
+
+        {  bs3CpuInstr3_vextractf128_XMM1_YMM2_0FFh_icebp_c16,  255,         RM_REG, T_AVX2_128, XMM1,  YMM2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vextractf128_FSxBX_YMM2_0FFh_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX2_128, FSxBX, YMM2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vextractf128_XMM1_YMM2_000h_icebp_c16,  255,         RM_REG, T_AVX2_128, XMM1,  YMM2, RT_ELEMENTS(s_aValues00), s_aValues00 },
+        {  bs3CpuInstr3_vextractf128_FSxBX_YMM2_000h_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX2_128, FSxBX, YMM2, RT_ELEMENTS(s_aValues00), s_aValues00 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_vextracti128_XMM1_YMM2_0FFh_icebp_c32,  255,         RM_REG, T_AVX2_128, 1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vextracti128_FSxBX_YMM2_0FFh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX2_128, 255, 2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vextracti128_XMM1_YMM2_000h_icebp_c32,  255,         RM_REG, T_AVX2_128, 1,   2, RT_ELEMENTS(s_aValues00), s_aValues00 },
-        {  bs3CpuInstr3_vextracti128_FSxBX_YMM2_000h_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX2_128, 255, 2, RT_ELEMENTS(s_aValues00), s_aValues00 },
-
-        {  bs3CpuInstr3_vextractf128_XMM1_YMM2_0FFh_icebp_c32,  255,         RM_REG, T_AVX2_128, 1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vextractf128_FSxBX_YMM2_0FFh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX2_128, 255, 2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vextractf128_XMM1_YMM2_000h_icebp_c32,  255,         RM_REG, T_AVX2_128, 1,   2, RT_ELEMENTS(s_aValues00), s_aValues00 },
-        {  bs3CpuInstr3_vextractf128_FSxBX_YMM2_000h_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX2_128, 255, 2, RT_ELEMENTS(s_aValues00), s_aValues00 },
+        {  bs3CpuInstr3_vextracti128_XMM1_YMM2_0FFh_icebp_c32,  255,         RM_REG, T_AVX2_128, XMM1,  YMM2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vextracti128_FSxBX_YMM2_0FFh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX2_128, FSxBX, YMM2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vextracti128_XMM1_YMM2_000h_icebp_c32,  255,         RM_REG, T_AVX2_128, XMM1,  YMM2, RT_ELEMENTS(s_aValues00), s_aValues00 },
+        {  bs3CpuInstr3_vextracti128_FSxBX_YMM2_000h_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX2_128, FSxBX, YMM2, RT_ELEMENTS(s_aValues00), s_aValues00 },
+
+        {  bs3CpuInstr3_vextractf128_XMM1_YMM2_0FFh_icebp_c32,  255,         RM_REG, T_AVX2_128, XMM1,  YMM2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vextractf128_FSxBX_YMM2_0FFh_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX2_128, FSxBX, YMM2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vextractf128_XMM1_YMM2_000h_icebp_c32,  255,         RM_REG, T_AVX2_128, XMM1,  YMM2, RT_ELEMENTS(s_aValues00), s_aValues00 },
+        {  bs3CpuInstr3_vextractf128_FSxBX_YMM2_000h_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX2_128, FSxBX, YMM2, RT_ELEMENTS(s_aValues00), s_aValues00 },
     };
     static BS3CPUINSTR3_TEST3_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_vextracti128_XMM1_YMM2_0FFh_icebp_c64,  255,         RM_REG, T_AVX2_128, 1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vextracti128_FSxBX_YMM2_0FFh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_128, 255, 2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vextracti128_XMM1_YMM2_000h_icebp_c64,  255,         RM_REG, T_AVX2_128, 1,   2, RT_ELEMENTS(s_aValues00), s_aValues00 },
-        {  bs3CpuInstr3_vextracti128_FSxBX_YMM2_000h_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_128, 255, 2, RT_ELEMENTS(s_aValues00), s_aValues00 },
-
-        {  bs3CpuInstr3_vextracti128_XMM8_YMM9_0FFh_icebp_c64,  255,         RM_REG, T_AVX2_128, 8,   9, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vextracti128_FSxBX_YMM9_0FFh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_128, 255, 9, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vextracti128_XMM8_YMM9_000h_icebp_c64,  255,         RM_REG, T_AVX2_128, 8,   9, RT_ELEMENTS(s_aValues00), s_aValues00 },
-        {  bs3CpuInstr3_vextracti128_FSxBX_YMM9_000h_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_128, 255, 9, RT_ELEMENTS(s_aValues00), s_aValues00 },
-
-        {  bs3CpuInstr3_vextractf128_XMM1_YMM2_0FFh_icebp_c64,  255,         RM_REG, T_AVX2_128, 1,   2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vextractf128_FSxBX_YMM2_0FFh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_128, 255, 2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vextractf128_XMM1_YMM2_000h_icebp_c64,  255,         RM_REG, T_AVX2_128, 1,   2, RT_ELEMENTS(s_aValues00), s_aValues00 },
-        {  bs3CpuInstr3_vextractf128_FSxBX_YMM2_000h_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_128, 255, 2, RT_ELEMENTS(s_aValues00), s_aValues00 },
-
-        {  bs3CpuInstr3_vextractf128_XMM8_YMM9_0FFh_icebp_c64,  255,         RM_REG, T_AVX2_128, 8,   9, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vextractf128_FSxBX_YMM9_0FFh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_128, 255, 9, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
-        {  bs3CpuInstr3_vextractf128_XMM8_YMM9_000h_icebp_c64,  255,         RM_REG, T_AVX2_128, 8,   9, RT_ELEMENTS(s_aValues00), s_aValues00 },
-        {  bs3CpuInstr3_vextractf128_FSxBX_YMM9_000h_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_128, 255, 9, RT_ELEMENTS(s_aValues00), s_aValues00 },
+        {  bs3CpuInstr3_vextracti128_XMM1_YMM2_0FFh_icebp_c64,  255,         RM_REG, T_AVX2_128, XMM1,  YMM2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vextracti128_FSxBX_YMM2_0FFh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_128, FSxBX, YMM2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vextracti128_XMM1_YMM2_000h_icebp_c64,  255,         RM_REG, T_AVX2_128, XMM1,  YMM2, RT_ELEMENTS(s_aValues00), s_aValues00 },
+        {  bs3CpuInstr3_vextracti128_FSxBX_YMM2_000h_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_128, FSxBX, YMM2, RT_ELEMENTS(s_aValues00), s_aValues00 },
+
+        {  bs3CpuInstr3_vextracti128_XMM8_YMM9_0FFh_icebp_c64,  255,         RM_REG, T_AVX2_128, XMM8,  YMM9, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vextracti128_FSxBX_YMM9_0FFh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_128, FSxBX, YMM9, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vextracti128_XMM8_YMM9_000h_icebp_c64,  255,         RM_REG, T_AVX2_128, XMM8,  YMM9, RT_ELEMENTS(s_aValues00), s_aValues00 },
+        {  bs3CpuInstr3_vextracti128_FSxBX_YMM9_000h_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_128, FSxBX, YMM9, RT_ELEMENTS(s_aValues00), s_aValues00 },
+
+        {  bs3CpuInstr3_vextractf128_XMM1_YMM2_0FFh_icebp_c64,  255,         RM_REG, T_AVX2_128, XMM1,  YMM2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vextractf128_FSxBX_YMM2_0FFh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_128, FSxBX, YMM2, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vextractf128_XMM1_YMM2_000h_icebp_c64,  255,         RM_REG, T_AVX2_128, XMM1,  YMM2, RT_ELEMENTS(s_aValues00), s_aValues00 },
+        {  bs3CpuInstr3_vextractf128_FSxBX_YMM2_000h_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_128, FSxBX, YMM2, RT_ELEMENTS(s_aValues00), s_aValues00 },
+
+        {  bs3CpuInstr3_vextractf128_XMM8_YMM9_0FFh_icebp_c64,  255,         RM_REG, T_AVX2_128, XMM8,  YMM9, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vextractf128_FSxBX_YMM9_0FFh_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_128, FSxBX, YMM9, RT_ELEMENTS(s_aValuesFF), s_aValuesFF },
+        {  bs3CpuInstr3_vextractf128_XMM8_YMM9_000h_icebp_c64,  255,         RM_REG, T_AVX2_128, XMM8,  YMM9, RT_ELEMENTS(s_aValues00), s_aValues00 },
+        {  bs3CpuInstr3_vextractf128_FSxBX_YMM9_000h_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX2_128, FSxBX, YMM9, RT_ELEMENTS(s_aValues00), s_aValues00 },
     };
     static BS3CPUINSTR3_TEST3_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST3_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -12923,4 +12919,5 @@
     PBS3EXTCTX                  pExtCtxOut;
     PBS3EXTCTX                  pExtCtx = bs3CpuInstr3AllocExtCtxs(&pExtCtxOut);
+    BS3SETREGCTX                pSetRegCtx;
     if (!pExtCtx)
         return 0;
@@ -12936,4 +12933,8 @@
     bs3CpuInstr3SetupSseAndAvx(&Ctx, pExtCtx);
     pbBuf = bs3CpuInstr3BufSetup(pbBuf, &cbBuf, bMode);
+
+    pSetRegCtx.pExtCtx = pExtCtx;
+    pSetRegCtx.pCtx = &Ctx;
+    pSetRegCtx.bMode = bMode;
 
     /*
@@ -12962,7 +12963,7 @@
                     uint8_t const   cbInstr     = ((uint8_t const BS3_FAR *)(uintptr_t)paTests[iTest].pfnWorker)[-1];
                     unsigned const  cValues     = paTests[iTest].cValues;
-                    bool const      fMmxInstr   = paTests[iTest].enmType < T_SSE;
                     bool const      fSseInstr   = paTests[iTest].enmType >= T_SSE && paTests[iTest].enmType < T_AVX_128;
                     bool const      fAvxInstr   = paTests[iTest].enmType >= T_AVX_128;
+                    bool const      fMemOp      = paTests[iTest].enmRm >= RM_MEM;
                     uint8_t const   cbOperand   = paTests[iTest].enmType < T_128BITS ? 64/8
                                                 : paTests[iTest].enmType < T_256BITS ? 128/8 : 256/8;
@@ -12973,5 +12974,4 @@
                     uint8_t const   idxEflOut   = cbOperand == 32 ? 2 : cbOperand == 16 ? 1 : 0;
                     uint8_t         bXcptExpect = !g_afTypeSupports[paTests[iTest].enmType] ? X86_XCPT_UD
-                                                : fMmxInstr ? paConfigs[iCfg].bXcptMmx
                                                 : fSseInstr ? paConfigs[iCfg].bXcptSse
                                                 : BS3_MODE_IS_RM_OR_V86(bMode) ? X86_XCPT_UD : paConfigs[iCfg].bXcptAvx;
@@ -12985,4 +12985,8 @@
                     if ((paTests[iTest].enmRm == RM_REG || paTests[iTest].enmRm == RM_MEM8) && (!paConfigs[iCfg].fAligned || paConfigs[iCfg].fAlignCheck || fPf))
                         continue;
+
+                    BS3_ASSERT(fMemOp || !BS3_REGISTER_IS_MEMREF(paTests[iTest].iRegSrc2));
+
+                    pSetRegCtx.fZeroYMMHi = fSseInstr;
 
                     /* #AC is only raised in ring-3.: */
@@ -13026,40 +13030,15 @@
 
                                 /* source1 */
-                                if (paTests[iTest].iRegSrc1 == UINT8_MAX)
+                                Bs3ExtCtxSetReg(&pSetRegCtx, paTests[iTest].iRegSrc1, &paValues[iVal].uSrc1);
+
+                                /* source2 */
+                                if (fMemOp)
                                 {
-                                    BS3_ASSERT(paTests[iTest].enmRm >= RM_MEM);
-                                    BS3_ASSERT(paTests[iTest].iRegSrc2 != UINT8_MAX);
-                                    Bs3MemCpy(puMemOpAlias, &paValues[iVal].uSrc1, cbMemOp);
-                                    uMemOpExpect = paValues[iVal].uSrc1;
-                                }
-                                else if (fMmxInstr)
-                                    Bs3ExtCtxSetMm(pExtCtx, paTests[iTest].iRegSrc1, paValues[iVal].uSrc1.QWords.qw0, BS3EXTCTXTOPMM_ZERO);
-                                else if (fSseInstr)
-                                    Bs3ExtCtxSetXmm(pExtCtx, paTests[iTest].iRegSrc1, &paValues[iVal].uSrc1.DQWords.dqw0);
-                                else
-                                    Bs3ExtCtxSetYmm(pExtCtx, paTests[iTest].iRegSrc1, &paValues[iVal].uSrc1, 32);
-
-                                /* source2 */
-                                if (paTests[iTest].iRegSrc2 == UINT8_MAX)
-                                {
-                                    BS3_ASSERT(paTests[iTest].enmRm >= RM_MEM);
-                                    BS3_ASSERT(paTests[iTest].iRegSrc1 != UINT8_MAX);
                                     Bs3MemCpy(puMemOpAlias, &paValues[iVal].uSrc2, cbMemOp);
                                     uMemOpExpect = paValues[iVal].uSrc2;
-                                }
-                                else if (fMmxInstr)
-                                    Bs3ExtCtxSetMm(pExtCtx, paTests[iTest].iRegSrc2, paValues[iVal].uSrc2.QWords.qw0, BS3EXTCTXTOPMM_ZERO);
-                                else if (fSseInstr)
-                                    Bs3ExtCtxSetXmm(pExtCtx, paTests[iTest].iRegSrc2, &paValues[iVal].uSrc2.DQWords.dqw0);
-                                else
-                                    Bs3ExtCtxSetYmm(pExtCtx, paTests[iTest].iRegSrc2, &paValues[iVal].uSrc2, 32);
-
-                                /* Memory pointer. */
-                                if (paTests[iTest].enmRm >= RM_MEM)
-                                {
-                                    BS3_ASSERT(   paTests[iTest].iRegSrc1 == UINT8_MAX
-                                               || paTests[iTest].iRegSrc2 == UINT8_MAX);
                                     Bs3RegCtxSetGrpSegFromCurPtr(&Ctx, &Ctx.rbx, &Ctx.fs, puMemOp);
                                 }
+                                else
+                                    Bs3ExtCtxSetReg(&pSetRegCtx, paTests[iTest].iRegSrc2, &paValues[iVal].uSrc2);
 
                                 /*
@@ -13074,9 +13053,4 @@
                                 cErrors = Bs3TestSubErrorCount();
 
-                                if (bXcptExpect == X86_XCPT_DB && fMmxInstr)
-                                {
-                                    uSavedFtw = Bs3ExtCtxGetAbridgedFtw(pExtCtx);
-                                    Bs3ExtCtxSetAbridgedFtw(pExtCtx, 0xff);
-                                }
                                 Bs3TestCheckExtCtx(pExtCtxOut, pExtCtx, 0 /*fFlags*/, pszMode, idTestStep);
 
@@ -13100,5 +13074,5 @@
                                 Ctx.cr2.u = 0;
 
-                                if (   paTests[iTest].enmRm >= RM_MEM
+                                if (   fMemOp
                                     && Bs3MemCmp(puMemOpAlias, &uMemOpExpect, cbMemOp) != 0)
                                     Bs3TestFailedF("Expected uMemOp %.*Rhxs, got %.*Rhxs", cbMemOp, &uMemOpExpect, cbMemOp, puMemOpAlias);
@@ -13174,34 +13148,34 @@
     static BS3CPUINSTR3_TEST4_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_ptest_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_ptest_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vptest_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vptest_XMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vptest_YMM1_YMM2_icebp_c16,  255,         RM_REG, T_AVX_256,  1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vptest_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256,  1, 255, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_ptest_XMM1_XMM2_icebp_c16,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_ptest_XMM1_FSxBX_icebp_c16,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vptest_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vptest_XMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vptest_YMM1_YMM2_icebp_c16,  255,         RM_REG, T_AVX_256, YMM1, YMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vptest_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
     };
     static BS3CPUINSTR3_TEST4_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_ptest_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_ptest_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vptest_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vptest_XMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vptest_YMM1_YMM2_icebp_c32,  255,         RM_REG, T_AVX_256,  1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vptest_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256,  1, 255, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_ptest_XMM1_XMM2_icebp_c32,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_ptest_XMM1_FSxBX_icebp_c32,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vptest_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vptest_XMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vptest_YMM1_YMM2_icebp_c32,  255,         RM_REG, T_AVX_256, YMM1, YMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vptest_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
     };
     static BS3CPUINSTR3_TEST4_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_ptest_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,   1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_ptest_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,   1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_ptest_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,   9,   8, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_ptest_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,   9, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vptest_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vptest_XMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vptest_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128,  9,   8, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vptest_XMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  9, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vptest_YMM1_YMM2_icebp_c64,  255,         RM_REG, T_AVX_256,  1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vptest_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,  1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vptest_YMM9_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256,  9,   8, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vptest_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,  9, 255, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_ptest_XMM1_XMM2_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM1, XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_ptest_XMM1_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_ptest_XMM9_XMM8_icebp_c64,   255,         RM_REG, T_SSE4_1,  XMM9, XMM8,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_ptest_XMM9_FSxBX_icebp_c64,  255,         RM_MEM, T_SSE4_1,  XMM9, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vptest_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vptest_XMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vptest_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128, XMM9, XMM8,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vptest_XMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128, XMM9, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vptest_YMM1_YMM2_icebp_c64,  255,         RM_REG, T_AVX_256, YMM1, YMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vptest_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vptest_YMM9_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256, YMM9, YMM8,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vptest_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM9, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
     };
     static BS3CPUINSTR3_TEST4_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST4_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -13253,26 +13227,26 @@
     static BS3CPUINSTR3_TEST4_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_vtestps_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestps_XMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestps_YMM1_YMM2_icebp_c16,  255,         RM_REG, T_AVX_256,  1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestps_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256,  1, 255, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestps_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestps_XMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestps_YMM1_YMM2_icebp_c16,  255,         RM_REG, T_AVX_256, YMM1, YMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestps_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
     };
     static BS3CPUINSTR3_TEST4_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_vtestps_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestps_XMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestps_YMM1_YMM2_icebp_c32,  255,         RM_REG, T_AVX_256,  1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestps_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256,  1, 255, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestps_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestps_XMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestps_YMM1_YMM2_icebp_c32,  255,         RM_REG, T_AVX_256, YMM1, YMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestps_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
     };
     static BS3CPUINSTR3_TEST4_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_vtestps_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestps_XMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestps_YMM1_YMM2_icebp_c64,  255,         RM_REG, T_AVX_256,  1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestps_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,  1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestps_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128,  9,   8, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestps_XMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  9, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestps_YMM9_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256,  9,   8, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestps_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,  9, 255, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestps_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestps_XMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestps_YMM1_YMM2_icebp_c64,  255,         RM_REG, T_AVX_256, YMM1, YMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestps_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestps_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128, XMM9, XMM8,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestps_XMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128, XMM9, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestps_YMM9_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256, YMM9, YMM8,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestps_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM9, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
     };
     static BS3CPUINSTR3_TEST4_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST4_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
@@ -13324,26 +13298,26 @@
     static BS3CPUINSTR3_TEST4_T const s_aTests16[] =
     {
-        {  bs3CpuInstr3_vtestpd_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestpd_XMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestpd_YMM1_YMM2_icebp_c16,  255,         RM_REG, T_AVX_256,  1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestpd_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256,  1, 255, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestpd_XMM1_XMM2_icebp_c16,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestpd_XMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestpd_YMM1_YMM2_icebp_c16,  255,         RM_REG, T_AVX_256, YMM1, YMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestpd_YMM1_FSxBX_icebp_c16, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
     };
     static BS3CPUINSTR3_TEST4_T const s_aTests32[] =
     {
-        {  bs3CpuInstr3_vtestpd_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestpd_XMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestpd_YMM1_YMM2_icebp_c32,  255,         RM_REG, T_AVX_256,  1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestpd_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256,  1, 255, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestpd_XMM1_XMM2_icebp_c32,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestpd_XMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestpd_YMM1_YMM2_icebp_c32,  255,         RM_REG, T_AVX_256, YMM1, YMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestpd_YMM1_FSxBX_icebp_c32, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
     };
     static BS3CPUINSTR3_TEST4_T const s_aTests64[] =
     {
-        {  bs3CpuInstr3_vtestpd_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128,  1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestpd_XMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestpd_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128,  9,   8, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestpd_XMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128,  9, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestpd_YMM1_YMM2_icebp_c64,  255,         RM_REG, T_AVX_256,  1,   2, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestpd_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,  1, 255, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestpd_YMM9_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256,  9,   8, RT_ELEMENTS(s_aValues), s_aValues },
-        {  bs3CpuInstr3_vtestpd_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256,  9, 255, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestpd_XMM1_XMM2_icebp_c64,  255,         RM_REG, T_AVX_128, XMM1, XMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestpd_XMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128, XMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestpd_XMM9_XMM8_icebp_c64,  255,         RM_REG, T_AVX_128, XMM9, XMM8,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestpd_XMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_128, XMM9, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestpd_YMM1_YMM2_icebp_c64,  255,         RM_REG, T_AVX_256, YMM1, YMM2,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestpd_YMM1_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM1, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestpd_YMM9_YMM8_icebp_c64,  255,         RM_REG, T_AVX_256, YMM9, YMM8,  RT_ELEMENTS(s_aValues), s_aValues },
+        {  bs3CpuInstr3_vtestpd_YMM9_FSxBX_icebp_c64, X86_XCPT_DB, RM_MEM, T_AVX_256, YMM9, FSxBX, RT_ELEMENTS(s_aValues), s_aValues },
     };
     static BS3CPUINSTR3_TEST4_MODE_T const s_aTests[3] = BS3CPUINSTR3_TEST4_MODES_INIT(s_aTests16, s_aTests32, s_aTests64);
