From c5b4cd30efa6cc830f5effaf04df6ec86ad858dd Mon Sep 17 00:00:00 2001
From: iximeow <me@iximeow.net>
Date: Sun, 26 Jul 2020 01:40:46 -0700
Subject: support upper end of 0f opcode map mmx instructions

---
 src/long_mode/mod.rs  | 74 +++++++++++++++++++++++++--------------------------
 test/long_mode/mod.rs | 41 ++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 37 deletions(-)

diff --git a/src/long_mode/mod.rs b/src/long_mode/mod.rs
index 146a535..ac9edf5 100644
--- a/src/long_mode/mod.rs
+++ b/src/long_mode/mod.rs
@@ -4382,9 +4382,9 @@ const OPCODE_0F_MAP: [OpcodeRecord; 256] = [
     OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::ModRM_0x0f71),
     OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::ModRM_0x0f72),
     OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::ModRM_0x0f73),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PCMPEQB), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PCMPEQW), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PCMPEQD), OperandCode::Unsupported),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PCMPEQB), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PCMPEQW), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PCMPEQD), OperandCode::G_E_mm),
     OpcodeRecord(Interpretation::Instruction(Opcode::EMMS), OperandCode::Nothing),
     OpcodeRecord(Interpretation::Instruction(Opcode::VMREAD), OperandCode::E_G_q),
     OpcodeRecord(Interpretation::Instruction(Opcode::VMWRITE), OperandCode::G_E_q),
@@ -4495,48 +4495,48 @@ const OPCODE_0F_MAP: [OpcodeRecord; 256] = [
     OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::Nothing),
     OpcodeRecord(Interpretation::Instruction(Opcode::PMOVMSKB), OperandCode::G_U_mm),
 
-    OpcodeRecord(Interpretation::Instruction(Opcode::PSUBUSB), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PSUBUSW), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PMINUB), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PAND), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PADDUSB), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PADDUSW), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PMAXUB), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PANDN), OperandCode::Unsupported),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PSUBUSB), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PSUBUSW), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PMINUB), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PAND), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PADDUSB), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PADDUSW), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PMAXUB), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PANDN), OperandCode::G_E_mm),
 
 // 0xe0
-    OpcodeRecord(Interpretation::Instruction(Opcode::PAVGB), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PSRAW), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PSRAD), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PAVGW), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PMULHUW), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PMULHW), OperandCode::Unsupported),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PAVGB), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PSRAW), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PSRAD), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PAVGW), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PMULHUW), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PMULHW), OperandCode::G_E_mm),
     OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::Nothing),
     OpcodeRecord(Interpretation::Instruction(Opcode::MOVNTQ), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PSUBSB), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PSUBSW), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PMINSW), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::POR), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PADDSB), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PADDSW), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PMAXSW), OperandCode::Unsupported),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PSUBSB), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PSUBSW), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PMINSW), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::POR), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PADDSB), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PADDSW), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PMAXSW), OperandCode::G_E_mm),
     OpcodeRecord(Interpretation::Instruction(Opcode::PXOR), OperandCode::G_E_mm),
 // 0xf0
     OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::Nothing),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PSLLW), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PSLLD), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PSLLQ), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PMULUDQ), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PMADDWD), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PSADBW), OperandCode::Unsupported),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PSLLW), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PSLLD), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PSLLQ), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PMULUDQ), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PMADDWD), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PSADBW), OperandCode::G_E_mm),
     OpcodeRecord(Interpretation::Instruction(Opcode::MASKMOVQ), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PSUBB), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PSUBW), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PSUBD), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PSUBQ), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PADDB), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PADDW), OperandCode::Unsupported),
-    OpcodeRecord(Interpretation::Instruction(Opcode::PADDD), OperandCode::Unsupported),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PSUBB), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PSUBW), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PSUBD), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PSUBQ), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PADDB), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PADDW), OperandCode::G_E_mm),
+    OpcodeRecord(Interpretation::Instruction(Opcode::PADDD), OperandCode::G_E_mm),
     OpcodeRecord(Interpretation::Instruction(Opcode::Invalid), OperandCode::Nothing),
 ];
 fn read_opcode_0f_map<T: Iterator<Item=u8>>(bytes_iter: &mut T, length: &mut u8) -> Result<OpcodeRecord, DecodeError> {
diff --git a/test/long_mode/mod.rs b/test/long_mode/mod.rs
index 97f0bd5..50774ff 100644
--- a/test/long_mode/mod.rs
+++ b/test/long_mode/mod.rs
@@ -125,6 +125,47 @@ fn test_mmx() {
     test_invalid(&[0x4f, 0x0f, 0xd7, 0x00]);
     test_display(&[0x4f, 0x0f, 0xd7, 0xcf], "pmovmskb r9d, mm7");
     test_display(&[0x0f, 0x3a, 0x0f, 0xc1, 0x23], "palignr mm0, mm1, 0x23");
+    test_display(&[0x0f, 0xf9, 0xc2], "psubw mm0, mm2");
+    test_display(&[0x0f, 0xfd, 0xd2], "paddw mm2, mm2");
+    test_display(&[0x0f, 0x6f, 0xe9], "movq mm5, mm1");
+    test_display(&[0x0f, 0xe5, 0x3d, 0xaa, 0xbb, 0xcc, 0x77], "pmulhw mm7, [rip + 0x77ccbbaa]");
+
+    test_display(&[0x0f, 0x74, 0xc2], "pcmpeqb mm0, mm2");
+    test_display(&[0x0f, 0x75, 0xc2], "pcmpeqw mm0, mm2");
+    test_display(&[0x0f, 0x76, 0xc2], "pcmpeqd mm0, mm2");
+
+    test_display(&[0x0f, 0xd8, 0xc2], "psubusb mm0, mm2");
+    test_display(&[0x0f, 0xd9, 0xc2], "psubusw mm0, mm2");
+    test_display(&[0x0f, 0xda, 0xc2], "pminub mm0, mm2");
+    test_display(&[0x0f, 0xdb, 0xc2], "pand mm0, mm2");
+    test_display(&[0x0f, 0xdc, 0xc2], "paddusb mm0, mm2");
+    test_display(&[0x0f, 0xdd, 0xc2], "paddusw mm0, mm2");
+    test_display(&[0x0f, 0xde, 0xc2], "pmaxub mm0, mm2");
+    test_display(&[0x0f, 0xdf, 0xc2], "pandn mm0, mm2");
+
+    test_display(&[0x0f, 0xe8, 0xc2], "psubsb mm0, mm2");
+    test_display(&[0x0f, 0xe9, 0xc2], "psubsw mm0, mm2");
+    test_display(&[0x0f, 0xea, 0xc2], "pminsw mm0, mm2");
+    test_display(&[0x0f, 0xeb, 0xc2], "por mm0, mm2");
+    test_display(&[0x0f, 0xec, 0xc2], "paddsb mm0, mm2");
+    test_display(&[0x0f, 0xed, 0xc2], "paddsw mm0, mm2");
+    test_display(&[0x0f, 0xee, 0xc2], "pmaxsw mm0, mm2");
+    test_display(&[0x0f, 0xef, 0xc2], "pxor mm0, mm2");
+
+    test_invalid(&[0x0f, 0xf0, 0xc2]);
+    test_display(&[0x0f, 0xf1, 0xc2], "psllw mm0, mm2");
+    test_display(&[0x0f, 0xf2, 0xc2], "pslld mm0, mm2");
+    test_display(&[0x0f, 0xf3, 0xc2], "psllq mm0, mm2");
+    test_display(&[0x0f, 0xf4, 0xc2], "pmuludq mm0, mm2");
+    test_display(&[0x0f, 0xf5, 0xc2], "pmaddwd mm0, mm2");
+    test_display(&[0x0f, 0xf6, 0xc2], "psadbw mm0, mm2");
+    test_display(&[0x0f, 0xf8, 0xc2], "psubb mm0, mm2");
+    test_display(&[0x0f, 0xf9, 0xc2], "psubw mm0, mm2");
+    test_display(&[0x0f, 0xfa, 0xc2], "psubd mm0, mm2");
+    test_display(&[0x0f, 0xfb, 0xc2], "psubq mm0, mm2");
+    test_display(&[0x0f, 0xfc, 0xc2], "paddb mm0, mm2");
+    test_display(&[0x0f, 0xfd, 0xc2], "paddw mm0, mm2");
+    test_display(&[0x0f, 0xfe, 0xc2], "paddd mm0, mm2");
 }
 
 #[test]
-- 
cgit v1.1