From 629cfaf1b0fbb32a985607c774bd8e7870b9fa94 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Mon, 30 Jul 2018 17:25:05 +0200 Subject: [PATCH] x86: don't mistakenly scale non-8-bit displacements In commit b5014f7af2 I've removed (instead of replaced) a conditional, resulting in addressing forms not allowing 8-bit displacements to now get their displacements scaled under certain circumstances. Re-add the missing conditional. --- gas/ChangeLog | 9 +++++++++ gas/config/tc-i386.c | 3 ++- gas/testsuite/gas/i386/evex-no-scale-32.d | 13 +++++++++++++ gas/testsuite/gas/i386/evex-no-scale-64.d | 15 +++++++++++++++ gas/testsuite/gas/i386/evex-no-scale.s | 19 +++++++++++++++++++ gas/testsuite/gas/i386/i386.exp | 2 ++ 6 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 gas/testsuite/gas/i386/evex-no-scale-32.d create mode 100644 gas/testsuite/gas/i386/evex-no-scale-64.d create mode 100644 gas/testsuite/gas/i386/evex-no-scale.s diff --git a/gas/ChangeLog b/gas/ChangeLog index 3f5c4e56388..8f77c3d4482 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,12 @@ +2018-07-30 Jan Beulich + + PR gas/23465 + * config/tc-i386.c (output_disp): Restrict scaling. + * testsuite/gas/i386/evex-no-scale.s, + testsuite/gas/i386/evex-no-scale-32.d + testsuite/gas/i386/evex-no-scale-64.d: New. + * testsuite/gas/i386/i386.exp: Run new tests. + 2018-07-30 Andrew Jenner * Makefile.am (TARGET_CPU_CFILES): Add entry for C-SKY. diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index cc01a588e41..008dc95d244 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -7965,7 +7965,8 @@ output_disp (fragS *insn_start_frag, offsetT insn_start_off) int size = disp_size (n); offsetT val = i.op[n].disps->X_add_number; - val = offset_in_range (val >> i.memshift, size); + val = offset_in_range (val >> (size == 1 ? i.memshift : 0), + size); p = frag_more (size); md_number_to_chars (p, val, size); } diff --git a/gas/testsuite/gas/i386/evex-no-scale-32.d b/gas/testsuite/gas/i386/evex-no-scale-32.d new file mode 100644 index 00000000000..e6116bc5929 --- /dev/null +++ b/gas/testsuite/gas/i386/evex-no-scale-32.d @@ -0,0 +1,13 @@ +#source: evex-no-scale.s +#objdump: -dw +#name: ix86 EVEX no disp scaling + +.*: +file format .* + +Disassembly of section .text: + +0+ : + +[a-f0-9]+: 62 f1 7c 48 28 04 05 40 00 00 00 vmovaps 0x40\(,%eax,1\),%zmm0 + +[a-f0-9]+: 62 f1 7c 48 28 04 25 40 00 00 00 vmovaps 0x40\(,%eiz,1\),%zmm0 + +[a-f0-9]+: 62 f1 7c 48 28 05 40 00 00 00 vmovaps 0x40,%zmm0 + +[a-f0-9]+: 67 62 f1 7c 48 28 06 40 00 vmovaps 0x40,%zmm0 diff --git a/gas/testsuite/gas/i386/evex-no-scale-64.d b/gas/testsuite/gas/i386/evex-no-scale-64.d new file mode 100644 index 00000000000..b66f15bf8bc --- /dev/null +++ b/gas/testsuite/gas/i386/evex-no-scale-64.d @@ -0,0 +1,15 @@ +#source: evex-no-scale.s +#objdump: -dw +#name: x86-64 EVEX no disp scaling + +.*: +file format .* + +Disassembly of section .text: + +0+ : + +[a-f0-9]+: 62 f1 7c 48 28 05 00 fc ff ff vmovaps -0x400\(%rip\),%zmm0 # .* + +[a-f0-9]+: 62 f1 7c 48 28 04 05 40 00 00 00 vmovaps 0x40\(,%rax,1\),%zmm0 + +[a-f0-9]+: 62 f1 7c 48 28 04 25 40 00 00 00 vmovaps 0x40,%zmm0 + +[a-f0-9]+: 67 62 f1 7c 48 28 04 05 40 00 00 00 vmovaps 0x40\(,%eax,1\),%zmm0 + +[a-f0-9]+: 67 62 f1 7c 48 28 04 25 40 00 00 00 addr32 vmovaps 0x40,%zmm0 + +[a-f0-9]+: 62 f1 7c 48 28 04 25 40 00 00 00 vmovaps 0x40,%zmm0 diff --git a/gas/testsuite/gas/i386/evex-no-scale.s b/gas/testsuite/gas/i386/evex-no-scale.s new file mode 100644 index 00000000000..ed0f2312af5 --- /dev/null +++ b/gas/testsuite/gas/i386/evex-no-scale.s @@ -0,0 +1,19 @@ + .allow_index_reg + .section .probe, "", @progbits +.Lprobe_64bit: + inc %eax +.equiv is_64bit, (. - .Lprobe_64bit) / 2 + + .text +disp: +.if is_64bit + vmovaps -1024(%rip), %zmm0 + vmovaps 64(,%rax), %zmm0 + vmovaps 64(,%riz), %zmm0 +.endif + vmovaps 64(,%eax), %zmm0 + vmovaps 64(,%eiz), %zmm0 + vmovaps 64, %zmm0 +.if !is_64bit + addr16 vmovaps 64, %zmm0 +.endif diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp index eb51c450085..6e22958af3e 100644 --- a/gas/testsuite/gas/i386/i386.exp +++ b/gas/testsuite/gas/i386/i386.exp @@ -224,6 +224,7 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_32_check]] run_dump_test "evex-lig512-intel" run_dump_test "evex-wig1" run_dump_test "evex-wig1-intel" + run_dump_test "evex-no-scale-32" run_dump_test "sse2avx" run_list_test "inval-avx" "-al" run_list_test "inval-avx512f" "-al" @@ -734,6 +735,7 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check]] t run_dump_test "x86-64-evex-lig512-intel" run_dump_test "x86-64-evex-wig1" run_dump_test "x86-64-evex-wig1-intel" + run_dump_test "evex-no-scale-64" run_dump_test "x86-64-sse2avx" run_list_test "x86-64-inval-avx" "-al" run_list_test "x86-64-inval-avx512f" "-al" -- 2.30.2