From efe30057d2fcf875e39efbe6cc2a6271decbbd2e Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sun, 14 Jun 2020 05:18:35 -0700 Subject: [PATCH] x86: Correct xsusldtrk mnemonic The correct mnemonic is xsusldtrk, not xsuspldtrk. gas/ PR gas/26115 * testsuite/gas/i386/tsxldtrk.d: Replace xsuspldtrk with xsusldtrk. * testsuite/gas/i386/tsxldtrk.s: Likewise. * testsuite/gas/i386/x86-64-tsxldtrk.d: Likewise. * testsuite/gas/i386/x86-64-tsxldtrk.s: Likewise. opcodes/ PR gas/26115 * i386-dis.c (prefix_table): Replace xsuspldtrk with xsusldtrk. * i386-opc.tbl: Likewise. * i386-tbl.h: Regenerated. --- gas/ChangeLog | 9 +++++++++ gas/testsuite/gas/i386/tsxldtrk.d | 2 +- gas/testsuite/gas/i386/tsxldtrk.s | 2 +- gas/testsuite/gas/i386/x86-64-tsxldtrk.d | 2 +- opcodes/ChangeLog | 7 +++++++ opcodes/i386-dis.c | 2 +- opcodes/i386-opc.tbl | 2 +- opcodes/i386-tbl.h | 2 +- 8 files changed, 22 insertions(+), 6 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 65450bc0d1..0c74415526 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,12 @@ +2020-06-14 H.J. Lu + + PR gas/26115 + * testsuite/gas/i386/tsxldtrk.d: Replace xsuspldtrk with + xsusldtrk. + * testsuite/gas/i386/tsxldtrk.s: Likewise. + * testsuite/gas/i386/x86-64-tsxldtrk.d: Likewise. + * testsuite/gas/i386/x86-64-tsxldtrk.s: Likewise. + 2020-06-12 Nelson Chu * testsuite/gas/riscv/priv-reg-fail-version-1p9.d: Removed. diff --git a/gas/testsuite/gas/i386/tsxldtrk.d b/gas/testsuite/gas/i386/tsxldtrk.d index 26df4ca633..457007cd18 100644 --- a/gas/testsuite/gas/i386/tsxldtrk.d +++ b/gas/testsuite/gas/i386/tsxldtrk.d @@ -8,6 +8,6 @@ Disassembly of section \.text: 0+ <_start>: - +[a-f0-9]+: f2 0f 01 e8 xsuspldtrk[ ]* + +[a-f0-9]+: f2 0f 01 e8 xsusldtrk[ ]* +[a-f0-9]+: f2 0f 01 e9 xresldtrk[ ]* #pass diff --git a/gas/testsuite/gas/i386/tsxldtrk.s b/gas/testsuite/gas/i386/tsxldtrk.s index 3bbe9aa623..c0fbf05a42 100644 --- a/gas/testsuite/gas/i386/tsxldtrk.s +++ b/gas/testsuite/gas/i386/tsxldtrk.s @@ -2,5 +2,5 @@ .text _start: - xsuspldtrk + xsusldtrk xresldtrk diff --git a/gas/testsuite/gas/i386/x86-64-tsxldtrk.d b/gas/testsuite/gas/i386/x86-64-tsxldtrk.d index 8ef3446f4d..e2e54f5832 100644 --- a/gas/testsuite/gas/i386/x86-64-tsxldtrk.d +++ b/gas/testsuite/gas/i386/x86-64-tsxldtrk.d @@ -8,6 +8,6 @@ Disassembly of section \.text: 0+ <_start>: - +[a-f0-9]+: f2 0f 01 e8 xsuspldtrk[ ]* + +[a-f0-9]+: f2 0f 01 e8 xsusldtrk[ ]* +[a-f0-9]+: f2 0f 01 e9 xresldtrk[ ]* #pass diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index d8fd4f79e8..a6adf7126d 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,10 @@ +2020-06-14 H.J. Lu + + PR gas/26115 + * i386-dis.c (prefix_table): Replace xsuspldtrk with xsusldtrk. + * i386-opc.tbl: Likewise. + * i386-tbl.h: Regenerated. + 2020-06-12 Nelson Chu * riscv-opc.c (priv_specs): Remove v1.9 and PRIV_SPEC_CLASS_1P9. diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c index 74c580cc3f..441866d6c9 100644 --- a/opcodes/i386-dis.c +++ b/opcodes/i386-dis.c @@ -3591,7 +3591,7 @@ static const struct dis386 prefix_table[][4] = { { "serialize", { Skip_MODRM }, PREFIX_OPCODE }, { "setssbsy", { Skip_MODRM }, PREFIX_OPCODE }, { Bad_Opcode }, - { "xsuspldtrk", { Skip_MODRM }, PREFIX_OPCODE }, + { "xsusldtrk", { Skip_MODRM }, PREFIX_OPCODE }, }, /* PREFIX_0F01_REG_5_MOD_3_RM_1 */ diff --git a/opcodes/i386-opc.tbl b/opcodes/i386-opc.tbl index 92cc9bad13..af28e21476 100644 --- a/opcodes/i386-opc.tbl +++ b/opcodes/i386-opc.tbl @@ -4085,7 +4085,7 @@ serialize, 0, 0x0f01e8, None, 3, CpuSERIALIZE, No_bSuf|No_wSuf|No_lSuf|No_sSuf|N // TSXLDTRK instructions. -xsuspldtrk, 0, 0xf20f01e8, None, 3, CpuTSXLDTRK, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { 0 } +xsusldtrk, 0, 0xf20f01e8, None, 3, CpuTSXLDTRK, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { 0 } xresldtrk, 0, 0xf20f01e9, None, 3, CpuTSXLDTRK, No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf, { 0 } // TSXLDTRK instructions end. diff --git a/opcodes/i386-tbl.h b/opcodes/i386-tbl.h index 7fd694dfa5..5bcefc6b11 100644 --- a/opcodes/i386-tbl.h +++ b/opcodes/i386-tbl.h @@ -59404,7 +59404,7 @@ const insn_template i386_optab[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } } } }, - { "xsuspldtrk", 0xf20f01e8, None, 3, 0, + { "xsusldtrk", 0xf20f01e8, None, 3, 0, { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -- 2.34.1