From 09d7303523a013f2a4140f5d41af9b170fadba35 Mon Sep 17 00:00:00 2001 From: "Cui,Lili" Date: Wed, 23 Sep 2020 10:30:26 +0800 Subject: [PATCH] Put together MOD_VEX_0F38* in i386-dis.c, There are 11 MOD_VEX_0F38* inserted in MOD_0F38* group, which should be placed in MOD_VEX_0F38* group. opcode/ PR 26654 *i386-dis.c (enum): Put MOD_VEX_0F38* together. --- opcodes/ChangeLog | 5 ++ opcodes/i386-dis.c | 124 ++++++++++++++++++++++----------------------- 2 files changed, 67 insertions(+), 62 deletions(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 02d44490936..957c694c71c 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2020-09-24 Lili Cui + + PR 26654 + *i386-dis.c (enum): Put MOD_VEX_0F38* together. + 2020-09-24 Andrew Burgess * csky-dis.c (csky_output_operand): Enclose body of if in curly diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c index 19daeb426e2..67d5b6aaefc 100644 --- a/opcodes/i386-dis.c +++ b/opcodes/i386-dis.c @@ -787,17 +787,6 @@ enum MOD_0FE7_PREFIX_2, MOD_0FF0_PREFIX_3, MOD_0F382A, - MOD_VEX_0F3849_X86_64_P_0_W_0, - MOD_VEX_0F3849_X86_64_P_2_W_0, - MOD_VEX_0F3849_X86_64_P_3_W_0, - MOD_VEX_0F384B_X86_64_P_1_W_0, - MOD_VEX_0F384B_X86_64_P_2_W_0, - MOD_VEX_0F384B_X86_64_P_3_W_0, - MOD_VEX_0F385C_X86_64_P_1_W_0, - MOD_VEX_0F385E_X86_64_P_0_W_0, - MOD_VEX_0F385E_X86_64_P_1_W_0, - MOD_VEX_0F385E_X86_64_P_2_W_0, - MOD_VEX_0F385E_X86_64_P_3_W_0, MOD_0F38DC_PREFIX_1, MOD_0F38DD_PREFIX_1, MOD_0F38DE_PREFIX_1, @@ -891,7 +880,18 @@ enum MOD_VEX_0F382D, MOD_VEX_0F382E, MOD_VEX_0F382F, + MOD_VEX_0F3849_X86_64_P_0_W_0, + MOD_VEX_0F3849_X86_64_P_2_W_0, + MOD_VEX_0F3849_X86_64_P_3_W_0, + MOD_VEX_0F384B_X86_64_P_1_W_0, + MOD_VEX_0F384B_X86_64_P_2_W_0, + MOD_VEX_0F384B_X86_64_P_3_W_0, MOD_VEX_0F385A, + MOD_VEX_0F385C_X86_64_P_1_W_0, + MOD_VEX_0F385E_X86_64_P_0_W_0, + MOD_VEX_0F385E_X86_64_P_1_W_0, + MOD_VEX_0F385E_X86_64_P_2_W_0, + MOD_VEX_0F385E_X86_64_P_3_W_0, MOD_VEX_0F388C, MOD_VEX_0F388E, MOD_VEX_0F3A30_L_0, @@ -8284,57 +8284,6 @@ static const struct dis386 mod_table[][2] = { /* MOD_0F382A */ { "movntdqa", { XM, Mx }, PREFIX_DATA }, }, - { - /* MOD_VEX_0F3849_X86_64_P_0_W_0 */ - { VEX_LEN_TABLE (VEX_LEN_0F3849_X86_64_P_0_W_0_M_0) }, - { REG_TABLE (REG_VEX_0F3849_X86_64_P_0_W_0_M_1) }, - }, - { - /* MOD_VEX_0F3849_X86_64_P_2_W_0 */ - { VEX_LEN_TABLE (VEX_LEN_0F3849_X86_64_P_2_W_0_M_0) }, - }, - { - /* MOD_VEX_0F3849_X86_64_P_3_W_0 */ - { Bad_Opcode }, - { VEX_LEN_TABLE (VEX_LEN_0F3849_X86_64_P_3_W_0_M_0) }, - }, - { - /* MOD_VEX_0F384B_X86_64_P_1_W_0 */ - { VEX_LEN_TABLE (VEX_LEN_0F384B_X86_64_P_1_W_0_M_0) }, - }, - { - /* MOD_VEX_0F384B_X86_64_P_2_W_0 */ - { VEX_LEN_TABLE (VEX_LEN_0F384B_X86_64_P_2_W_0_M_0) }, - }, - { - /* MOD_VEX_0F384B_X86_64_P_3_W_0 */ - { VEX_LEN_TABLE (VEX_LEN_0F384B_X86_64_P_3_W_0_M_0) }, - }, - { - /* MOD_VEX_0F385C_X86_64_P_1_W_0 */ - { Bad_Opcode }, - { VEX_LEN_TABLE (VEX_LEN_0F385C_X86_64_P_1_W_0_M_0) }, - }, - { - /* MOD_VEX_0F385E_X86_64_P_0_W_0 */ - { Bad_Opcode }, - { VEX_LEN_TABLE (VEX_LEN_0F385E_X86_64_P_0_W_0_M_0) }, - }, - { - /* MOD_VEX_0F385E_X86_64_P_1_W_0 */ - { Bad_Opcode }, - { VEX_LEN_TABLE (VEX_LEN_0F385E_X86_64_P_1_W_0_M_0) }, - }, - { - /* MOD_VEX_0F385E_X86_64_P_2_W_0 */ - { Bad_Opcode }, - { VEX_LEN_TABLE (VEX_LEN_0F385E_X86_64_P_2_W_0_M_0) }, - }, - { - /* MOD_VEX_0F385E_X86_64_P_3_W_0 */ - { Bad_Opcode }, - { VEX_LEN_TABLE (VEX_LEN_0F385E_X86_64_P_3_W_0_M_0) }, - }, { /* MOD_0F38DC_PREFIX_1 */ { "aesenc128kl", { XM, M }, 0 }, @@ -8776,10 +8725,61 @@ static const struct dis386 mod_table[][2] = { /* MOD_VEX_0F382F */ { VEX_W_TABLE (VEX_W_0F382F_M_0) }, }, + { + /* MOD_VEX_0F3849_X86_64_P_0_W_0 */ + { VEX_LEN_TABLE (VEX_LEN_0F3849_X86_64_P_0_W_0_M_0) }, + { REG_TABLE (REG_VEX_0F3849_X86_64_P_0_W_0_M_1) }, + }, + { + /* MOD_VEX_0F3849_X86_64_P_2_W_0 */ + { VEX_LEN_TABLE (VEX_LEN_0F3849_X86_64_P_2_W_0_M_0) }, + }, + { + /* MOD_VEX_0F3849_X86_64_P_3_W_0 */ + { Bad_Opcode }, + { VEX_LEN_TABLE (VEX_LEN_0F3849_X86_64_P_3_W_0_M_0) }, + }, + { + /* MOD_VEX_0F384B_X86_64_P_1_W_0 */ + { VEX_LEN_TABLE (VEX_LEN_0F384B_X86_64_P_1_W_0_M_0) }, + }, + { + /* MOD_VEX_0F384B_X86_64_P_2_W_0 */ + { VEX_LEN_TABLE (VEX_LEN_0F384B_X86_64_P_2_W_0_M_0) }, + }, + { + /* MOD_VEX_0F384B_X86_64_P_3_W_0 */ + { VEX_LEN_TABLE (VEX_LEN_0F384B_X86_64_P_3_W_0_M_0) }, + }, { /* MOD_VEX_0F385A */ { VEX_LEN_TABLE (VEX_LEN_0F385A_M_0) }, }, + { + /* MOD_VEX_0F385C_X86_64_P_1_W_0 */ + { Bad_Opcode }, + { VEX_LEN_TABLE (VEX_LEN_0F385C_X86_64_P_1_W_0_M_0) }, + }, + { + /* MOD_VEX_0F385E_X86_64_P_0_W_0 */ + { Bad_Opcode }, + { VEX_LEN_TABLE (VEX_LEN_0F385E_X86_64_P_0_W_0_M_0) }, + }, + { + /* MOD_VEX_0F385E_X86_64_P_1_W_0 */ + { Bad_Opcode }, + { VEX_LEN_TABLE (VEX_LEN_0F385E_X86_64_P_1_W_0_M_0) }, + }, + { + /* MOD_VEX_0F385E_X86_64_P_2_W_0 */ + { Bad_Opcode }, + { VEX_LEN_TABLE (VEX_LEN_0F385E_X86_64_P_2_W_0_M_0) }, + }, + { + /* MOD_VEX_0F385E_X86_64_P_3_W_0 */ + { Bad_Opcode }, + { VEX_LEN_TABLE (VEX_LEN_0F385E_X86_64_P_3_W_0_M_0) }, + }, { /* MOD_VEX_0F388C */ { "vpmaskmov%DQ", { XM, Vex, Mx }, PREFIX_DATA }, -- 2.30.2