* [binutils-gdb] x86/APX: Add invalid check for APX EVEX.X4.
@ 2024-04-22 1:28 Lili Cui
0 siblings, 0 replies; only message in thread
From: Lili Cui @ 2024-04-22 1:28 UTC (permalink / raw)
To: binutils-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=b5247082c4a71f69ba53e5b076409f25918d953f
commit b5247082c4a71f69ba53e5b076409f25918d953f
Author: Cui, Lili <lili.cui@intel.com>
Date: Mon Apr 22 09:25:56 2024 +0800
x86/APX: Add invalid check for APX EVEX.X4.
gas/ChangeLog:
* config/tc-i386.c (build_apx_evex_prefix): Added invalid check for APX
X4.
* testsuite/gas/i386/x86-64-apx-evex-promoted-bad.d: Added invalid
testcase.
* testsuite/gas/i386/x86-64-apx-evex-promoted-bad.s: Ditto.
opcodes/ChangeLog:
* i386-dis.c (get_valid_dis386): Added invalid check for APX X4.
Diff:
---
gas/config/tc-i386.c | 5 ++++-
gas/testsuite/gas/i386/x86-64-apx-evex-promoted-bad.d | 2 ++
gas/testsuite/gas/i386/x86-64-apx-evex-promoted-bad.s | 3 +++
opcodes/i386-dis.c | 3 +++
4 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 1637f55759c..b03746852d6 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -4276,7 +4276,10 @@ build_apx_evex_prefix (void)
if (i.rex2 & REX_B)
i.vex.bytes[1] |= 0x08;
if (i.rex2 & REX_X)
- i.vex.bytes[2] &= ~0x04;
+ {
+ gas_assert (i.rm.mode != 3);
+ i.vex.bytes[2] &= ~0x04;
+ }
if (i.vex.register_specifier
&& i.vex.register_specifier->reg_flags & RegRex2)
i.vex.bytes[3] &= ~0x08;
diff --git a/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-bad.d b/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-bad.d
index 1a6b6656ff7..6330367194c 100644
--- a/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-bad.d
+++ b/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-bad.d
@@ -39,4 +39,6 @@ Disassembly of section .text:
[ ]*[a-f0-9]+:[ ]+62 d4 24 18 8f[ ]+\(bad\)
[ ]*[a-f0-9]+:[ ]+c3[ ]+.*
[ ]*[a-f0-9]+:[ ]+62 fc 7d 0c 60 c7[ ]+movbe \{bad-nf\},%r23w,%ax
+[ ]*[a-f0-9]+:[ ]+62 fc 79 08 60[ ]+\(bad\)
+[ ]*[a-f0-9]+:[ ]+c2[ ]+.*
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-bad.s b/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-bad.s
index bc55b5e726a..cbf34515bab 100644
--- a/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-bad.s
+++ b/gas/testsuite/gas/i386/x86-64-apx-evex-promoted-bad.s
@@ -53,3 +53,6 @@ _start:
#EVEX_MAP4 movbe %r18w,%ax set EVEX.nf = 1.
.insn EVEX.L0.66.M12.W0 0x60, %di, %ax {%k4}
+
+ # EVEX_MAP4 movbe %r18w,%ax set EVEX.P[10] = 0.
+ .byte 0x62, 0xfc, 0x79, 0x08, 0x60, 0xc2
diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index b9fdda1b578..53f2d6cf6d8 100644
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -9192,6 +9192,9 @@ get_valid_dis386 (const struct dis386 *dp, instr_info *ins)
if (!fetch_modrm (ins))
return &err_opcode;
+ if (ins->modrm.mod == 3 && (ins->rex2 & REX_X))
+ return &bad_opcode;
+
/* Set vector length. For EVEX-promoted instructions, evex.ll == 0b00,
which has the same encoding as vex.length == 128 and they can share
the same processing with vex.length in OP_VEX. */
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-04-22 1:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-22 1:28 [binutils-gdb] x86/APX: Add invalid check for APX EVEX.X4 Lili Cui
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).