Revert "Support Intel FRED LKGS"

This reverts commit e5a497fe38e0ab19e16bdd9e4b4ed5e4d0056478.

4 files changed, 2 insertions, 65 deletions

diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index 07fcf32..23e8b09 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 1db555d..c2ac3c6 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 d65392a..b17e834 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 c1d3233..15d48ee 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.