From fb79b4a218a715aba8d0a4f8126a6ded532be449 Mon Sep 17 00:00:00 2001
From: iximeow <me@iximeow.net>
Date: Sun, 9 Aug 2020 18:53:56 -0700
Subject: add 32-bit-only instructions

---
 src/protected_mode/display.rs | 12 +++++++
 src/protected_mode/mod.rs     | 76 +++++++++++++++++++++++++++++++++++--------
 test/protected_mode/mod.rs    | 15 +++++++++
 3 files changed, 90 insertions(+), 13 deletions(-)

diff --git a/src/protected_mode/display.rs b/src/protected_mode/display.rs
index 6f73df1..171118a 100644
--- a/src/protected_mode/display.rs
+++ b/src/protected_mode/display.rs
@@ -1214,6 +1214,12 @@ const MNEMONICS: &[&'static str] = &[
     "pusha",
     "popa",
     "arpl",
+    "aas",
+    "aaa",
+    "das",
+    "daa",
+    "amx",
+    "adx",
 ];
 
 impl Opcode {
@@ -1579,6 +1585,12 @@ impl <T: fmt::Write, Color: fmt::Display, Y: YaxColors<Color>> Colorize<T, Color
             Opcode::FXTRACT |
             Opcode::FYL2X |
             Opcode::FYL2XP1 |
+            Opcode::AAS |
+            Opcode::AAA |
+            Opcode::DAS |
+            Opcode::DAA |
+            Opcode::ADX |
+            Opcode::AMX |
             Opcode::IMUL => { write!(out, "{}", colors.arithmetic_op(self)) }
             Opcode::POPF |
             Opcode::PUSHF |
diff --git a/src/protected_mode/mod.rs b/src/protected_mode/mod.rs
index 82484df..8ac87be 100644
--- a/src/protected_mode/mod.rs
+++ b/src/protected_mode/mod.rs
@@ -111,6 +111,26 @@ impl RegSpec {
     }
 
     #[inline]
+    pub fn cs() -> RegSpec {
+        RegSpec { bank: RegisterBank::S, num: 0 }
+    }
+
+    #[inline]
+    pub fn ds() -> RegSpec {
+        RegSpec { bank: RegisterBank::S, num: 1 }
+    }
+
+    #[inline]
+    pub fn es() -> RegSpec {
+        RegSpec { bank: RegisterBank::S, num: 2 }
+    }
+
+    #[inline]
+    pub fn ss() -> RegSpec {
+        RegSpec { bank: RegisterBank::S, num: 5 }
+    }
+
+    #[inline]
     pub fn fs() -> RegSpec {
         RegSpec { bank: RegisterBank::S, num: 3 }
     }
@@ -1490,6 +1510,12 @@ pub enum Opcode {
     PUSHA,
     POPA,
     ARPL,
+    AAS,
+    AAA,
+    DAS,
+    DAA,
+    AMX,
+    ADX,
 }
 
 #[derive(Debug)]
@@ -3744,6 +3770,10 @@ pub enum OperandCode {
     Yb_Xb = OperandCodeBuilder::new().special_case(100).bits(),
     Yv_AX = OperandCodeBuilder::new().special_case(101).bits(),
     Ew_Gw = OperandCodeBuilder::new().special_case(102).bits(),
+    ES = OperandCodeBuilder::new().special_case(103).bits(),
+    CS = OperandCodeBuilder::new().special_case(104).bits(),
+    SS = OperandCodeBuilder::new().special_case(105).bits(),
+    DS = OperandCodeBuilder::new().special_case(106).bits(),
 }
 
 fn base_opcode_map(v: u8) -> Opcode {
@@ -4903,15 +4933,15 @@ const OPCODES: [OpcodeRecord; 256] = [
     OpcodeRecord(Interpretation::Instruction(Opcode::ADD), OperandCode::Gv_Ev),
     OpcodeRecord(Interpretation::Instruction(Opcode::ADD), OperandCode::AL_Ibs),
     OpcodeRecord(Interpretation::Instruction(Opcode::ADD), OperandCode::AX_Ivd),
-    OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::Nothing),
-    OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::Nothing),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PUSH), OperandCode::ES),
+    OpcodeRecord(Interpretation::Instruction(Opcode::POP), OperandCode::ES),
     OpcodeRecord(Interpretation::Instruction(Opcode::OR), OperandCode::Eb_Gb),
     OpcodeRecord(Interpretation::Instruction(Opcode::OR), OperandCode::Ev_Gv),
     OpcodeRecord(Interpretation::Instruction(Opcode::OR), OperandCode::Gb_Eb),
     OpcodeRecord(Interpretation::Instruction(Opcode::OR), OperandCode::Gv_Ev),
     OpcodeRecord(Interpretation::Instruction(Opcode::OR), OperandCode::AL_Ibs),
     OpcodeRecord(Interpretation::Instruction(Opcode::OR), OperandCode::AX_Ivd),
-    OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::Nothing),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PUSH), OperandCode::CS),
     OpcodeRecord(Interpretation::Prefix, OperandCode::Nothing),
     OpcodeRecord(Interpretation::Instruction(Opcode::ADC), OperandCode::Eb_Gb),
     OpcodeRecord(Interpretation::Instruction(Opcode::ADC), OperandCode::Ev_Gv),
@@ -4919,16 +4949,16 @@ const OPCODES: [OpcodeRecord; 256] = [
     OpcodeRecord(Interpretation::Instruction(Opcode::ADC), OperandCode::Gv_Ev),
     OpcodeRecord(Interpretation::Instruction(Opcode::ADC), OperandCode::AL_Ibs),
     OpcodeRecord(Interpretation::Instruction(Opcode::ADC), OperandCode::AX_Ivd),
-    OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::Nothing),
-    OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::Nothing),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PUSH), OperandCode::SS),
+    OpcodeRecord(Interpretation::Instruction(Opcode::POP), OperandCode::SS),
     OpcodeRecord(Interpretation::Instruction(Opcode::SBB), OperandCode::Eb_Gb),
     OpcodeRecord(Interpretation::Instruction(Opcode::SBB), OperandCode::Ev_Gv),
     OpcodeRecord(Interpretation::Instruction(Opcode::SBB), OperandCode::Gb_Eb),
     OpcodeRecord(Interpretation::Instruction(Opcode::SBB), OperandCode::Gv_Ev),
     OpcodeRecord(Interpretation::Instruction(Opcode::SBB), OperandCode::AL_Ibs),
     OpcodeRecord(Interpretation::Instruction(Opcode::SBB), OperandCode::AX_Ivd),
-    OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::Nothing),
-    OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::Nothing),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PUSH), OperandCode::DS),
+    OpcodeRecord(Interpretation::Instruction(Opcode::POP), OperandCode::DS),
     OpcodeRecord(Interpretation::Instruction(Opcode::AND), OperandCode::Eb_Gb),
     OpcodeRecord(Interpretation::Instruction(Opcode::AND), OperandCode::Ev_Gv),
     OpcodeRecord(Interpretation::Instruction(Opcode::AND), OperandCode::Gb_Eb),
@@ -4936,7 +4966,7 @@ const OPCODES: [OpcodeRecord; 256] = [
     OpcodeRecord(Interpretation::Instruction(Opcode::AND), OperandCode::AL_Ibs),
     OpcodeRecord(Interpretation::Instruction(Opcode::AND), OperandCode::AX_Ivd),
     OpcodeRecord(Interpretation::Prefix, OperandCode::Nothing),
-    OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::Nothing),
+    OpcodeRecord(Interpretation::Instruction(Opcode::DAA), OperandCode::Nothing),
     OpcodeRecord(Interpretation::Instruction(Opcode::SUB), OperandCode::Eb_Gb),
     OpcodeRecord(Interpretation::Instruction(Opcode::SUB), OperandCode::Ev_Gv),
     OpcodeRecord(Interpretation::Instruction(Opcode::SUB), OperandCode::Gb_Eb),
@@ -4944,7 +4974,7 @@ const OPCODES: [OpcodeRecord; 256] = [
     OpcodeRecord(Interpretation::Instruction(Opcode::SUB), OperandCode::AL_Ibs),
     OpcodeRecord(Interpretation::Instruction(Opcode::SUB), OperandCode::AX_Ivd),
     OpcodeRecord(Interpretation::Prefix, OperandCode::Nothing),
-    OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::Nothing),
+    OpcodeRecord(Interpretation::Instruction(Opcode::DAS), OperandCode::Nothing),
     OpcodeRecord(Interpretation::Instruction(Opcode::XOR), OperandCode::Eb_Gb),
     OpcodeRecord(Interpretation::Instruction(Opcode::XOR), OperandCode::Ev_Gv),
     OpcodeRecord(Interpretation::Instruction(Opcode::XOR), OperandCode::Gb_Eb),
@@ -4952,7 +4982,7 @@ const OPCODES: [OpcodeRecord; 256] = [
     OpcodeRecord(Interpretation::Instruction(Opcode::XOR), OperandCode::AL_Ibs),
     OpcodeRecord(Interpretation::Instruction(Opcode::XOR), OperandCode::AX_Ivd),
     OpcodeRecord(Interpretation::Prefix, OperandCode::Nothing),
-    OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::Nothing),
+    OpcodeRecord(Interpretation::Instruction(Opcode::AAA), OperandCode::Nothing),
     OpcodeRecord(Interpretation::Instruction(Opcode::CMP), OperandCode::Eb_Gb),
     OpcodeRecord(Interpretation::Instruction(Opcode::CMP), OperandCode::Ev_Gv),
     OpcodeRecord(Interpretation::Instruction(Opcode::CMP), OperandCode::Gb_Eb),
@@ -4960,7 +4990,7 @@ const OPCODES: [OpcodeRecord; 256] = [
     OpcodeRecord(Interpretation::Instruction(Opcode::CMP), OperandCode::AL_Ibs),
     OpcodeRecord(Interpretation::Instruction(Opcode::CMP), OperandCode::AX_Ivd),
     OpcodeRecord(Interpretation::Prefix, OperandCode::Nothing),
-    OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::Nothing),
+    OpcodeRecord(Interpretation::Instruction(Opcode::AAS), OperandCode::Nothing),
 // 0x40:
     OpcodeRecord(Interpretation::Instruction(Opcode::INC), OperandCode::Zv_R0),
     OpcodeRecord(Interpretation::Instruction(Opcode::INC), OperandCode::Zv_R1),
@@ -5117,8 +5147,8 @@ const OPCODES: [OpcodeRecord; 256] = [
     OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::ModRM_0xd1_Ev_1),
     OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::ModRM_0xd2_Eb_CL),
     OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::ModRM_0xd3_Ev_CL),
-    OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::Nothing),
-    OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::Nothing),
+    OpcodeRecord(Interpretation::Instruction(Opcode::AMX), OperandCode::Ib),
+    OpcodeRecord(Interpretation::Instruction(Opcode::ADX), OperandCode::Ib),
     OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::Nothing),
     // XLAT
     OpcodeRecord(Interpretation::Instruction(Opcode::XLAT), OperandCode::Nothing),
@@ -7761,6 +7791,26 @@ fn unlikely_operands<T: Iterator<Item=u8>>(decoder: &InstDecoder, mut bytes_iter
             instruction.operands[0] = OperandSpec::RegRRR;
             instruction.operand_count = 1;
         }
+        OperandCode::CS => {
+            instruction.modrm_rrr = RegSpec::cs();
+            instruction.operands[0] = OperandSpec::RegRRR;
+            instruction.operand_count = 1;
+        }
+        OperandCode::DS => {
+            instruction.modrm_rrr = RegSpec::ds();
+            instruction.operands[0] = OperandSpec::RegRRR;
+            instruction.operand_count = 1;
+        }
+        OperandCode::ES => {
+            instruction.modrm_rrr = RegSpec::es();
+            instruction.operands[0] = OperandSpec::RegRRR;
+            instruction.operand_count = 1;
+        }
+        OperandCode::SS => {
+            instruction.modrm_rrr = RegSpec::ss();
+            instruction.operands[0] = OperandSpec::RegRRR;
+            instruction.operand_count = 1;
+        }
         OperandCode::AL_Ib => {
             instruction.modrm_rrr =
                 RegSpec::al();
diff --git a/test/protected_mode/mod.rs b/test/protected_mode/mod.rs
index 243b283..30f88ed 100644
--- a/test/protected_mode/mod.rs
+++ b/test/protected_mode/mod.rs
@@ -1457,6 +1457,21 @@ fn only_32bit() {
     test_display(&[0x60], "pusha");
     test_display(&[0x61], "popa");
     test_display(&[0xce], "into");
+    test_display(&[0x06], "push es");
+    test_display(&[0x07], "pop es");
+    test_display(&[0x0e], "push cs");
+    test_display(&[0x16], "push ss");
+    test_display(&[0x17], "pop ss");
+    test_display(&[0x1e], "push ds");
+    test_display(&[0x1f], "pop ds");
+    test_display(&[0x27], "daa");
+    test_display(&[0x2f], "das");
+    test_display(&[0x37], "aaa");
+    test_display(&[0x3f], "aas");
+    test_display(&[0xd4, 0x01], "amx 0x1");
+    test_display(&[0xd4, 0x0a], "amx 0xa"); // aka "aam"
+    test_display(&[0xd5, 0x01], "adx 0x1");
+    test_display(&[0xd5, 0x0a], "adx 0xa"); // aka "aad"
 }
 
 #[test]
-- 
cgit v1.1