From 53a6a79595e100b16b85d75676bcfee56cbd40f0 Mon Sep 17 00:00:00 2001
From: iximeow <me@iximeow.net>
Date: Wed, 15 Jan 2020 01:49:42 -0800
Subject: add 660f6* series instructions as well as 660f70

this adds in some missing sse2 instructions in the alternate secondary
opcode map. because these were missing, instructions were incorrectly
decoded from the 0f opcode map, yielding mmx-operand versions of
themselves (usually)

there are undoubtedly more missing sse2 instructions from the 660f map.
---
 test/test.rs | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 69 insertions(+), 1 deletion(-)

(limited to 'test/test.rs')

diff --git a/test/test.rs b/test/test.rs
index 0945328..5187df8 100644
--- a/test/test.rs
+++ b/test/test.rs
@@ -4,7 +4,7 @@ extern crate yaxpeax_x86;
 use std::fmt::Write;
 
 use yaxpeax_arch::{Decoder, LengthedInstruction};
-use yaxpeax_x86::{DecodeError, Instruction, InstDecoder};
+use yaxpeax_x86::{DecodeError, InstDecoder};
 
 fn test_invalid(data: &[u8]) {
     test_invalid_under(&InstDecoder::default(), data);
@@ -297,6 +297,74 @@ fn test_E_decode() {
 
 #[test]
 fn test_sse() {
+    test_display(
+        &[0x66, 0x4f, 0x0f, 0x60, 0x9c, 0x9c, 0x34, 0xaa, 0xbb, 0xcc],
+        "punpcklbw xmm11, [r12 + r11 * 4 - 0x334455cc]"
+    );
+    test_display(
+        &[0x66, 0x4f, 0x0f, 0x61, 0x9c, 0x9c, 0x34, 0xaa, 0xbb, 0xcc],
+        "punpcklwd xmm11, [r12 + r11 * 4 - 0x334455cc]"
+    );
+    test_display(
+        &[0x66, 0x4f, 0x0f, 0x62, 0x9c, 0x9c, 0x34, 0xaa, 0xbb, 0xcc],
+        "punpckldq xmm11, [r12 + r11 * 4 - 0x334455cc]"
+    );
+    test_display(
+        &[0x66, 0x4f, 0x0f, 0x63, 0x9c, 0x9c, 0x34, 0xaa, 0xbb, 0xcc],
+        "packsswb xmm11, [r12 + r11 * 4 - 0x334455cc]"
+    );
+    test_display(
+        &[0x66, 0x4f, 0x0f, 0x64, 0x9c, 0x9c, 0x34, 0xaa, 0xbb, 0xcc],
+        "pcmpgtb xmm11, [r12 + r11 * 4 - 0x334455cc]"
+    );
+    test_display(
+        &[0x66, 0x4f, 0x0f, 0x65, 0x9c, 0x9c, 0x34, 0xaa, 0xbb, 0xcc],
+        "pcmpgtw xmm11, [r12 + r11 * 4 - 0x334455cc]"
+    );
+    test_display(
+        &[0x66, 0x4f, 0x0f, 0x66, 0x9c, 0x9c, 0x34, 0xaa, 0xbb, 0xcc],
+        "pcmpgtd xmm11, [r12 + r11 * 4 - 0x334455cc]"
+    );
+    test_display(
+        &[0x66, 0x4f, 0x0f, 0x67, 0x9c, 0x9c, 0x34, 0xaa, 0xbb, 0xcc],
+        "packuswb xmm11, [r12 + r11 * 4 - 0x334455cc]"
+    );
+    test_display(
+        &[0x66, 0x4f, 0x0f, 0x68, 0x9c, 0x9c, 0x34, 0xaa, 0xbb, 0xcc],
+        "punpckhbw xmm11, [r12 + r11 * 4 - 0x334455cc]"
+    );
+    test_display(
+        &[0x66, 0x4f, 0x0f, 0x69, 0x9c, 0x9c, 0x34, 0xaa, 0xbb, 0xcc],
+        "punpckhwd xmm11, [r12 + r11 * 4 - 0x334455cc]"
+    );
+    test_display(
+        &[0x66, 0x4f, 0x0f, 0x6a, 0x9c, 0x9c, 0x34, 0xaa, 0xbb, 0xcc],
+        "punpckhdq xmm11, [r12 + r11 * 4 - 0x334455cc]"
+    );
+    test_display(
+        &[0x66, 0x4f, 0x0f, 0x6b, 0x9c, 0x9c, 0x34, 0xaa, 0xbb, 0xcc],
+        "packssdw xmm11, [r12 + r11 * 4 - 0x334455cc]"
+    );
+    test_display(
+        &[0x66, 0x4f, 0x0f, 0x6c, 0x9c, 0x9c, 0x34, 0xaa, 0xbb, 0xcc],
+        "punpcklqdq xmm11, [r12 + r11 * 4 - 0x334455cc]"
+    );
+    test_display(
+        &[0x66, 0x4f, 0x0f, 0x6d, 0x9c, 0x9c, 0x34, 0xaa, 0xbb, 0xcc],
+        "punpckhqdq xmm11, [r12 + r11 * 4 - 0x334455cc]"
+    );
+    // this needs to be clear that the operand is `dword`
+    test_display(
+        &[0x66, 0x4f, 0x0f, 0x6e, 0x9c, 0x9c, 0x34, 0xaa, 0xbb, 0xcc],
+        "movq xmm11, [r12 + r11 * 4 - 0x334455cc]"
+    );
+    test_display(
+        &[0x66, 0x4f, 0x0f, 0x6f, 0x9c, 0x9c, 0x34, 0xaa, 0xbb, 0xcc],
+        "movdqa xmm11, [r12 + r11 * 4 - 0x334455cc]"
+    );
+
+    test_display(&[0x66, 0x48, 0x0f, 0x6e, 0xc0], "movq xmm0, rax");
+    test_display(&[0x66, 0x0f, 0x70, 0xc0, 0x4e], "pshufd xmm0, xmm0, 0x4e");
     test_display(&[0x4f, 0x0f, 0x28, 0x00], "movaps xmm8, [r8]");
     test_display(&[0x4f, 0x0f, 0x29, 0x00], "movaps [r8], xmm8");
     test_display(&[0x4f, 0x0f, 0x2b, 0x00], "movntps [r8], xmm8");
-- 
cgit v1.1