From 5be33403c378ceb9487ad14a1309392dc03a1263 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 4 Apr 2016 21:19:27 -0700 Subject: [PATCH] Don't use vec_disp8 encoding with the .d32 suffix Since the .d32 suffix prefers 32-bit displacement in encoding, try vec_disp8 encoding only if i.disp_encoding != disp_encoding_32bit. PR gas/19909 * config/tc-i386.c (check_VecOperands): Try vec_disp8 encoding only if i.disp_encoding != disp_encoding_32bit. * gas/testsuite/gas/i386/disp32.s: Add tests for vmovdqu64.d32. * gas/testsuite/gas/i386/x86-64-disp32.s: Likewise. * gas/testsuite/gas/i386/disp32.d: Updated. * gas/testsuite/gas/i386/x86-64-disp32.d: Likewise. --- gas/config/tc-i386.c | 4 +++- gas/testsuite/gas/i386/disp32.d | 10 ++++++---- gas/testsuite/gas/i386/disp32.s | 4 ++++ gas/testsuite/gas/i386/x86-64-disp32.d | 10 ++++++---- gas/testsuite/gas/i386/x86-64-disp32.s | 3 +++ 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index ce5304d868..f382a73a39 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -4575,7 +4575,9 @@ check_VecOperands (const insn_template *t) && i.op[op].disps->X_op == O_constant) { offsetT value = i.op[op].disps->X_add_number; - int vec_disp8_ok = fits_in_vec_disp8 (value); + int vec_disp8_ok + = (i.disp_encoding != disp_encoding_32bit + && fits_in_vec_disp8 (value)); if (t->operand_types [op].bitfield.vec_disp8) { if (vec_disp8_ok) diff --git a/gas/testsuite/gas/i386/disp32.d b/gas/testsuite/gas/i386/disp32.d index a3255fa137..24ada8151a 100644 --- a/gas/testsuite/gas/i386/disp32.d +++ b/gas/testsuite/gas/i386/disp32.d @@ -15,11 +15,12 @@ Disassembly of section .text: [ ]*[a-f0-9]+: 8b 98 ff 0f 00 00 mov 0xfff\(%eax\),%ebx [ ]*[a-f0-9]+: 8b 98 00 00 00 00 mov 0x0\(%eax\),%ebx [ ]*[a-f0-9]+: 8b 98 03 00 00 00 mov 0x3\(%eax\),%ebx -[ ]*[a-f0-9]+: eb 07 jmp 26 -[ ]*[a-f0-9]+: eb 05 jmp 26 -[ ]*[a-f0-9]+: e9 00 00 00 00 jmp 26 +[ ]*[a-f0-9]+: 62 f1 fe 08 6f 98 c0 ff ff ff vmovdqu64 -0x40\(%eax\),%xmm3 +[ ]*[a-f0-9]+: eb 07 jmp 30 +[ ]*[a-f0-9]+: eb 05 jmp 30 +[ ]*[a-f0-9]+: e9 00 00 00 00 jmp 30 -0+26 : +0+30 : [ ]*[a-f0-9]+: 89 18 mov %ebx,\(%eax\) [ ]*[a-f0-9]+: 89 58 03 mov %ebx,0x3\(%eax\) [ ]*[a-f0-9]+: 89 98 ff 0f 00 00 mov %ebx,0xfff\(%eax\) @@ -27,4 +28,5 @@ Disassembly of section .text: [ ]*[a-f0-9]+: 89 58 03 mov %ebx,0x3\(%eax\) [ ]*[a-f0-9]+: 89 98 00 00 00 00 mov %ebx,0x0\(%eax\) [ ]*[a-f0-9]+: 89 98 03 00 00 00 mov %ebx,0x3\(%eax\) +[ ]*[a-f0-9]+: 62 f1 fe 08 6f 98 c0 ff ff ff vmovdqu64 -0x40\(%eax\),%xmm3 #pass diff --git a/gas/testsuite/gas/i386/disp32.s b/gas/testsuite/gas/i386/disp32.s index c3bec3a823..fa85ae530c 100644 --- a/gas/testsuite/gas/i386/disp32.s +++ b/gas/testsuite/gas/i386/disp32.s @@ -9,6 +9,8 @@ mov.d32 (%eax),%ebx mov.d32 3(%eax),%ebx + vmovdqu64.d32 -0x40(%eax),%xmm3 + jmp foo jmp.d8 foo jmp.d32 foo @@ -24,3 +26,5 @@ foo: mov.d32 DWORD PTR [eax], ebx mov.d32 DWORD PTR [eax+3], ebx + + vmovdqu64.d32 xmm3,XMMWORD PTR [eax-0x40] diff --git a/gas/testsuite/gas/i386/x86-64-disp32.d b/gas/testsuite/gas/i386/x86-64-disp32.d index 8e307ee671..da5dcb0db7 100644 --- a/gas/testsuite/gas/i386/x86-64-disp32.d +++ b/gas/testsuite/gas/i386/x86-64-disp32.d @@ -15,11 +15,12 @@ Disassembly of section .text: [ ]*[a-f0-9]+: 8b 98 ff 0f 00 00 mov 0xfff\(%rax\),%ebx [ ]*[a-f0-9]+: 8b 98 00 00 00 00 mov 0x0\(%rax\),%ebx [ ]*[a-f0-9]+: 8b 98 03 00 00 00 mov 0x3\(%rax\),%ebx -[ ]*[a-f0-9]+: eb 07 jmp 26 -[ ]*[a-f0-9]+: eb 05 jmp 26 -[ ]*[a-f0-9]+: e9 00 00 00 00 jmpq 26 +[ ]*[a-f0-9]+: 62 f1 fe 08 6f 98 c0 ff ff ff vmovdqu64 -0x40\(%rax\),%xmm3 +[ ]*[a-f0-9]+: eb 07 jmp 30 +[ ]*[a-f0-9]+: eb 05 jmp 30 +[ ]*[a-f0-9]+: e9 00 00 00 00 jmpq 30 -0+26 : +0+30 : [ ]*[a-f0-9]+: 89 18 mov %ebx,\(%rax\) [ ]*[a-f0-9]+: 89 58 03 mov %ebx,0x3\(%rax\) [ ]*[a-f0-9]+: 89 98 ff 0f 00 00 mov %ebx,0xfff\(%rax\) @@ -27,4 +28,5 @@ Disassembly of section .text: [ ]*[a-f0-9]+: 89 58 03 mov %ebx,0x3\(%rax\) [ ]*[a-f0-9]+: 89 98 00 00 00 00 mov %ebx,0x0\(%rax\) [ ]*[a-f0-9]+: 89 98 03 00 00 00 mov %ebx,0x3\(%rax\) +[ ]*[a-f0-9]+: 62 f1 fe 08 6f 98 c0 ff ff ff vmovdqu64 -0x40\(%rax\),%xmm3 #pass diff --git a/gas/testsuite/gas/i386/x86-64-disp32.s b/gas/testsuite/gas/i386/x86-64-disp32.s index 08563396a5..e00aa02b79 100644 --- a/gas/testsuite/gas/i386/x86-64-disp32.s +++ b/gas/testsuite/gas/i386/x86-64-disp32.s @@ -8,6 +8,7 @@ mov.d32 (%rax),%ebx mov.d32 3(%rax),%ebx + vmovdqu64.d32 -0x40(%rax),%xmm3 jmp foo jmp.d8 foo @@ -24,3 +25,5 @@ foo: mov.d32 DWORD PTR [rax], ebx mov.d32 DWORD PTR [rax+3], ebx + + vmovdqu64.d32 xmm3,XMMWORD PTR [rax-0x40]