[binutils-gdb] Revert "Support Intel FRED LKGS"
hongtao Liu
liuhongt@sourceware.org
Tue May 23 06:42:50 GMT 2023
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=cbf25f4705efd6e6972e8f9d7b32ce4337541b43
commit cbf25f4705efd6e6972e8f9d7b32ce4337541b43
Author: liuhongt <hongtao.liu@intel.com>
Date: Tue May 23 14:42:20 2023 +0800
Revert "Support Intel FRED LKGS"
This reverts commit e5a497fe38e0ab19e16bdd9e4b4ed5e4d0056478.
Diff:
---
gas/NEWS | 4 ---
gas/config/tc-i386.c | 2 --
gas/doc/c-i386.texi | 3 ---
gas/testsuite/gas/i386/i386.exp | 3 ---
gas/testsuite/gas/i386/x86-64-fred-intel.d | 15 -----------
gas/testsuite/gas/i386/x86-64-fred.d | 15 -----------
gas/testsuite/gas/i386/x86-64-fred.s | 11 --------
gas/testsuite/gas/i386/x86-64-lkgs-intel.d | 25 -----------------
gas/testsuite/gas/i386/x86-64-lkgs-inval.l | 9 -------
gas/testsuite/gas/i386/x86-64-lkgs-inval.s | 14 ----------
gas/testsuite/gas/i386/x86-64-lkgs.d | 25 -----------------
gas/testsuite/gas/i386/x86-64-lkgs.s | 21 ---------------
opcodes/i386-dis.c | 43 ++----------------------------
opcodes/i386-gen.c | 4 ---
opcodes/i386-opc.h | 6 -----
opcodes/i386-opc.tbl | 14 ----------
16 files changed, 2 insertions(+), 212 deletions(-)
diff --git a/gas/NEWS b/gas/NEWS
index ea172fe9cdb..42a2005d7c9 100644
--- a/gas/NEWS
+++ b/gas/NEWS
@@ -1,9 +1,5 @@
-*- text -*-
-* Add support for Intel FRED instructions.
-
-* Add support for Intel LKGS instructions.
-
* Add support for Intel AMX-COMPLEX instructions.
* Add SME2 support to the AArch64 port.
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 1002c5f564c..ca3626e3069 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -1149,8 +1149,6 @@ static const arch_entry cpu_arch[] =
SUBARCH (avx_ne_convert, AVX_NE_CONVERT, ANY_AVX_NE_CONVERT, false),
SUBARCH (rao_int, RAO_INT, RAO_INT, false),
SUBARCH (rmpquery, RMPQUERY, ANY_RMPQUERY, false),
- SUBARCH (fred, FRED, ANY_FRED, false),
- SUBARCH (lkgs, LKGS, ANY_LKGS, false),
};
#undef SUBARCH
diff --git a/gas/doc/c-i386.texi b/gas/doc/c-i386.texi
index 49b6e3b1abb..15d060b2a33 100644
--- a/gas/doc/c-i386.texi
+++ b/gas/doc/c-i386.texi
@@ -205,8 +205,6 @@ accept various extension mnemonics. For example,
@code{msrlist},
@code{avx_ne_convert},
@code{rao_int},
-@code{fred},
-@code{lkgs},
@code{amx_int8},
@code{amx_bf16},
@code{amx_fp16},
@@ -1636,7 +1634,6 @@ supported on the CPU specified. The choices for @var{cpu_type} are:
@item @samp{.prefetchi} @tab @samp{.avx_ifma} @tab @samp{.avx_vnni_int8}
@item @samp{.cmpccxadd} @tab @samp{.wrmsrns} @tab @samp{.msrlist}
@item @samp{.avx_ne_convert} @tab @samp{.rao_int}
-@item @samp{.fred} @tab @samp{.lkgs}
@item @samp{.wbnoinvd} @tab @samp{.pconfig} @tab @samp{.waitpkg} @tab @samp{.cldemote}
@item @samp{.shstk} @tab @samp{.gfni} @tab @samp{.vaes} @tab @samp{.vpclmulqdq}
@item @samp{.movdiri} @tab @samp{.movdir64b} @tab @samp{.enqcmd} @tab @samp{.tsxldtrk}
diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
index c098f2de533..dc29b5112ab 100644
--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -1191,9 +1191,6 @@ if [gas_64_check] then {
run_dump_test "x86-64-amx-complex-intel"
run_dump_test "x86-64-amx-complex-bad"
run_list_test "x86-64-amx-complex-inval"
- run_dump_test "x86-64-fred"
- run_dump_test "x86-64-lkgs"
- run_list_test "x86-64-lkgs-inval"
run_dump_test "x86-64-clzero"
run_dump_test "x86-64-mwaitx-bdver4"
run_list_test "x86-64-mwaitx-reg"
diff --git a/gas/testsuite/gas/i386/x86-64-fred-intel.d b/gas/testsuite/gas/i386/x86-64-fred-intel.d
deleted file mode 100644
index aef98af2d81..00000000000
--- a/gas/testsuite/gas/i386/x86-64-fred-intel.d
+++ /dev/null
@@ -1,15 +0,0 @@
-#as:
-#objdump: -dw -Mintel
-#name: x86_64 FRED insns (Intel disassembly)
-#source: x86-64-fred.s
-
-.*: +file format .*
-
-Disassembly of section \.text:
-
-0+ <_start>:
-\s*[a-f0-9]+:\s*f2 0f 01 ca\s+erets
-\s*[a-f0-9]+:\s*f3 0f 01 ca\s+eretu
-\s*[a-f0-9]+:\s*f2 0f 01 ca\s+erets
-\s*[a-f0-9]+:\s*f3 0f 01 ca\s+eretu
-#pass
diff --git a/gas/testsuite/gas/i386/x86-64-fred.d b/gas/testsuite/gas/i386/x86-64-fred.d
deleted file mode 100644
index 01990f1cec8..00000000000
--- a/gas/testsuite/gas/i386/x86-64-fred.d
+++ /dev/null
@@ -1,15 +0,0 @@
-#as:
-#objdump: -dw
-#name: x86_64 FRED insns
-#source: x86-64-fred.s
-
-.*: +file format .*
-
-Disassembly of section \.text:
-
-0+ <_start>:
-\s*[a-f0-9]+:\s*f2 0f 01 ca\s+erets
-\s*[a-f0-9]+:\s*f3 0f 01 ca\s+eretu
-\s*[a-f0-9]+:\s*f2 0f 01 ca\s+erets
-\s*[a-f0-9]+:\s*f3 0f 01 ca\s+eretu
-#pass
diff --git a/gas/testsuite/gas/i386/x86-64-fred.s b/gas/testsuite/gas/i386/x86-64-fred.s
deleted file mode 100644
index 0e5d3d3d469..00000000000
--- a/gas/testsuite/gas/i386/x86-64-fred.s
+++ /dev/null
@@ -1,11 +0,0 @@
-# Check 64bit FRED instructions
-
- .allow_index_reg
- .text
-_start:
- erets #FRED
- eretu #FRED
-
-.intel_syntax noprefix
- erets #FRED
- eretu #FRED
diff --git a/gas/testsuite/gas/i386/x86-64-lkgs-intel.d b/gas/testsuite/gas/i386/x86-64-lkgs-intel.d
deleted file mode 100644
index 0f4a6fba6d3..00000000000
--- a/gas/testsuite/gas/i386/x86-64-lkgs-intel.d
+++ /dev/null
@@ -1,25 +0,0 @@
-#as:
-#objdump: -dw -Mintel
-#name: x86_64 LKGS insns (Intel disassembly)
-#source: x86-64-lkgs.s
-
-.*: +file format .*
-
-Disassembly of section \.text:
-
-0+ <_start>:
-\s*[a-f0-9]+:\s*f2 41 0f 00 f4\s+lkgs r12w
-\s*[a-f0-9]+:\s*f2 41 0f 00 f4\s+lkgs r12w
-\s*[a-f0-9]+:\s*f2 41 0f 00 f4\s+lkgs r12w
-\s*[a-f0-9]+:\s*f2 42 0f 00 b4 f5 00 00 00 10\s+lkgs WORD PTR \[rbp\+r14\*8\+0x10000000\]
-\s*[a-f0-9]+:\s*f2 41 0f 00 31\s+lkgs WORD PTR \[r9\]
-\s*[a-f0-9]+:\s*f2 0f 00 b1 fe 00 00 00\s+lkgs WORD PTR \[rcx\+0xfe\]
-\s*[a-f0-9]+:\s*f2 0f 00 b2 00 ff ff ff\s+lkgs WORD PTR \[rdx-0x100\]
-\s*[a-f0-9]+:\s*f2 41 0f 00 f4\s+lkgs r12w
-\s*[a-f0-9]+:\s*f2 41 0f 00 f4\s+lkgs r12w
-\s*[a-f0-9]+:\s*f2 41 0f 00 f4\s+lkgs r12w
-\s*[a-f0-9]+:\s*f2 42 0f 00 b4 f5 00 00 00 10\s+lkgs WORD PTR \[rbp\+r14\*8\+0x10000000\]
-\s*[a-f0-9]+:\s*f2 41 0f 00 31\s+lkgs WORD PTR \[r9\]
-\s*[a-f0-9]+:\s*f2 0f 00 b1 fe 00 00 00\s+lkgs WORD PTR \[rcx\+0xfe\]
-\s*[a-f0-9]+:\s*f2 0f 00 b2 00 ff ff ff\s+lkgs WORD PTR \[rdx-0x100\]
-#pass
diff --git a/gas/testsuite/gas/i386/x86-64-lkgs-inval.l b/gas/testsuite/gas/i386/x86-64-lkgs-inval.l
deleted file mode 100644
index 77ee7d7c8b9..00000000000
--- a/gas/testsuite/gas/i386/x86-64-lkgs-inval.l
+++ /dev/null
@@ -1,9 +0,0 @@
-.* Assembler messages:
-.*:5: Error: invalid instruction suffix for `lkgs'
-.*:6: Error: invalid instruction suffix for `lkgs'
-.*:7: Error: invalid instruction suffix for `lkgs'
-.*:8: Error: invalid instruction suffix for `lkgs'
-.*:11: Error: invalid instruction suffix for `lkgs'
-.*:12: Error: invalid instruction suffix for `lkgs'
-.*:13: Error: invalid instruction suffix for `lkgs'
-.*:14: Error: invalid instruction suffix for `lkgs'
diff --git a/gas/testsuite/gas/i386/x86-64-lkgs-inval.s b/gas/testsuite/gas/i386/x86-64-lkgs-inval.s
deleted file mode 100644
index 1dbce14bae4..00000000000
--- a/gas/testsuite/gas/i386/x86-64-lkgs-inval.s
+++ /dev/null
@@ -1,14 +0,0 @@
-# Check illegal 64bit suffer usage in LKGS instructions
-
- .text
-_start:
- lkgsb %r12 #LKGS
- lkgss %r12 #LKGS
- lkgsb (%r9) #LKGS
- lkgss (%r9) #LKGS
-
- .intel_syntax noprefix
- lkgsb %r12 #LKGS
- lkgsb BYTE PTR [r9] #LKGS
- lkgsd DWORD PTR [r9] #LKGS
- lkgsq QWORD PTR [r9] #LKGS
diff --git a/gas/testsuite/gas/i386/x86-64-lkgs.d b/gas/testsuite/gas/i386/x86-64-lkgs.d
deleted file mode 100644
index 207143da574..00000000000
--- a/gas/testsuite/gas/i386/x86-64-lkgs.d
+++ /dev/null
@@ -1,25 +0,0 @@
-#as:
-#objdump: -dw
-#name: x86_64 LKGS insns
-#source: x86-64-lkgs.s
-
-.*: +file format .*
-
-Disassembly of section \.text:
-
-0+ <_start>:
-\s*[a-f0-9]+:\s*f2 41 0f 00 f4\s+lkgs %r12w
-\s*[a-f0-9]+:\s*f2 41 0f 00 f4\s+lkgs %r12w
-\s*[a-f0-9]+:\s*f2 41 0f 00 f4\s+lkgs %r12w
-\s*[a-f0-9]+:\s*f2 42 0f 00 b4 f5 00 00 00 10\s+lkgs 0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*f2 41 0f 00 31\s+lkgs \(%r9\)
-\s*[a-f0-9]+:\s*f2 0f 00 b1 fe 00 00 00\s+lkgs 0xfe\(%rcx\)
-\s*[a-f0-9]+:\s*f2 0f 00 b2 00 ff ff ff\s+lkgs -0x100\(%rdx\)
-\s*[a-f0-9]+:\s*f2 41 0f 00 f4\s+lkgs %r12w
-\s*[a-f0-9]+:\s*f2 41 0f 00 f4\s+lkgs %r12w
-\s*[a-f0-9]+:\s*f2 41 0f 00 f4\s+lkgs %r12w
-\s*[a-f0-9]+:\s*f2 42 0f 00 b4 f5 00 00 00 10\s+lkgs 0x10000000\(%rbp,%r14,8\)
-\s*[a-f0-9]+:\s*f2 41 0f 00 31\s+lkgs \(%r9\)
-\s*[a-f0-9]+:\s*f2 0f 00 b1 fe 00 00 00\s+lkgs 0xfe\(%rcx\)
-\s*[a-f0-9]+:\s*f2 0f 00 b2 00 ff ff ff\s+lkgs -0x100\(%rdx\)
-#pass
diff --git a/gas/testsuite/gas/i386/x86-64-lkgs.s b/gas/testsuite/gas/i386/x86-64-lkgs.s
deleted file mode 100644
index 546bbcc580a..00000000000
--- a/gas/testsuite/gas/i386/x86-64-lkgs.s
+++ /dev/null
@@ -1,21 +0,0 @@
-# Check 64bit LKGS instructions
-
- .allow_index_reg
- .text
-_start:
- lkgs %r12 #LKGS
- lkgs %r12w #LKGS
- lkgsw %r12w #LKGS
- lkgs 0x10000000(%rbp, %r14, 8) #LKGS
- lkgs (%r9) #LKGS
- lkgs 254(%rcx) #LKGS Disp32(fe000000)
- lkgs -256(%rdx) #LKGS Disp32(00ffffff)
-
-.intel_syntax noprefix
- lkgs r12 #LKGS
- lkgs r12w #LKGS
- lkgsw r12w #LKGS
- lkgs WORD PTR [rbp+r14*8+0x10000000] #LKGS
- lkgs WORD PTR [r9] #LKGS
- lkgs WORD PTR [rcx+254] #LKGS Disp32(fe000000)
- lkgs WORD PTR [rdx-256] #LKGS Disp32(00ffffff)
diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index 07fcf3269f9..23e8b095e49 100644
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -1016,9 +1016,7 @@ enum
enum
{
PREFIX_90 = 0,
- PREFIX_0F00_REG_6_X86_64,
PREFIX_0F01_REG_0_MOD_3_RM_6,
- PREFIX_0F01_REG_1_RM_2,
PREFIX_0F01_REG_1_RM_4,
PREFIX_0F01_REG_1_RM_5,
PREFIX_0F01_REG_1_RM_6,
@@ -1303,13 +1301,10 @@ enum
X86_64_E8,
X86_64_E9,
X86_64_EA,
- X86_64_0F00_REG_6,
X86_64_0F01_REG_0,
X86_64_0F01_REG_0_MOD_3_RM_6_P_1,
X86_64_0F01_REG_0_MOD_3_RM_6_P_3,
X86_64_0F01_REG_1,
- X86_64_0F01_REG_1_RM_2_PREFIX_1,
- X86_64_0F01_REG_1_RM_2_PREFIX_3,
X86_64_0F01_REG_1_RM_5_PREFIX_2,
X86_64_0F01_REG_1_RM_6_PREFIX_2,
X86_64_0F01_REG_1_RM_7_PREFIX_2,
@@ -2751,7 +2746,7 @@ static const struct dis386 reg_table[][8] = {
{ "ltr", { Ew }, 0 },
{ "verr", { Ew }, 0 },
{ "verw", { Ew }, 0 },
- { X86_64_TABLE (X86_64_0F00_REG_6) },
+ { Bad_Opcode },
{ Bad_Opcode },
},
/* REG_0F01 */
@@ -2992,14 +2987,6 @@ static const struct dis386 prefix_table[][4] = {
{ NULL, { { NULL, 0 } }, PREFIX_IGNORED }
},
- /* PREFIX_0F00_REG_6_X86_64 */
- {
- { Bad_Opcode },
- { Bad_Opcode },
- { Bad_Opcode },
- { "lkgs", { Ew }, 0 },
- },
-
/* PREFIX_0F01_REG_0_MOD_3_RM_6 */
{
{ "wrmsrns", { Skip_MODRM }, 0 },
@@ -3008,14 +2995,6 @@ static const struct dis386 prefix_table[][4] = {
{ X86_64_TABLE (X86_64_0F01_REG_0_MOD_3_RM_6_P_3) },
},
- /* PREFIX_0F01_REG_1_RM_2 */
- {
- { "clac", { Skip_MODRM }, 0 },
- { X86_64_TABLE (X86_64_0F01_REG_1_RM_2_PREFIX_1) },
- { Bad_Opcode },
- { X86_64_TABLE (X86_64_0F01_REG_1_RM_2_PREFIX_3)},
- },
-
/* PREFIX_0F01_REG_1_RM_4 */
{
{ Bad_Opcode },
@@ -4383,12 +4362,6 @@ static const struct dis386 x86_64_table[][2] = {
{ "{l|}jmp{P|}", { Ap }, 0 },
},
- /* X86_64_0F00_REG_6 */
- {
- { Bad_Opcode },
- { PREFIX_TABLE (PREFIX_0F00_REG_6_X86_64) },
- },
-
/* X86_64_0F01_REG_0 */
{
{ "sgdt{Q|Q}", { M }, 0 },
@@ -4413,18 +4386,6 @@ static const struct dis386 x86_64_table[][2] = {
{ "sidt", { M }, 0 },
},
- /* X86_64_0F01_REG_1_RM_2_PREFIX_1 */
- {
- { Bad_Opcode },
- { "eretu", { Skip_MODRM }, 0 },
- },
-
- /* X86_64_0F01_REG_1_RM_2_PREFIX_3 */
- {
- { Bad_Opcode },
- { "erets", { Skip_MODRM }, 0 },
- },
-
/* X86_64_0F01_REG_1_RM_5_PREFIX_2 */
{
{ Bad_Opcode },
@@ -8732,7 +8693,7 @@ static const struct dis386 rm_table[][8] = {
/* RM_0F01_REG_1 */
{ "monitor", { { OP_Monitor, 0 } }, 0 },
{ "mwait", { { OP_Mwait, 0 } }, 0 },
- { PREFIX_TABLE (PREFIX_0F01_REG_1_RM_2) },
+ { "clac", { Skip_MODRM }, 0 },
{ "stac", { Skip_MODRM }, 0 },
{ PREFIX_TABLE (PREFIX_0F01_REG_1_RM_4) },
{ PREFIX_TABLE (PREFIX_0F01_REG_1_RM_5) },
diff --git a/opcodes/i386-gen.c b/opcodes/i386-gen.c
index 1db555d8615..c2ac3c6832d 100644
--- a/opcodes/i386-gen.c
+++ b/opcodes/i386-gen.c
@@ -164,8 +164,6 @@ static const dependency isa_dependencies[] =
"AVX2" },
{ "AVX_NE_CONVERT",
"AVX2" },
- { "FRED",
- "LKGS" },
{ "AVX512F",
"AVX2" },
{ "AVX512CD",
@@ -364,8 +362,6 @@ static bitfield cpu_flags[] =
BITFIELD (MSRLIST),
BITFIELD (AVX_NE_CONVERT),
BITFIELD (RAO_INT),
- BITFIELD (FRED),
- BITFIELD (LKGS),
BITFIELD (MWAITX),
BITFIELD (CLZERO),
BITFIELD (OSPKE),
diff --git a/opcodes/i386-opc.h b/opcodes/i386-opc.h
index d65392aca8d..b17e8341aa2 100644
--- a/opcodes/i386-opc.h
+++ b/opcodes/i386-opc.h
@@ -229,10 +229,6 @@ enum
CpuAVX_NE_CONVERT,
/* Intel RAO INT Instructions support required. */
CpuRAO_INT,
- /* fred instruction required */
- CpuFRED,
- /* lkgs instruction required */
- CpuLKGS,
/* mwaitx instruction required */
CpuMWAITX,
/* Clzero instruction required */
@@ -428,8 +424,6 @@ typedef union i386_cpu_flags
unsigned int cpumsrlist:1;
unsigned int cpuavx_ne_convert:1;
unsigned int cpurao_int:1;
- unsigned int cpufred:1;
- unsigned int cpulkgs:1;
unsigned int cpumwaitx:1;
unsigned int cpuclzero:1;
unsigned int cpuospke:1;
diff --git a/opcodes/i386-opc.tbl b/opcodes/i386-opc.tbl
index c1d323310e5..15d48eeb4c7 100644
--- a/opcodes/i386-opc.tbl
+++ b/opcodes/i386-opc.tbl
@@ -3351,17 +3351,3 @@ aor, 0xf20f38fc, RAO_INT, Modrm|IgnoreSize|CheckOperandSize|NoSuf, { Reg32|Reg64
axor, 0xf30f38fc, RAO_INT, Modrm|IgnoreSize|CheckOperandSize|NoSuf, { Reg32|Reg64, Dword|Qword|Unspecified|BaseIndex }
// RAO-INT instructions end.
-
-// LKGS instruction.
-
-lkgs, 0xf20f00/6, LKGS|x64, Modrm|IgnoreSize|No_bSuf|No_sSuf|NoRex64, { Reg16|Reg32|Reg64 }
-lkgs, 0xf20f00/6, LKGS|x64, Modrm|IgnoreSize|No_bSuf|No_lSuf|No_sSuf|No_qSuf, { Word|Unspecified|BaseIndex }
-
-// LKGS instruction end.
-
-// FRED instructions.
-
-erets, 0xf20f01ca, FRED|x64, NoSuf, {}
-eretu, 0xf30f01ca, FRED|x64, NoSuf, {}
-
-// FRED instructions end.
More information about the Binutils-cvs
mailing list