From 82b6a02174a277bbadc4d9c8d57bad9be189c868 Mon Sep 17 00:00:00 2001
From: Marat Dukhan <maratek@gmail.com>
Date: Sun, 7 Jan 2024 10:32:40 -0800
Subject: [PATCH] Remove 64-bit TBM instructions from 32-bit x86 ISA

These instructions can't be encoded in 32-bit x86 and were added by
mistake
---
 opcodes/x86.xml | 204 ------------------------------------------------
 opcodes/x86.xsd |   6 --
 2 files changed, 210 deletions(-)

diff --git a/opcodes/x86.xml b/opcodes/x86.xml
index 5486239..9e72a4e 100644
--- a/opcodes/x86.xml
+++ b/opcodes/x86.xml
@@ -1243,30 +1243,6 @@
         <ModRM mode="#1" reg="#0" rm="#1"/>
       </Encoding>
     </InstructionForm>
-    <InstructionForm gas-name="bextrq">
-      <ISA id="TBM"/>
-      <Operand type="r64" input="false" output="true"/>
-      <Operand type="r64" input="true" output="false"/>
-      <Operand type="imm32"/>
-      <Encoding>
-        <VEX type="XOP" W="1" L="0" m-mmmm="01010" pp="00" R="0" X="0" B="0" vvvv="0000"/>
-        <Opcode byte="10"/>
-        <ModRM mode="11" reg="#0" rm="#1"/>
-        <Immediate size="4" value="#2"/>
-      </Encoding>
-    </InstructionForm>
-    <InstructionForm gas-name="bextrq">
-      <ISA id="TBM"/>
-      <Operand type="r64" input="false" output="true"/>
-      <Operand type="m64" input="true" output="false"/>
-      <Operand type="imm32"/>
-      <Encoding>
-        <VEX type="XOP" W="1" L="0" m-mmmm="01010" pp="00" R="0" X="0" B="0" vvvv="0000"/>
-        <Opcode byte="10"/>
-        <ModRM mode="#1" reg="#0" rm="#1"/>
-        <Immediate size="4" value="#2"/>
-      </Encoding>
-    </InstructionForm>
   </Instruction>
   <Instruction name="BLCFILL" summary="Fill From Lowest Clear Bit">
     <InstructionForm gas-name="blcfill">
@@ -1289,26 +1265,6 @@
         <ModRM mode="#1" reg="1" rm="#1"/>
       </Encoding>
     </InstructionForm>
-    <InstructionForm gas-name="blcfill">
-      <ISA id="TBM"/>
-      <Operand type="r64" input="false" output="true"/>
-      <Operand type="r64" input="true" output="false"/>
-      <Encoding>
-        <VEX type="XOP" W="1" L="0" m-mmmm="01001" pp="00" R="0" X="0" B="0" vvvv="#0"/>
-        <Opcode byte="01"/>
-        <ModRM mode="11" reg="1" rm="#1"/>
-      </Encoding>
-    </InstructionForm>
-    <InstructionForm gas-name="blcfill">
-      <ISA id="TBM"/>
-      <Operand type="r64" input="false" output="true"/>
-      <Operand type="m64" input="true" output="false"/>
-      <Encoding>
-        <VEX type="XOP" W="1" L="0" m-mmmm="01001" pp="00" R="0" X="0" B="0" vvvv="#0"/>
-        <Opcode byte="01"/>
-        <ModRM mode="#1" reg="1" rm="#1"/>
-      </Encoding>
-    </InstructionForm>
   </Instruction>
   <Instruction name="BLCI" summary="Isolate Lowest Clear Bit">
     <InstructionForm gas-name="blci">
@@ -1331,26 +1287,6 @@
         <ModRM mode="#1" reg="6" rm="#1"/>
       </Encoding>
     </InstructionForm>
-    <InstructionForm gas-name="blci">
-      <ISA id="TBM"/>
-      <Operand type="r64" input="false" output="true"/>
-      <Operand type="r64" input="true" output="false"/>
-      <Encoding>
-        <VEX type="XOP" W="1" L="0" m-mmmm="01001" pp="00" R="0" X="0" B="0" vvvv="#0"/>
-        <Opcode byte="02"/>
-        <ModRM mode="11" reg="6" rm="#1"/>
-      </Encoding>
-    </InstructionForm>
-    <InstructionForm gas-name="blci">
-      <ISA id="TBM"/>
-      <Operand type="r64" input="false" output="true"/>
-      <Operand type="m64" input="true" output="false"/>
-      <Encoding>
-        <VEX type="XOP" W="1" L="0" m-mmmm="01001" pp="00" R="0" X="0" B="0" vvvv="#0"/>
-        <Opcode byte="02"/>
-        <ModRM mode="#1" reg="6" rm="#1"/>
-      </Encoding>
-    </InstructionForm>
   </Instruction>
   <Instruction name="BLCIC" summary="Isolate Lowest Set Bit and Complement">
     <InstructionForm gas-name="blcic">
@@ -1373,26 +1309,6 @@
         <ModRM mode="#1" reg="5" rm="#1"/>
       </Encoding>
     </InstructionForm>
-    <InstructionForm gas-name="blcic">
-      <ISA id="TBM"/>
-      <Operand type="r64" input="false" output="true"/>
-      <Operand type="r64" input="true" output="false"/>
-      <Encoding>
-        <VEX type="XOP" W="1" L="0" m-mmmm="01001" pp="00" R="0" X="0" B="0" vvvv="#0"/>
-        <Opcode byte="01"/>
-        <ModRM mode="11" reg="5" rm="#1"/>
-      </Encoding>
-    </InstructionForm>
-    <InstructionForm gas-name="blcic">
-      <ISA id="TBM"/>
-      <Operand type="r64" input="false" output="true"/>
-      <Operand type="m64" input="true" output="false"/>
-      <Encoding>
-        <VEX type="XOP" W="1" L="0" m-mmmm="01001" pp="00" R="0" X="0" B="0" vvvv="#0"/>
-        <Opcode byte="01"/>
-        <ModRM mode="#1" reg="5" rm="#1"/>
-      </Encoding>
-    </InstructionForm>
   </Instruction>
   <Instruction name="BLCMSK" summary="Mask From Lowest Clear Bit">
     <InstructionForm gas-name="blcmsk">
@@ -1415,26 +1331,6 @@
         <ModRM mode="#1" reg="1" rm="#1"/>
       </Encoding>
     </InstructionForm>
-    <InstructionForm gas-name="blcmsk">
-      <ISA id="TBM"/>
-      <Operand type="r64" input="false" output="true"/>
-      <Operand type="r64" input="true" output="false"/>
-      <Encoding>
-        <VEX type="XOP" W="1" L="0" m-mmmm="01001" pp="00" R="0" X="0" B="0" vvvv="#0"/>
-        <Opcode byte="02"/>
-        <ModRM mode="11" reg="1" rm="#1"/>
-      </Encoding>
-    </InstructionForm>
-    <InstructionForm gas-name="blcmsk">
-      <ISA id="TBM"/>
-      <Operand type="r64" input="false" output="true"/>
-      <Operand type="m64" input="true" output="false"/>
-      <Encoding>
-        <VEX type="XOP" W="1" L="0" m-mmmm="01001" pp="00" R="0" X="0" B="0" vvvv="#0"/>
-        <Opcode byte="02"/>
-        <ModRM mode="#1" reg="1" rm="#1"/>
-      </Encoding>
-    </InstructionForm>
   </Instruction>
   <Instruction name="BLCS" summary="Set Lowest Clear Bit">
     <InstructionForm gas-name="blcs">
@@ -1457,26 +1353,6 @@
         <ModRM mode="#1" reg="3" rm="#1"/>
       </Encoding>
     </InstructionForm>
-    <InstructionForm gas-name="blcs">
-      <ISA id="TBM"/>
-      <Operand type="r64" input="false" output="true"/>
-      <Operand type="r64" input="true" output="false"/>
-      <Encoding>
-        <VEX type="XOP" W="1" L="0" m-mmmm="01001" pp="00" R="0" X="0" B="0" vvvv="#0"/>
-        <Opcode byte="01"/>
-        <ModRM mode="11" reg="3" rm="#1"/>
-      </Encoding>
-    </InstructionForm>
-    <InstructionForm gas-name="blcs">
-      <ISA id="TBM"/>
-      <Operand type="r64" input="false" output="true"/>
-      <Operand type="m64" input="true" output="false"/>
-      <Encoding>
-        <VEX type="XOP" W="1" L="0" m-mmmm="01001" pp="00" R="0" X="0" B="0" vvvv="#0"/>
-        <Opcode byte="01"/>
-        <ModRM mode="#1" reg="3" rm="#1"/>
-      </Encoding>
-    </InstructionForm>
   </Instruction>
   <Instruction name="BLENDPD" summary="Blend Packed Double Precision Floating-Point Values">
     <InstructionForm gas-name="blendpd" xmm-mode="SSE">
@@ -1615,26 +1491,6 @@
         <ModRM mode="#1" reg="2" rm="#1"/>
       </Encoding>
     </InstructionForm>
-    <InstructionForm gas-name="blsfill">
-      <ISA id="TBM"/>
-      <Operand type="r64" input="false" output="true"/>
-      <Operand type="r64" input="true" output="false"/>
-      <Encoding>
-        <VEX type="XOP" W="1" L="0" m-mmmm="01001" pp="00" R="0" X="0" B="0" vvvv="#0"/>
-        <Opcode byte="01"/>
-        <ModRM mode="11" reg="2" rm="#1"/>
-      </Encoding>
-    </InstructionForm>
-    <InstructionForm gas-name="blsfill">
-      <ISA id="TBM"/>
-      <Operand type="r64" input="false" output="true"/>
-      <Operand type="m64" input="true" output="false"/>
-      <Encoding>
-        <VEX type="XOP" W="1" L="0" m-mmmm="01001" pp="00" R="0" X="0" B="0" vvvv="#0"/>
-        <Opcode byte="01"/>
-        <ModRM mode="#1" reg="2" rm="#1"/>
-      </Encoding>
-    </InstructionForm>
   </Instruction>
   <Instruction name="BLSI" summary="Isolate Lowest Set Bit">
     <InstructionForm gas-name="blsil">
@@ -1679,26 +1535,6 @@
         <ModRM mode="#1" reg="6" rm="#1"/>
       </Encoding>
     </InstructionForm>
-    <InstructionForm gas-name="blsic">
-      <ISA id="TBM"/>
-      <Operand type="r64" input="false" output="true"/>
-      <Operand type="r64" input="true" output="false"/>
-      <Encoding>
-        <VEX type="XOP" W="1" L="0" m-mmmm="01001" pp="00" R="0" X="0" B="0" vvvv="#0"/>
-        <Opcode byte="01"/>
-        <ModRM mode="11" reg="6" rm="#1"/>
-      </Encoding>
-    </InstructionForm>
-    <InstructionForm gas-name="blsic">
-      <ISA id="TBM"/>
-      <Operand type="r64" input="false" output="true"/>
-      <Operand type="m64" input="true" output="false"/>
-      <Encoding>
-        <VEX type="XOP" W="1" L="0" m-mmmm="01001" pp="00" R="0" X="0" B="0" vvvv="#0"/>
-        <Opcode byte="01"/>
-        <ModRM mode="#1" reg="6" rm="#1"/>
-      </Encoding>
-    </InstructionForm>
   </Instruction>
   <Instruction name="BLSMSK" summary="Mask From Lowest Set Bit">
     <InstructionForm gas-name="blsmskl">
@@ -18045,26 +17881,6 @@
         <ModRM mode="#1" reg="7" rm="#1"/>
       </Encoding>
     </InstructionForm>
-    <InstructionForm gas-name="t1mskc">
-      <ISA id="TBM"/>
-      <Operand type="r64" input="false" output="true"/>
-      <Operand type="r64" input="true" output="false"/>
-      <Encoding>
-        <VEX type="XOP" W="1" L="0" m-mmmm="01001" pp="00" R="0" X="0" B="0" vvvv="#0"/>
-        <Opcode byte="01"/>
-        <ModRM mode="11" reg="7" rm="#1"/>
-      </Encoding>
-    </InstructionForm>
-    <InstructionForm gas-name="t1mskc">
-      <ISA id="TBM"/>
-      <Operand type="r64" input="false" output="true"/>
-      <Operand type="m64" input="true" output="false"/>
-      <Encoding>
-        <VEX type="XOP" W="1" L="0" m-mmmm="01001" pp="00" R="0" X="0" B="0" vvvv="#0"/>
-        <Opcode byte="01"/>
-        <ModRM mode="#1" reg="7" rm="#1"/>
-      </Encoding>
-    </InstructionForm>
   </Instruction>
   <Instruction name="TEST" summary="Logical Compare">
     <InstructionForm gas-name="testb" go-name="TESTB">
@@ -18282,26 +18098,6 @@
         <ModRM mode="#1" reg="4" rm="#1"/>
       </Encoding>
     </InstructionForm>
-    <InstructionForm gas-name="tzmsk">
-      <ISA id="TBM"/>
-      <Operand type="r64" input="false" output="true"/>
-      <Operand type="r64" input="true" output="false"/>
-      <Encoding>
-        <VEX type="XOP" W="1" L="0" m-mmmm="01001" pp="00" R="0" X="0" B="0" vvvv="#0"/>
-        <Opcode byte="01"/>
-        <ModRM mode="11" reg="4" rm="#1"/>
-      </Encoding>
-    </InstructionForm>
-    <InstructionForm gas-name="tzmsk">
-      <ISA id="TBM"/>
-      <Operand type="r64" input="false" output="true"/>
-      <Operand type="m64" input="true" output="false"/>
-      <Encoding>
-        <VEX type="XOP" W="1" L="0" m-mmmm="01001" pp="00" R="0" X="0" B="0" vvvv="#0"/>
-        <Opcode byte="01"/>
-        <ModRM mode="#1" reg="4" rm="#1"/>
-      </Encoding>
-    </InstructionForm>
   </Instruction>
   <Instruction name="UCOMISD" summary="Unordered Compare Scalar Double-Precision Floating-Point Values and Set EFLAGS">
     <InstructionForm gas-name="ucomisd" go-name="UCOMISD" xmm-mode="SSE">
diff --git a/opcodes/x86.xsd b/opcodes/x86.xsd
index ca08c47..df60c89 100644
--- a/opcodes/x86.xsd
+++ b/opcodes/x86.xsd
@@ -8,19 +8,13 @@
 			<xs:enumeration value="imm8" />
 			<xs:enumeration value="imm16" />
 			<xs:enumeration value="imm32" />
-			<xs:enumeration value="imm64" />
 			<xs:enumeration value="al" />
 			<xs:enumeration value="cl" />
 			<xs:enumeration value="r8" />
-			<xs:enumeration value="r8l" />
 			<xs:enumeration value="ax" />
 			<xs:enumeration value="r16" />
-			<xs:enumeration value="r16l" />
 			<xs:enumeration value="eax" />
 			<xs:enumeration value="r32" />
-			<xs:enumeration value="r32l" />
-			<xs:enumeration value="rax" />
-			<xs:enumeration value="r64" />
 			<xs:enumeration value="mm" />
 			<xs:enumeration value="xmm0" />
 			<xs:enumeration value="xmm" />