[PATCH] i386: Check vector length for EVEX vextractfXX and vinsertfXX
H.J. Lu
hjl.tools@gmail.com
Wed Jun 5 17:23:00 GMT 2019
Since not all vector lengths are supported by EVEX vextractfXX and
vinsertfXX, decode them only with supported vector lengths.
gas/
PR binutils/24633
* testsuite/gas/i386/disassem.s: Add tests for invalid vector
lengths for EVEX vextractfXX and vinsertfXX.
* testsuite/gas/i386/x86-64-disassem.s: Likewise.
* testsuite/gas/i386/disassem.d: Updated.
* testsuite/gas/i386/x86-64-disassem.d: Likewise.
opcodes/
PR binutils/24633
* i386-dis-evex.h (evex_table): Update EVEX_W_0F3A18_P_2,
EVEX_W_0F3A19_P_2, EVEX_W_0F3A1A_P_2 and EVEX_W_0F3A1B_P_2.
(evex_len_table): EVEX_LEN_0F3A18_P_2_W_0,
EVEX_LEN_0F3A18_P_2_W_1, EVEX_LEN_0F3A19_P_2_W_0,
EVEX_LEN_0F3A19_P_2_W_1, EVEX_LEN_0F3A1A_P_2_W_0,
EVEX_LEN_0F3A1A_P_2_W_1, EVEX_LEN_0F3A1B_P_2_W_0,
EVEX_LEN_0F3A1B_P_2_W_1.
* i386-dis.c (EVEX_LEN_0F3A18_P_2_W_0): New enum.
(EVEX_LEN_0F3A18_P_2_W_1): Likewise.
(EVEX_LEN_0F3A19_P_2_W_0): Likewise.
(EVEX_LEN_0F3A19_P_2_W_1): Likewise.
(EVEX_LEN_0F3A1A_P_2_W_0): Likewise.
(EVEX_LEN_0F3A1A_P_2_W_1): Likewise.
(EVEX_LEN_0F3A1B_P_2_W_0): Likewise.
(EVEX_LEN_0F3A1B_P_2_W_1): Likewise.
---
gas/testsuite/gas/i386/disassem.d | 5 +-
gas/testsuite/gas/i386/disassem.s | 2 +
gas/testsuite/gas/i386/x86-64-disassem.d | 5 +-
gas/testsuite/gas/i386/x86-64-disassem.s | 2 +
opcodes/i386-dis-evex.h | 72 +++++++++++++++++++++---
opcodes/i386-dis.c | 10 +++-
6 files changed, 85 insertions(+), 11 deletions(-)
diff --git a/gas/testsuite/gas/i386/disassem.d b/gas/testsuite/gas/i386/disassem.d
index ff9ee497e3..530e3a17d5 100644
--- a/gas/testsuite/gas/i386/disassem.d
+++ b/gas/testsuite/gas/i386/disassem.d
@@ -345,5 +345,8 @@ Disassembly of section \.text:
[ ]*[a-f0-9]+:[ ]*41[ ]*inc[ ]*%ecx
[ ]*[a-f0-9]+:[ ]*37[ ]*aaa[ ]*
[ ]*[a-f0-9]+:[ ]*62 f2 ad 08 1c[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*01[ ]*.byte[ ]*0x1
+[ ]*[a-f0-9]+:[ ]*01 01[ ]*add[ ]*%eax,\(%ecx\)
+[ ]*[a-f0-9]+:[ ]*62 f3 7d 28 1b[ ]*\(bad\)[ ]*
+[ ]*[a-f0-9]+:[ ]*c8[ ]*.byte[ ]*0xc8
+[ ]*[a-f0-9]+:[ ]*25[ ]*.byte[ ]*0x25
#pass
diff --git a/gas/testsuite/gas/i386/disassem.s b/gas/testsuite/gas/i386/disassem.s
index 700208aa35..00eeb396d4 100644
--- a/gas/testsuite/gas/i386/disassem.s
+++ b/gas/testsuite/gas/i386/disassem.s
@@ -169,3 +169,5 @@
.byte 0xC4, 0xE1, 0xF9, 0x93, 0x3F
.byte 0xc4, 0xe2, 0x1, 0x1c, 0x41, 0x37
.byte 0x62, 0xf2, 0xad, 0x08, 0x1c, 0x01
+.byte 0x1
+.byte 0x62, 0xf3, 0x7d, 0x28, 0x1b, 0xc8, 0x25
diff --git a/gas/testsuite/gas/i386/x86-64-disassem.d b/gas/testsuite/gas/i386/x86-64-disassem.d
index c8277bf0eb..a7c2c3ec96 100644
--- a/gas/testsuite/gas/i386/x86-64-disassem.d
+++ b/gas/testsuite/gas/i386/x86-64-disassem.d
@@ -344,5 +344,8 @@ Disassembly of section \.text:
[ ]*[a-f0-9]+:[ ]*c4 62 01 1c[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*41 37[ ]*rex.B \(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*62 72 ad 08 1c[ ]*\(bad\)[ ]*
-[ ]*[a-f0-9]+:[ ]*01[ ]*.byte[ ]*0x1
+[ ]*[a-f0-9]+:[ ]*01 01[ ]*add[ ]*%eax,\(%rcx\)
+[ ]*[a-f0-9]+:[ ]*62 f3 7d 28 1b[ ]*\(bad\)[ ]*
+[ ]*[a-f0-9]+:[ ]*c8[ ]*.byte[ ]*0xc8
+[ ]*[a-f0-9]+:[ ]*25[ ]*.byte[ ]*0x25
#pass
diff --git a/gas/testsuite/gas/i386/x86-64-disassem.s b/gas/testsuite/gas/i386/x86-64-disassem.s
index ade5e15c1d..ef4e87d14c 100644
--- a/gas/testsuite/gas/i386/x86-64-disassem.s
+++ b/gas/testsuite/gas/i386/x86-64-disassem.s
@@ -169,3 +169,5 @@
.byte 0xC4, 0xE1, 0xF9, 0x93, 0x3F
.byte 0xc4, 0x62, 0x1, 0x1c, 0x41, 0x37
.byte 0x62, 0x72, 0xad, 0x08, 0x1c, 0x01
+.byte 0x1
+.byte 0x62, 0xf3, 0x7d, 0x28, 0x1b, 0xc8, 0x25
diff --git a/opcodes/i386-dis-evex.h b/opcodes/i386-dis-evex.h
index 9965d4f9ff..0003e7791d 100644
--- a/opcodes/i386-dis-evex.h
+++ b/opcodes/i386-dis-evex.h
@@ -3912,23 +3912,23 @@ static const struct dis386 evex_table[][256] = {
},
/* EVEX_W_0F3A18_P_2 */
{
- { "vinsertf32x4", { XM, Vex, EXxmm, Ib }, 0 },
- { "vinsertf64x2", { XM, Vex, EXxmm, Ib }, 0 },
+ { EVEX_LEN_TABLE (EVEX_LEN_0F3A18_P_2_W_0) },
+ { EVEX_LEN_TABLE (EVEX_LEN_0F3A18_P_2_W_1) },
},
/* EVEX_W_0F3A19_P_2 */
{
- { "vextractf32x4", { EXxmm, XM, Ib }, 0 },
- { "vextractf64x2", { EXxmm, XM, Ib }, 0 },
+ { EVEX_LEN_TABLE (EVEX_LEN_0F3A19_P_2_W_0) },
+ { EVEX_LEN_TABLE (EVEX_LEN_0F3A19_P_2_W_1) },
},
/* EVEX_W_0F3A1A_P_2 */
{
- { "vinsertf32x8", { XM, Vex, EXxmmq, Ib }, 0 },
- { "vinsertf64x4", { XM, Vex, EXxmmq, Ib }, 0 },
+ { EVEX_LEN_TABLE (EVEX_LEN_0F3A1A_P_2_W_0) },
+ { EVEX_LEN_TABLE (EVEX_LEN_0F3A1A_P_2_W_1) },
},
/* EVEX_W_0F3A1B_P_2 */
{
- { "vextractf32x8", { EXxmmq, XM, Ib }, 0 },
- { "vextractf64x4", { EXxmmq, XM, Ib }, 0 },
+ { EVEX_LEN_TABLE (EVEX_LEN_0F3A1B_P_2_W_0) },
+ { EVEX_LEN_TABLE (EVEX_LEN_0F3A1B_P_2_W_1) },
},
/* EVEX_W_0F3A1D_P_2 */
{
@@ -4129,4 +4129,60 @@ static const struct dis386 evex_table[][256] = {
{ VEX_W_TABLE (EVEX_W_0FD6_P_2) },
},
+ /* EVEX_LEN_0F3A18_P_2_W_0 */
+ {
+ { Bad_Opcode },
+ { "vinsertf32x4", { XM, Vex, EXxmm, Ib }, 0 },
+ { "vinsertf32x4", { XM, Vex, EXxmm, Ib }, 0 },
+ },
+
+ /* EVEX_LEN_0F3A18_P_2_W_1 */
+ {
+ { Bad_Opcode },
+ { "vinsertf64x2", { XM, Vex, EXxmm, Ib }, 0 },
+ { "vinsertf64x2", { XM, Vex, EXxmm, Ib }, 0 },
+ },
+
+ /* EVEX_LEN_0F3A19_P_2_W_0 */
+ {
+ { Bad_Opcode },
+ { "vextractf32x4", { EXxmm, XM, Ib }, 0 },
+ { "vextractf32x4", { EXxmm, XM, Ib }, 0 },
+ },
+
+ /* EVEX_LEN_0F3A19_P_2_W_1 */
+ {
+ { Bad_Opcode },
+ { "vextractf64x2", { EXxmm, XM, Ib }, 0 },
+ { "vextractf64x2", { EXxmm, XM, Ib }, 0 },
+ },
+
+ /* EVEX_LEN_0F3A1A_P_2_W_0 */
+ {
+ { Bad_Opcode },
+ { Bad_Opcode },
+ { "vinsertf32x8", { XM, Vex, EXxmmq, Ib }, 0 },
+ },
+
+ /* EVEX_LEN_0F3A1A_P_2_W_1 */
+ {
+ { Bad_Opcode },
+ { Bad_Opcode },
+ { "vinsertf64x4", { XM, Vex, EXxmmq, Ib }, 0 },
+ },
+
+ /* EVEX_LEN_0F3A1B_P_2_W_0 */
+ {
+ { Bad_Opcode },
+ { Bad_Opcode },
+ { "vextractf32x8", { EXxmmq, XM, Ib }, 0 },
+ },
+
+ /* EVEX_LEN_0F3A1B_P_2_W_1 */
+ {
+ { Bad_Opcode },
+ { Bad_Opcode },
+ { "vextractf64x4", { EXxmmq, XM, Ib }, 0 },
+ },
+
#endif /* NEED_EVEX_LEN_TABLE */
diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index f597539832..5d1bd6b030 100644
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -1937,7 +1937,15 @@ enum
EVEX_LEN_0F6E_P_2 = 0,
EVEX_LEN_0F7E_P_1,
EVEX_LEN_0F7E_P_2,
- EVEX_LEN_0FD6_P_2
+ EVEX_LEN_0FD6_P_2,
+ EVEX_LEN_0F3A18_P_2_W_0,
+ EVEX_LEN_0F3A18_P_2_W_1,
+ EVEX_LEN_0F3A19_P_2_W_0,
+ EVEX_LEN_0F3A19_P_2_W_1,
+ EVEX_LEN_0F3A1A_P_2_W_0,
+ EVEX_LEN_0F3A1A_P_2_W_1,
+ EVEX_LEN_0F3A1B_P_2_W_0,
+ EVEX_LEN_0F3A1B_P_2_W_1
};
enum
--
2.20.1
More information about the Binutils
mailing list