x86: drop further EVEX table entries that can be served by VEX ones

A few cases were missed by 6df22cf64c93 ("x86: drop EVEX table entries
that can be served by VEX ones").
This commit is contained in:
Jan Beulich
2020-07-14 10:32:51 +02:00
parent 41f5efc685
commit 17d3c7eccd
4 changed files with 25 additions and 42 deletions

View File

@ -1,3 +1,16 @@
2020-07-14 Jan Beulich <jbeulich@suse.com>
* i386-dis.c (PREFIX_EVEX_0F2C, PREFIX_EVEX_0F2D,
PREFIX_EVEX_0F2E, PREFIX_EVEX_0F2F): Delete.
(prefix_table): Add EXxEVexS operand to vcvttss2si, vcvttsd2si,
vcvtss2si, vcvtsd2si, vucomiss, and vucomisd table entries.
Retain X macro and PREFIX_OPCODE use from tjhe EVEX table for
the latter two.
* i386-dis-evex.h (evex_table): Reference VEX table for opcodes
0F2C, 0F2D, 0F2E, and 0F2F.
* i386-dis-evex-prefix.h: Delete opcode 0F2C, 0F2D, 0F2E, and
0F2F table entries.
2020-07-14 Jan Beulich <jbeulich@suse.com> 2020-07-14 Jan Beulich <jbeulich@suse.com>
* i386-dis.c (OP_VexR, VexScalarR): New. * i386-dis.c (OP_VexR, VexScalarR): New.

View File

@ -32,32 +32,6 @@
{ Bad_Opcode }, { Bad_Opcode },
{ VEX_W_TABLE (EVEX_W_0F2A_P_3) }, { VEX_W_TABLE (EVEX_W_0F2A_P_3) },
}, },
/* PREFIX_EVEX_0F2C */
{
{ Bad_Opcode },
{ "vcvttss2si", { Gdq, EXxmm_md, EXxEVexS }, 0 },
{ Bad_Opcode },
{ "vcvttsd2si", { Gdq, EXxmm_mq, EXxEVexS }, 0 },
},
/* PREFIX_EVEX_0F2D */
{
{ Bad_Opcode },
{ "vcvtss2si", { Gdq, EXxmm_md, EXxEVexR }, 0 },
{ Bad_Opcode },
{ "vcvtsd2si", { Gdq, EXxmm_mq, EXxEVexR }, 0 },
},
/* PREFIX_EVEX_0F2E */
{
{ "vucomisX", { XMScalar, EXxmm_md, EXxEVexS }, PREFIX_OPCODE },
{ Bad_Opcode },
{ "vucomisX", { XMScalar, EXxmm_mq, EXxEVexS }, PREFIX_OPCODE },
},
/* PREFIX_EVEX_0F2F */
{
{ "vcomisX", { XMScalar, EXxmm_md, EXxEVexS }, PREFIX_OPCODE },
{ Bad_Opcode },
{ "vcomisX", { XMScalar, EXxmm_mq, EXxEVexS }, PREFIX_OPCODE },
},
/* PREFIX_EVEX_0F51 */ /* PREFIX_EVEX_0F51 */
{ {
{ "vsqrtpX", { XM, EXx, EXxEVexR }, PREFIX_OPCODE }, { "vsqrtpX", { XM, EXx, EXxEVexR }, PREFIX_OPCODE },

View File

@ -51,10 +51,10 @@ static const struct dis386 evex_table[][256] = {
{ "vmovapX", { EXxS, XM }, PREFIX_OPCODE }, { "vmovapX", { EXxS, XM }, PREFIX_OPCODE },
{ PREFIX_TABLE (PREFIX_EVEX_0F2A) }, { PREFIX_TABLE (PREFIX_EVEX_0F2A) },
{ MOD_TABLE (MOD_EVEX_0F2B) }, { MOD_TABLE (MOD_EVEX_0F2B) },
{ PREFIX_TABLE (PREFIX_EVEX_0F2C) }, { PREFIX_TABLE (PREFIX_VEX_0F2C) },
{ PREFIX_TABLE (PREFIX_EVEX_0F2D) }, { PREFIX_TABLE (PREFIX_VEX_0F2D) },
{ PREFIX_TABLE (PREFIX_EVEX_0F2E) }, { PREFIX_TABLE (PREFIX_VEX_0F2E) },
{ PREFIX_TABLE (PREFIX_EVEX_0F2F) }, { PREFIX_TABLE (PREFIX_VEX_0F2F) },
/* 30 */ /* 30 */
{ Bad_Opcode }, { Bad_Opcode },
{ Bad_Opcode }, { Bad_Opcode },

View File

@ -1411,10 +1411,6 @@ enum
PREFIX_EVEX_0F12, PREFIX_EVEX_0F12,
PREFIX_EVEX_0F16, PREFIX_EVEX_0F16,
PREFIX_EVEX_0F2A, PREFIX_EVEX_0F2A,
PREFIX_EVEX_0F2C,
PREFIX_EVEX_0F2D,
PREFIX_EVEX_0F2E,
PREFIX_EVEX_0F2F,
PREFIX_EVEX_0F51, PREFIX_EVEX_0F51,
PREFIX_EVEX_0F58, PREFIX_EVEX_0F58,
PREFIX_EVEX_0F59, PREFIX_EVEX_0F59,
@ -4664,31 +4660,31 @@ static const struct dis386 prefix_table[][4] = {
/* PREFIX_VEX_0F2C */ /* PREFIX_VEX_0F2C */
{ {
{ Bad_Opcode }, { Bad_Opcode },
{ "vcvttss2si", { Gdq, EXxmm_md }, 0 }, { "vcvttss2si", { Gdq, EXxmm_md, EXxEVexS }, 0 },
{ Bad_Opcode }, { Bad_Opcode },
{ "vcvttsd2si", { Gdq, EXxmm_mq }, 0 }, { "vcvttsd2si", { Gdq, EXxmm_mq, EXxEVexS }, 0 },
}, },
/* PREFIX_VEX_0F2D */ /* PREFIX_VEX_0F2D */
{ {
{ Bad_Opcode }, { Bad_Opcode },
{ "vcvtss2si", { Gdq, EXxmm_md }, 0 }, { "vcvtss2si", { Gdq, EXxmm_md, EXxEVexR }, 0 },
{ Bad_Opcode }, { Bad_Opcode },
{ "vcvtsd2si", { Gdq, EXxmm_mq }, 0 }, { "vcvtsd2si", { Gdq, EXxmm_mq, EXxEVexR }, 0 },
}, },
/* PREFIX_VEX_0F2E */ /* PREFIX_VEX_0F2E */
{ {
{ "vucomiss", { XMScalar, EXxmm_md }, 0 }, { "vucomisX", { XMScalar, EXxmm_md, EXxEVexS }, PREFIX_OPCODE },
{ Bad_Opcode }, { Bad_Opcode },
{ "vucomisd", { XMScalar, EXxmm_mq }, 0 }, { "vucomisX", { XMScalar, EXxmm_mq, EXxEVexS }, PREFIX_OPCODE },
}, },
/* PREFIX_VEX_0F2F */ /* PREFIX_VEX_0F2F */
{ {
{ "vcomiss", { XMScalar, EXxmm_md }, 0 }, { "vcomisX", { XMScalar, EXxmm_md, EXxEVexS }, PREFIX_OPCODE },
{ Bad_Opcode }, { Bad_Opcode },
{ "vcomisd", { XMScalar, EXxmm_mq }, 0 }, { "vcomisX", { XMScalar, EXxmm_mq, EXxEVexS }, PREFIX_OPCODE },
}, },
/* PREFIX_VEX_0F41 */ /* PREFIX_VEX_0F41 */