diff options
| -rw-r--r-- | gas/testsuite/gas/i386/evex.d | 5 | ||||
| -rw-r--r-- | gas/testsuite/gas/i386/evex.s | 3 | ||||
| -rw-r--r-- | gas/testsuite/gas/i386/i386.exp | 1 | ||||
| -rw-r--r-- | gas/testsuite/gas/i386/x86-64-evex.d | 20 | ||||
| -rw-r--r-- | opcodes/i386-dis-evex-prefix.h | 4 | ||||
| -rw-r--r-- | opcodes/i386-dis-evex-w.h | 10 | ||||
| -rw-r--r-- | opcodes/i386-dis.c | 4 |
7 files changed, 31 insertions, 16 deletions
diff --git a/gas/testsuite/gas/i386/evex.d b/gas/testsuite/gas/i386/evex.d index 2fbe295..b02bca3 100644 --- a/gas/testsuite/gas/i386/evex.d +++ b/gas/testsuite/gas/i386/evex.d @@ -1,5 +1,5 @@ #objdump: -dw -Msuffix -#name: i386 EVX insns +#name: i386 EVEX insns .*: +file format .* @@ -8,9 +8,12 @@ Disassembly of section .text: 0+ <_start>: +[a-f0-9]+: 62 f1 d6 38 2a f0 vcvtsi2ssl %eax,\{rd-sae\},%xmm5,%xmm6 + +[a-f0-9]+: 62 f1 57 38 2a f0 vcvtsi2sdl %eax,\(bad\),%xmm5,%xmm6 +[a-f0-9]+: 62 f1 d7 38 2a f0 vcvtsi2sdl %eax,\(bad\),%xmm5,%xmm6 +[a-f0-9]+: 62 f1 d6 08 7b f0 vcvtusi2ssl %eax,%xmm5,%xmm6 + +[a-f0-9]+: 62 f1 57 08 7b f0 vcvtusi2sdl %eax,%xmm5,%xmm6 +[a-f0-9]+: 62 f1 d7 08 7b f0 vcvtusi2sdl %eax,%xmm5,%xmm6 +[a-f0-9]+: 62 f1 d6 38 7b f0 vcvtusi2ssl %eax,\{rd-sae\},%xmm5,%xmm6 + +[a-f0-9]+: 62 f1 57 38 7b f0 vcvtusi2sdl %eax,\(bad\),%xmm5,%xmm6 +[a-f0-9]+: 62 f1 d7 38 7b f0 vcvtusi2sdl %eax,\(bad\),%xmm5,%xmm6 #pass diff --git a/gas/testsuite/gas/i386/evex.s b/gas/testsuite/gas/i386/evex.s index a64cc57..90c635a 100644 --- a/gas/testsuite/gas/i386/evex.s +++ b/gas/testsuite/gas/i386/evex.s @@ -4,8 +4,11 @@ .text _start: .byte 0x62, 0xf1, 0xd6, 0x38, 0x2a, 0xf0 + .byte 0x62, 0xf1, 0x57, 0x38, 0x2a, 0xf0 .byte 0x62, 0xf1, 0xd7, 0x38, 0x2a, 0xf0 .byte 0x62, 0xf1, 0xd6, 0x08, 0x7b, 0xf0 + .byte 0x62, 0xf1, 0x57, 0x08, 0x7b, 0xf0 .byte 0x62, 0xf1, 0xd7, 0x08, 0x7b, 0xf0 .byte 0x62, 0xf1, 0xd6, 0x38, 0x7b, 0xf0 + .byte 0x62, 0xf1, 0x57, 0x38, 0x7b, 0xf0 .byte 0x62, 0xf1, 0xd7, 0x38, 0x7b, 0xf0 diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp index 1e0a363..6f9543e 100644 --- a/gas/testsuite/gas/i386/i386.exp +++ b/gas/testsuite/gas/i386/i386.exp @@ -929,6 +929,7 @@ if [gas_64_check] then { run_dump_test "x86-64-avx512er-intel" run_dump_test "x86-64-avx512pf" run_dump_test "x86-64-avx512pf-intel" + run_dump_test "x86-64-evex" run_dump_test "x86-64-evex-lig256" run_dump_test "x86-64-evex-lig512" run_dump_test "x86-64-evex-lig256-intel" diff --git a/gas/testsuite/gas/i386/x86-64-evex.d b/gas/testsuite/gas/i386/x86-64-evex.d new file mode 100644 index 0000000..b360aa7 --- /dev/null +++ b/gas/testsuite/gas/i386/x86-64-evex.d @@ -0,0 +1,20 @@ +#objdump: -dw +#name: x86-64 EVEX insns +#source: evex.s + +.*: +file format .* + + +Disassembly of section .text: + +0+ <_start>: + +[a-f0-9]+: 62 f1 d6 38 2a f0 vcvtsi2ss %rax,\{rd-sae\},%xmm5,%xmm6 + +[a-f0-9]+: 62 f1 57 38 2a f0 vcvtsi2sd %eax,\(bad\),%xmm5,%xmm6 + +[a-f0-9]+: 62 f1 d7 38 2a f0 vcvtsi2sd %rax,\{rd-sae\},%xmm5,%xmm6 + +[a-f0-9]+: 62 f1 d6 08 7b f0 vcvtusi2ss %rax,%xmm5,%xmm6 + +[a-f0-9]+: 62 f1 57 08 7b f0 vcvtusi2sd %eax,%xmm5,%xmm6 + +[a-f0-9]+: 62 f1 d7 08 7b f0 vcvtusi2sd %rax,%xmm5,%xmm6 + +[a-f0-9]+: 62 f1 d6 38 7b f0 vcvtusi2ss %rax,\{rd-sae\},%xmm5,%xmm6 + +[a-f0-9]+: 62 f1 57 38 7b f0 vcvtusi2sd %eax,\(bad\),%xmm5,%xmm6 + +[a-f0-9]+: 62 f1 d7 38 7b f0 vcvtusi2sd %rax,\{rd-sae\},%xmm5,%xmm6 +#pass diff --git a/opcodes/i386-dis-evex-prefix.h b/opcodes/i386-dis-evex-prefix.h index 2ed8f67..9ad9372 100644 --- a/opcodes/i386-dis-evex-prefix.h +++ b/opcodes/i386-dis-evex-prefix.h @@ -30,7 +30,7 @@ { Bad_Opcode }, { "vcvtsi2ss{%LQ|}", { XMScalar, VexScalar, EXxEVexR, Edq }, 0 }, { Bad_Opcode }, - { VEX_W_TABLE (EVEX_W_0F2A_P_3) }, + { "vcvtsi2sd{%LQ|}", { XMScalar, VexScalar, EXxEVexR64, Edq }, 0 }, }, /* PREFIX_EVEX_0F51 */ { @@ -134,7 +134,7 @@ { Bad_Opcode }, { "vcvtusi2ss{%LQ|}", { XMScalar, VexScalar, EXxEVexR, Edq }, 0 }, { VEX_W_TABLE (EVEX_W_0F7B_P_2) }, - { VEX_W_TABLE (EVEX_W_0F7B_P_3) }, + { "vcvtusi2sd{%LQ|}", { XMScalar, VexScalar, EXxEVexR64, Edq }, 0 }, }, /* PREFIX_EVEX_0F7E */ { diff --git a/opcodes/i386-dis-evex-w.h b/opcodes/i386-dis-evex-w.h index 2c7d9bc..8af4695 100644 --- a/opcodes/i386-dis-evex-w.h +++ b/opcodes/i386-dis-evex-w.h @@ -37,11 +37,6 @@ { { "vmovshdup", { XM, EXx }, 0 }, }, - /* EVEX_W_0F2A_P_3 */ - { - { "vcvtsi2sd{%LQ|}", { XMScalar, VexScalar, Ed }, 0 }, - { "vcvtsi2sd{%LQ|}", { XMScalar, VexScalar, EXxEVexR64, Edq }, 0 }, - }, /* EVEX_W_0F51_P_1 */ { { "vsqrtss", { XMScalar, VexScalar, EXxmm_md, EXxEVexR }, 0 }, @@ -243,11 +238,6 @@ { "vcvtps2qq", { XM, EXEvexHalfBcstXmmq, EXxEVexR }, 0 }, { "vcvtpd2qq", { XM, EXx, EXxEVexR }, 0 }, }, - /* EVEX_W_0F7B_P_3 */ - { - { "vcvtusi2sd{%LQ|}", { XMScalar, VexScalar, Ed }, 0 }, - { "vcvtusi2sd{%LQ|}", { XMScalar, VexScalar, EXxEVexR64, Edq }, 0 }, - }, /* EVEX_W_0F7E_P_1 */ { { Bad_Opcode }, diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c index f88276c..ccc49ff 100644 --- a/opcodes/i386-dis.c +++ b/opcodes/i386-dis.c @@ -1476,7 +1476,6 @@ enum EVEX_W_0F12_P_3, EVEX_W_0F16_P_0_M_1, EVEX_W_0F16_P_1, - EVEX_W_0F2A_P_3, EVEX_W_0F51_P_1, EVEX_W_0F51_P_3, EVEX_W_0F58_P_1, @@ -1521,7 +1520,6 @@ enum EVEX_W_0F7A_P_2, EVEX_W_0F7A_P_3, EVEX_W_0F7B_P_2, - EVEX_W_0F7B_P_3, EVEX_W_0F7E_P_1, EVEX_W_0F7F_P_1, EVEX_W_0F7F_P_2, @@ -13724,7 +13722,7 @@ OP_Rounding (int bytemode, int sizeflag ATTRIBUTE_UNUSED) switch (bytemode) { case evex_rounding_64_mode: - if (address_mode != mode_64bit) + if (address_mode != mode_64bit || !vex.w) { oappend ("(bad)"); break; |