Explicitly specify CMPXCHG8B/CMPXCHG16B extensions

Maratyszcza · Jan 7, 2024 · a11ca92 · a11ca92
1 parent f1348d8
commit a11ca92
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 3 deletions.
diff --git a/opcodes/x86.py b/opcodes/x86.py
@@ -383,7 +383,8 @@ class ISAExtension:
         'MONITORX': 31,
         'WAITPKG': 32,
         # Atomic instructions
-        'RAO-INT': 35,
+        'CMPXCHG8B': 35,
+        'RAO-INT': 36,
         # Instructions operating on MMX state
         'MMX': 40,
         'MMX+': 41,
@@ -478,6 +479,8 @@ class ISAExtension:
         - "MONITORX"         := The `MONITORX` and `MWAITX` instructions.
         - "WAITPKG"          := The `UMONITOR`, `UMWAIT`, and `TPAUSE` instructions.
         - "CMOV"             := Conditional MOVe instructions.
+        - "CMPXCHG8B"        := The `CMPXCHG8B` instruction.
+        - "RAO-INT"          := Remote Atomic Operations extension.
         - "MMX"              := MultiMedia eXtension.
         - "MMX+"             := AMD MMX+ extension / Integer SSE (Intel).
         - "3dnow!"           := AMD 3dnow! extension.

diff --git a/opcodes/x86.xml b/opcodes/x86.xml
@@ -3840,6 +3840,7 @@
   </Instruction>
   <Instruction name="CMPXCHG8B" summary="Compare and Exchange 8 Bytes">
     <InstructionForm gas-name="cmpxchg8b" go-name="CMPXCHG8B">
+      <ISA id="CMPXCHG8B"/>
       <Operand type="m64" input="true" output="false"/>
       <ImplicitOperand id="eax" input="true" output="true"/>
       <ImplicitOperand id="ebx" input="true" output="false"/>

diff --git a/opcodes/x86.xsd b/opcodes/x86.xsd
@@ -389,6 +389,7 @@
 			<xs:enumeration value="BMI2" />
 			<xs:enumeration value="TBM" />
 			<xs:enumeration value="ADX" />
+			<xs:enumeration value="CMPXCHG8B" />
 			<xs:enumeration value="RAO-INT" />
 			<xs:enumeration value="CLFLUSH" />
 			<xs:enumeration value="CLFLUSHOPT" />

diff --git a/opcodes/x86_64.py b/opcodes/x86_64.py
@@ -415,8 +415,10 @@ class ISAExtension:
         'MONITORX': 31,
         'WAITPKG': 32,
         # Atomic instructions
-        'CMPCCXADD': 35,
-        'RAO-INT': 36,
+        'CMPXCHG8B': 35,
+        'CMPXCHG16B': 36,
+        'CMPCCXADD': 37,
+        'RAO-INT': 38,
         # Instructions operating on MMX state
         'MMX': 40,
         'MMX+': 41,
@@ -520,6 +522,8 @@ class ISAExtension:
         - "MONITORX"         := The `MONITORX` and `MWAITX` instructions.
         - "WAITPKG"          := The `UMONITOR`, `UMWAIT`, and `TPAUSE` instructions.
         - "CMOV"             := Conditional MOVe instructions.
+        - "CMPXCHG8B"        := The `CMPXCHG8B` instruction.
+        - "CMPXCHG16B"       := The `CMPXCHG16B` instruction.
         - "CMPCCXADD"        := Compare and Add instructions.
         - "RAO-INT"          := Remote Atomic Operations extension.
         - "MMX"              := MultiMedia eXtension.

diff --git a/opcodes/x86_64.xml b/opcodes/x86_64.xml
@@ -6096,6 +6096,7 @@
   </Instruction>
   <Instruction name="CMPXCHG16B" summary="Compare and Exchange 16 Bytes">
     <InstructionForm gas-name="cmpxchg16b" nacl-version="33">
+      <ISA id="CMPXCHG16B"/>
       <Operand type="m128" input="true" output="false"/>
       <ImplicitOperand id="rax" input="true" output="true"/>
       <ImplicitOperand id="rbx" input="true" output="false"/>
@@ -6111,6 +6112,7 @@
   </Instruction>
   <Instruction name="CMPXCHG8B" summary="Compare and Exchange 8 Bytes">
     <InstructionForm gas-name="cmpxchg8b" go-name="CMPXCHG8B" nacl-version="33">
+      <ISA id="CMPXCHG8B"/>
       <Operand type="m64" input="true" output="false"/>
       <ImplicitOperand id="eax" input="true" output="true"/>
       <ImplicitOperand id="ebx" input="true" output="false"/>

diff --git a/opcodes/x86_64.xsd b/opcodes/x86_64.xsd
@@ -460,6 +460,8 @@
 			<xs:enumeration value="BMI2" />
 			<xs:enumeration value="TBM" />
 			<xs:enumeration value="ADX" />
+			<xs:enumeration value="CMPXCHG8B" />
+			<xs:enumeration value="CMPXCHG16B" />
 			<xs:enumeration value="RAO-INT" />
 			<xs:enumeration value="CMPCCXADD" />
 			<xs:enumeration value="CLFLUSH" />