OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

i386: Check vector length for vshufXXX/vinsertXXX/vextractXXX 

Since not all vector lengths are supported by vshufXXX, vinsertXXX and
vextractXXX, decode them only with supported vector lengths.

gas/

	PR binutils/24691
	* testsuite/gas/i386/disassem.s: Add test for vshuff32x4 with
	invalid vector length.
	* 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/24691
	* i386-dis-evex.h (evex_table): Update EVEX_W_0F3A23_P_2,
	EVEX_W_0F3A38_P_2, EVEX_W_0F3A39_P_2, EVEX_W_0F3A3A_P_2,
	EVEX_W_0F3A3B_P_2 and EVEX_W_0F3A43_P_2.
	(evex_len_table): Add EVEX_LEN_0F3A23_P_2_W_0,
	EVEX_LEN_0F3A23_P_2_W_1, EVEX_LEN_0F3A38_P_2_W_0,
	EVEX_LEN_0F3A38_P_2_W_1, EVEX_LEN_0F3A39_P_2_W_0,
	EVEX_LEN_0F3A39_P_2_W_1, EVEX_LEN_0F3A3A_P_2_W_0,
	EVEX_LEN_0F3A3A_P_2_W_1, EVEX_LEN_0F3A3B_P_2_W_0,
	EVEX_LEN_0F3A3B_P_2_W_1, EVEX_LEN_0F3A43_P_2_W_0 and
	EVEX_LEN_0F3A43_P_2_W_1.
	* i386-dis.c (EVEX_LEN_0F3A23_P_2_W_0): New enum.
	(EVEX_LEN_0F3A23_P_2_W_1): Likewise.
	(EVEX_LEN_0F3A38_P_2_W_0): Likewise.
	(EVEX_LEN_0F3A38_P_2_W_1): Likewise.
	(EVEX_LEN_0F3A39_P_2_W_0): Likewise.
	(EVEX_LEN_0F3A39_P_2_W_1): Likewise.
	(EVEX_LEN_0F3A3A_P_2_W_0): Likewise.
	(EVEX_LEN_0F3A3A_P_2_W_1): Likewise.
	(EVEX_LEN_0F3A3B_P_2_W_0): Likewise.
	(EVEX_LEN_0F3A3B_P_2_W_1): Likewise.
	(EVEX_LEN_0F3A43_P_2_W_0): Likewise.
	(EVEX_LEN_0F3A43_P_2_W_1): Likewise.
This commit is contained in:
H.J. Lu 2019-06-17 10:20:04 -07:00
parent 39c05d9435
commit 6e1c90b7f5
8 changed files with 154 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gas/ChangeLog
View File

@ -1,3 +1,12 @@
2019-06-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/24691
* testsuite/gas/i386/disassem.s: Add test for vshuff32x4 with
invalid vector length.
* testsuite/gas/i386/x86-64-disassem.s: Likewise.
* testsuite/gas/i386/disassem.d: Updated.
* testsuite/gas/i386/x86-64-disassem.d: Likewise.
2019-06-14 Alan Modra <amodra@gmail.com> 2019-06-14 Alan Modra <amodra@gmail.com>
* Makefile.in: Regenerate. * Makefile.in: Regenerate.

4
gas/testsuite/gas/i386/disassem.d
View File

@ -347,6 +347,8 @@ Disassembly of section \.text:
[ ]*[a-f0-9]+:[ ]*62 f2 ad 08 1c[ ]*\(bad\)[ ]* [ ]*[a-f0-9]+:[ ]*62 f2 ad 08 1c[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*01 01[ ]*add[ ]*%eax,\(%ecx\) [ ]*[a-f0-9]+:[ ]*01 01[ ]*add[ ]*%eax,\(%ecx\)
[ ]*[a-f0-9]+:[ ]*62 f3 7d 28 1b[ ]*\(bad\)[ ]* [ ]*[a-f0-9]+:[ ]*62 f3 7d 28 1b[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*c8[ ]*.byte[ ]*0xc8 [ ]*[a-f0-9]+:[ ]*c8 25 62 f3[ ]*enter[ ]*\$0x6225,\$0xf3
[ ]*[a-f0-9]+:[ ]*62 f3 75 08 23[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*c2[ ]*.byte[ ]*0xc2
[ ]*[a-f0-9]+:[ ]*25[ ]*.byte[ ]*0x25 [ ]*[a-f0-9]+:[ ]*25[ ]*.byte[ ]*0x25
#pass #pass

2
gas/testsuite/gas/i386/disassem.s
View File

@ -171,3 +171,5 @@
.byte 0x62, 0xf2, 0xad, 0x08, 0x1c, 0x01 .byte 0x62, 0xf2, 0xad, 0x08, 0x1c, 0x01
.byte 0x1 .byte 0x1
.byte 0x62, 0xf3, 0x7d, 0x28, 0x1b, 0xc8, 0x25 .byte 0x62, 0xf3, 0x7d, 0x28, 0x1b, 0xc8, 0x25
.byte 0x62, 0xf3
.byte 0x62, 0xf3, 0x75, 0x08, 0x23, 0xc2, 0x25

4
gas/testsuite/gas/i386/x86-64-disassem.d
View File

@ -346,6 +346,8 @@ Disassembly of section \.text:
[ ]*[a-f0-9]+:[ ]*62 72 ad 08 1c[ ]*\(bad\)[ ]* [ ]*[a-f0-9]+:[ ]*62 72 ad 08 1c[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*01 01[ ]*add[ ]*%eax,\(%rcx\) [ ]*[a-f0-9]+:[ ]*01 01[ ]*add[ ]*%eax,\(%rcx\)
[ ]*[a-f0-9]+:[ ]*62 f3 7d 28 1b[ ]*\(bad\)[ ]* [ ]*[a-f0-9]+:[ ]*62 f3 7d 28 1b[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*c8[ ]*.byte[ ]*0xc8 [ ]*[a-f0-9]+:[ ]*c8 25 62 f3[ ]*enterq[ ]*\$0x6225,\$0xf3
[ ]*[a-f0-9]+:[ ]*62 f3 75 08 23[ ]*\(bad\)[ ]*
[ ]*[a-f0-9]+:[ ]*c2[ ]*.byte[ ]*0xc2
[ ]*[a-f0-9]+:[ ]*25[ ]*.byte[ ]*0x25 [ ]*[a-f0-9]+:[ ]*25[ ]*.byte[ ]*0x25
#pass #pass

2
gas/testsuite/gas/i386/x86-64-disassem.s
View File

@ -171,3 +171,5 @@
.byte 0x62, 0x72, 0xad, 0x08, 0x1c, 0x01 .byte 0x62, 0x72, 0xad, 0x08, 0x1c, 0x01
.byte 0x1 .byte 0x1
.byte 0x62, 0xf3, 0x7d, 0x28, 0x1b, 0xc8, 0x25 .byte 0x62, 0xf3, 0x7d, 0x28, 0x1b, 0xc8, 0x25
.byte 0x62, 0xf3
.byte 0x62, 0xf3, 0x75, 0x08, 0x23, 0xc2, 0x25

26
opcodes/ChangeLog
View File

@ -1,3 +1,29 @@
2019-06-17 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/24691
* i386-dis-evex.h (evex_table): Update EVEX_W_0F3A23_P_2,
EVEX_W_0F3A38_P_2, EVEX_W_0F3A39_P_2, EVEX_W_0F3A3A_P_2,
EVEX_W_0F3A3B_P_2 and EVEX_W_0F3A43_P_2.
(evex_len_table): Add EVEX_LEN_0F3A23_P_2_W_0,
EVEX_LEN_0F3A23_P_2_W_1, EVEX_LEN_0F3A38_P_2_W_0,
EVEX_LEN_0F3A38_P_2_W_1, EVEX_LEN_0F3A39_P_2_W_0,
EVEX_LEN_0F3A39_P_2_W_1, EVEX_LEN_0F3A3A_P_2_W_0,
EVEX_LEN_0F3A3A_P_2_W_1, EVEX_LEN_0F3A3B_P_2_W_0,
EVEX_LEN_0F3A3B_P_2_W_1, EVEX_LEN_0F3A43_P_2_W_0 and
EVEX_LEN_0F3A43_P_2_W_1.
* i386-dis.c (EVEX_LEN_0F3A23_P_2_W_0): New enum.
(EVEX_LEN_0F3A23_P_2_W_1): Likewise.
(EVEX_LEN_0F3A38_P_2_W_0): Likewise.
(EVEX_LEN_0F3A38_P_2_W_1): Likewise.
(EVEX_LEN_0F3A39_P_2_W_0): Likewise.
(EVEX_LEN_0F3A39_P_2_W_1): Likewise.
(EVEX_LEN_0F3A3A_P_2_W_0): Likewise.
(EVEX_LEN_0F3A3A_P_2_W_1): Likewise.
(EVEX_LEN_0F3A3B_P_2_W_0): Likewise.
(EVEX_LEN_0F3A3B_P_2_W_1): Likewise.
(EVEX_LEN_0F3A43_P_2_W_0): Likewise.
(EVEX_LEN_0F3A43_P_2_W_1): Likewise.
2019-06-14 Nick Clifton <nickc@redhat.com> 2019-06-14 Nick Clifton <nickc@redhat.com>
* po/fr.po; Updated French translation. * po/fr.po; Updated French translation.

108
opcodes/i386-dis-evex.h
View File

@ -3940,28 +3940,28 @@ static const struct dis386 evex_table[][256] = {
}, },
/* EVEX_W_0F3A23_P_2 */ /* EVEX_W_0F3A23_P_2 */
{ {
{ "vshuff32x4", { XM, Vex, EXx, Ib }, 0 }, { EVEX_LEN_TABLE (EVEX_LEN_0F3A23_P_2_W_0) },
{ "vshuff64x2", { XM, Vex, EXx, Ib }, 0 }, { EVEX_LEN_TABLE (EVEX_LEN_0F3A23_P_2_W_1) },
}, },
/* EVEX_W_0F3A38_P_2 */ /* EVEX_W_0F3A38_P_2 */
{ {
{ "vinserti32x4", { XM, Vex, EXxmm, Ib }, 0 }, { EVEX_LEN_TABLE (EVEX_LEN_0F3A38_P_2_W_0) },
{ "vinserti64x2", { XM, Vex, EXxmm, Ib }, 0 }, { EVEX_LEN_TABLE (EVEX_LEN_0F3A38_P_2_W_1) },
}, },
/* EVEX_W_0F3A39_P_2 */ /* EVEX_W_0F3A39_P_2 */
{ {
{ "vextracti32x4", { EXxmm, XM, Ib }, 0 }, { EVEX_LEN_TABLE (EVEX_LEN_0F3A39_P_2_W_0) },
{ "vextracti64x2", { EXxmm, XM, Ib }, 0 }, { EVEX_LEN_TABLE (EVEX_LEN_0F3A39_P_2_W_1) },
}, },
/* EVEX_W_0F3A3A_P_2 */ /* EVEX_W_0F3A3A_P_2 */
{ {
{ "vinserti32x8", { XM, Vex, EXxmmq, Ib }, 0 }, { EVEX_LEN_TABLE (EVEX_LEN_0F3A3A_P_2_W_0) },
{ "vinserti64x4", { XM, Vex, EXxmmq, Ib }, 0 }, { EVEX_LEN_TABLE (EVEX_LEN_0F3A3A_P_2_W_1) },
}, },
/* EVEX_W_0F3A3B_P_2 */ /* EVEX_W_0F3A3B_P_2 */
{ {
{ "vextracti32x8", { EXxmmq, XM, Ib }, 0 }, { EVEX_LEN_TABLE (EVEX_LEN_0F3A3B_P_2_W_0) },
{ "vextracti64x4", { EXxmmq, XM, Ib }, 0 }, { EVEX_LEN_TABLE (EVEX_LEN_0F3A3B_P_2_W_1) },
}, },
/* EVEX_W_0F3A3E_P_2 */ /* EVEX_W_0F3A3E_P_2 */
{ {
@ -3979,8 +3979,8 @@ static const struct dis386 evex_table[][256] = {
}, },
/* EVEX_W_0F3A43_P_2 */ /* EVEX_W_0F3A43_P_2 */
{ {
{ "vshufi32x4", { XM, Vex, EXx, Ib }, 0 }, { EVEX_LEN_TABLE (EVEX_LEN_0F3A43_P_2_W_0) },
{ "vshufi64x2", { XM, Vex, EXx, Ib }, 0 }, { EVEX_LEN_TABLE (EVEX_LEN_0F3A43_P_2_W_1) },
}, },
/* EVEX_W_0F3A50_P_2 */ /* EVEX_W_0F3A50_P_2 */
{ {
@ -4185,4 +4185,88 @@ static const struct dis386 evex_table[][256] = {
{ "vextractf64x4", { EXxmmq, XM, Ib }, 0 }, { "vextractf64x4", { EXxmmq, XM, Ib }, 0 },
}, },
/* EVEX_LEN_0F3A23_P_2_W_0 */
{
{ Bad_Opcode },
{ "vshuff32x4", { XM, Vex, EXx, Ib }, 0 },
{ "vshuff32x4", { XM, Vex, EXx, Ib }, 0 },
},
/* EVEX_LEN_0F3A23_P_2_W_1 */
{
{ Bad_Opcode },
{ "vshuff64x2", { XM, Vex, EXx, Ib }, 0 },
{ "vshuff64x2", { XM, Vex, EXx, Ib }, 0 },
},
/* EVEX_LEN_0F3A38_P_2_W_0 */
{
{ Bad_Opcode },
{ "vinserti32x4", { XM, Vex, EXxmm, Ib }, 0 },
{ "vinserti32x4", { XM, Vex, EXxmm, Ib }, 0 },
},
/* EVEX_LEN_0F3A38_P_2_W_1 */
{
{ Bad_Opcode },
{ "vinserti64x2", { XM, Vex, EXxmm, Ib }, 0 },
{ "vinserti64x2", { XM, Vex, EXxmm, Ib }, 0 },
},
/* EVEX_LEN_0F3A39_P_2_W_0 */
{
{ Bad_Opcode },
{ "vextracti32x4", { EXxmm, XM, Ib }, 0 },
{ "vextracti32x4", { EXxmm, XM, Ib }, 0 },
},
/* EVEX_LEN_0F3A39_P_2_W_1 */
{
{ Bad_Opcode },
{ "vextracti64x2", { EXxmm, XM, Ib }, 0 },
{ "vextracti64x2", { EXxmm, XM, Ib }, 0 },
},
/* EVEX_LEN_0F3A3A_P_2_W_0 */
{
{ Bad_Opcode },
{ "vinserti32x8", { XM, Vex, EXxmmq, Ib }, 0 },
{ "vinserti32x8", { XM, Vex, EXxmmq, Ib }, 0 },
},
/* EVEX_LEN_0F3A3A_P_2_W_1 */
{
{ Bad_Opcode },
{ "vinserti64x4", { XM, Vex, EXxmmq, Ib }, 0 },
{ "vinserti64x4", { XM, Vex, EXxmmq, Ib }, 0 },
},
/* EVEX_LEN_0F3A3B_P_2_W_0 */
{
{ Bad_Opcode },
{ "vextracti32x8", { EXxmmq, XM, Ib }, 0 },
{ "vextracti32x8", { EXxmmq, XM, Ib }, 0 },
},
/* EVEX_LEN_0F3A3B_P_2_W_1 */
{
{ Bad_Opcode },
{ "vextracti64x4", { EXxmmq, XM, Ib }, 0 },
{ "vextracti64x4", { EXxmmq, XM, Ib }, 0 },
},
/* EVEX_LEN_0F3A43_P_2_W_0 */
{
{ Bad_Opcode },
{ "vshufi32x4", { XM, Vex, EXx, Ib }, 0 },
{ "vshufi32x4", { XM, Vex, EXx, Ib }, 0 },
},
/* EVEX_LEN_0F3A43_P_2_W_1 */
{
{ Bad_Opcode },
{ "vshufi64x2", { XM, Vex, EXx, Ib }, 0 },
{ "vshufi64x2", { XM, Vex, EXx, Ib }, 0 },
},
#endif /* NEED_EVEX_LEN_TABLE */ #endif /* NEED_EVEX_LEN_TABLE */

14
opcodes/i386-dis.c
View File

@ -1945,7 +1945,19 @@ enum
EVEX_LEN_0F3A1A_P_2_W_0, EVEX_LEN_0F3A1A_P_2_W_0,
EVEX_LEN_0F3A1A_P_2_W_1, EVEX_LEN_0F3A1A_P_2_W_1,
EVEX_LEN_0F3A1B_P_2_W_0, EVEX_LEN_0F3A1B_P_2_W_0,
EVEX_LEN_0F3A1B_P_2_W_1 EVEX_LEN_0F3A1B_P_2_W_1,
EVEX_LEN_0F3A23_P_2_W_0,
EVEX_LEN_0F3A23_P_2_W_1,
EVEX_LEN_0F3A38_P_2_W_0,
EVEX_LEN_0F3A38_P_2_W_1,
EVEX_LEN_0F3A39_P_2_W_0,
EVEX_LEN_0F3A39_P_2_W_1,
EVEX_LEN_0F3A3A_P_2_W_0,
EVEX_LEN_0F3A3A_P_2_W_1,
EVEX_LEN_0F3A3B_P_2_W_0,
EVEX_LEN_0F3A3B_P_2_W_1,
EVEX_LEN_0F3A43_P_2_W_0,
EVEX_LEN_0F3A43_P_2_W_1
}; };
enum enum