espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-20 18:08:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

x86-64: REX prefix is invalid with VEX etc

Browse Source 
Just like for the data size prefix (see commit 7a8655d2bbdc ["x86: don't
abort() upon DATA16 prefix on (E)VEX encoded insn"]), any form of REX
prefix is invalid with VEX/XOP/EVEX.
This commit is contained in:
Jan Beulich
2020-06-25 09:26:28 +02:00
parent a5aeccd9d3
commit 0b9404fd37
6 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gas/ChangeLog
View File

@ -1,3 +1,16 @@
2020-06-25 Jan Beulich <jbeulich@suse.com>
* config/tc-i386.c (md_assemble): Also reject explicit REX
prefixes with VEX and alike encoded insns. Zap consumed bits
from i.rex.
(output_insn): Don't ignore REX prefix for VEX and alike
encodings; abort() instead if encountered.
* testsuite/gas/i386/x86-64-pseudos.s: Move REX-with-VEX cases
...
* testsuite/gas/i386/x86-64-pseudos-bad.s: ... here.
* testsuite/gas/i386/x86-64-pseudos.d,
testsuite/gas/i386/x86-64-pseudos-bad.l: Adjust expectations.
2020-06-25 Jan Beulich <jbeulich@suse.com> 2020-06-25 Jan Beulich <jbeulich@suse.com>
* config/tc-i386.c (process_operands): Translate explicit REX * config/tc-i386.c (process_operands): Translate explicit REX

13
gas/config/tc-i386.c
View File

@ -4893,10 +4893,20 @@ md_assemble (char *line)
return; return;
} }
/* Check for explicit REX prefix. */
if (i.prefix[REX_PREFIX] || i.rex_encoding)
{
as_bad (_("REX prefix invalid with `%s'"), i.tm.name);
return;
}
if (i.tm.opcode_modifier.vex) if (i.tm.opcode_modifier.vex)
build_vex_prefix (t); build_vex_prefix (t);
else else
build_evex_prefix (); build_evex_prefix ();
/* The individual REX.RXBW bits got consumed. */
i.rex &= REX_OPCODE;
} }
/* Handle conversion of 'int $3' --> special int3 insn. XOP or FMA4 /* Handle conversion of 'int $3' --> special int3 insn. XOP or FMA4
@ -9275,9 +9285,6 @@ output_insn (void)
if (*q) if (*q)
switch (j) switch (j)
{ {
case REX_PREFIX:
/* REX byte is encoded in VEX prefix. */
break;
case SEG_PREFIX: case SEG_PREFIX:
case ADDR_PREFIX: case ADDR_PREFIX:
FRAG_APPEND_1_CHAR (*q); FRAG_APPEND_1_CHAR (*q);

3
gas/testsuite/gas/i386/x86-64-pseudos-bad.l
View File

@ -1,3 +1,6 @@
.*: Assembler messages: .*: Assembler messages:
.*:3: Error: .*`vmovaps'.* .*:3: Error: .*`vmovaps'.*
.*:4: Error: .*`vmovaps'.* .*:4: Error: .*`vmovaps'.*
.*:5: Error: .*`vmovaps'.*
.*:6: Error: .*`vmovaps'.*
.*:7: Error: .*`rorx'.*

3
gas/testsuite/gas/i386/x86-64-pseudos-bad.s
View File

@ -2,3 +2,6 @@
pseudos: pseudos:
{vex} vmovaps %xmm0, %xmm30 {vex} vmovaps %xmm0, %xmm30
{vex3} vmovaps %xmm30, %xmm0 {vex3} vmovaps %xmm30, %xmm0
{rex} vmovaps %xmm7,%xmm2
{rex} vmovaps %xmm17,%xmm2
{rex} rorx $7,%eax,%ebx

6
gas/testsuite/gas/i386/x86-64-pseudos.d
View File

@ -310,9 +310,6 @@ Disassembly of section .text:
+[a-f0-9]+: 41 0f 28 10 movaps \(%r8\),%xmm2 +[a-f0-9]+: 41 0f 28 10 movaps \(%r8\),%xmm2
+[a-f0-9]+: 40 0f 38 01 01 rex phaddw \(%rcx\),%mm0 +[a-f0-9]+: 40 0f 38 01 01 rex phaddw \(%rcx\),%mm0
+[a-f0-9]+: 41 0f 38 01 00 phaddw \(%r8\),%mm0 +[a-f0-9]+: 41 0f 38 01 00 phaddw \(%r8\),%mm0
+[a-f0-9]+: c5 f8 28 d7 vmovaps %xmm7,%xmm2
+[a-f0-9]+: 62 b1 7c 08 28 d1 vmovaps %xmm17,%xmm2
+[a-f0-9]+: c4 e3 7b f0 d8 07 rorx \$0x7,%eax,%ebx
+[a-f0-9]+: c4 e1 78 28 d7 vmovaps %xmm7,%xmm2 +[a-f0-9]+: c4 e1 78 28 d7 vmovaps %xmm7,%xmm2
+[a-f0-9]+: c4 e1 78 28 d7 vmovaps %xmm7,%xmm2 +[a-f0-9]+: c4 e1 78 28 d7 vmovaps %xmm7,%xmm2
+[a-f0-9]+: c4 e1 78 29 fa vmovaps %xmm7,%xmm2 +[a-f0-9]+: c4 e1 78 29 fa vmovaps %xmm7,%xmm2
@ -351,7 +348,4 @@ Disassembly of section .text:
+[a-f0-9]+: 41 0f 28 10 movaps \(%r8\),%xmm2 +[a-f0-9]+: 41 0f 28 10 movaps \(%r8\),%xmm2
+[a-f0-9]+: 40 0f 38 01 01 rex phaddw \(%rcx\),%mm0 +[a-f0-9]+: 40 0f 38 01 01 rex phaddw \(%rcx\),%mm0
+[a-f0-9]+: 41 0f 38 01 00 phaddw \(%r8\),%mm0 +[a-f0-9]+: 41 0f 38 01 00 phaddw \(%r8\),%mm0
+[a-f0-9]+: c5 f8 28 d7 vmovaps %xmm7,%xmm2
+[a-f0-9]+: 62 b1 7c 08 28 d1 vmovaps %xmm17,%xmm2
+[a-f0-9]+: c4 e3 7b f0 d8 07 rorx \$0x7,%eax,%ebx
#pass #pass

6
gas/testsuite/gas/i386/x86-64-pseudos.s
View File

@ -314,9 +314,6 @@ _start:
{rex} movaps (%r8),%xmm2 {rex} movaps (%r8),%xmm2
{rex} phaddw (%rcx),%mm0 {rex} phaddw (%rcx),%mm0
{rex} phaddw (%r8),%mm0 {rex} phaddw (%r8),%mm0
{rex} vmovaps %xmm7,%xmm2
{rex} vmovaps %xmm17,%xmm2
{rex} rorx $7,%eax,%ebx
.intel_syntax noprefix .intel_syntax noprefix
{vex3} vmovaps xmm2,xmm7 {vex3} vmovaps xmm2,xmm7
@ -357,6 +354,3 @@ _start:
{rex} movaps xmm2,XMMWORD PTR [r8] {rex} movaps xmm2,XMMWORD PTR [r8]
{rex} phaddw mm0,QWORD PTR [rcx] {rex} phaddw mm0,QWORD PTR [rcx]
{rex} phaddw mm0,QWORD PTR [r8] {rex} phaddw mm0,QWORD PTR [r8]
{rex} vmovaps xmm2,xmm7
{rex} vmovaps xmm2,xmm17
{rex} rorx ebx,eax,0x7