From b1cdfaf106dcebb96bf704ef2f9a084744b3ec6b Mon Sep 17 00:00:00 2001
From: iximeow <me@iximeow.net>
Date: Sat, 19 Oct 2019 23:45:43 -0700
Subject: display impl doesnt show memory operand sizes

---
 test/test.rs | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'test')

diff --git a/test/test.rs b/test/test.rs
index cd28685..b1520bc 100644
--- a/test/test.rs
+++ b/test/test.rs
@@ -71,13 +71,13 @@ fn test_E_decode() {
 fn test_sse() {
     test_display(&[0x0f, 0x28, 0xd0], "movaps xmm2, xmm0");
     test_display(&[0x66, 0x0f, 0x28, 0xd0], "movapd xmm2, xmm0");
-    test_display(&[0x66, 0x0f, 0x28, 0x00], "movapd xmm0, xmmword [rax]");
-    test_display(&[0x4f, 0x66, 0x0f, 0x28, 0x00], "movapd xmm0, xmmword [rax]");
-    test_display(&[0x66, 0x4f, 0x0f, 0x28, 0x00], "movapd xmm8, xmmword [r8]");
-    test_display(&[0x66, 0x4f, 0x0f, 0x28, 0x00], "movapd xmm8, xmmword [r8]");
-    test_display(&[0x67, 0x4f, 0x66, 0x0f, 0x28, 0x00], "movapd xmm0, xmmword [eax]");
-    test_display(&[0x67, 0x66, 0x4f, 0x0f, 0x28, 0x00], "movapd xmm8, xmmword [r8d]");
-    test_display(&[0x66, 0x0f, 0x29, 0x00], "movapd xmmword [rax], xmm0");
+    test_display(&[0x66, 0x0f, 0x28, 0x00], "movapd xmm0, [rax]");
+    test_display(&[0x4f, 0x66, 0x0f, 0x28, 0x00], "movapd xmm0, [rax]");
+    test_display(&[0x66, 0x4f, 0x0f, 0x28, 0x00], "movapd xmm8, [r8]");
+    test_display(&[0x66, 0x4f, 0x0f, 0x28, 0x00], "movapd xmm8, [r8]");
+    test_display(&[0x67, 0x4f, 0x66, 0x0f, 0x28, 0x00], "movapd xmm0, [eax]");
+    test_display(&[0x67, 0x66, 0x4f, 0x0f, 0x28, 0x00], "movapd xmm8, [r8d]");
+    test_display(&[0x66, 0x0f, 0x29, 0x00], "movapd [rax], xmm0");
     test_display(&[0x66, 0x0f, 0xef, 0xc0], "pxor xmm0, xmm0");
     test_display(&[0xf2, 0x0f, 0x10, 0x0c, 0xc6], "movsd xmm1, [rsi + rax * 8]");
     test_display(&[0xf3, 0x0f, 0x10, 0x04, 0x86], "movss xmm0, [rsi + rax * 4]");
@@ -109,8 +109,8 @@ fn test_mov() {
     test_display(&[0x0f, 0xbe, 0x83, 0xb4, 0x00, 0x00, 0x00], "movsx eax, byte [rbx + 0xb4]");
     test_display(&[0x46, 0x63, 0xc1], "movsxd r8, ecx");
     test_display(&[0x48, 0x63, 0x04, 0xba], "movsxd rax, [rdx + rdi * 4]");
-    test_display(&[0xf3, 0x0f, 0x6f, 0x07], "movdqu xmm0, xmmword [rdi]");
-    test_display(&[0xf3, 0x0f, 0x7f, 0x45, 0x00], "movdqu xmmword [rbp], xmm0");
+    test_display(&[0xf3, 0x0f, 0x6f, 0x07], "movdqu xmm0, [rdi]");
+    test_display(&[0xf3, 0x0f, 0x7f, 0x45, 0x00], "movdqu [rbp + 0x0], xmm0");
 }
 
 #[test]
@@ -147,7 +147,7 @@ fn test_test_cmp() {
 #[ignore]
 // VEX prefixes are not supported at the moment, in any form
 fn test_avx() {
-    test_display(&[0xc5, 0xf8, 0x10, 0x00], "vmovups xmm0, xmmword [rax]");
+    test_display(&[0xc5, 0xf8, 0x10, 0x00], "vmovups xmm0, [rax]");
 }
 
 #[test]
@@ -185,8 +185,8 @@ fn test_misc() {
 
 #[test]
 fn evex() {
-    test_display(&[0x62, 0xf2, 0x7d, 0x48, 0x2a, 0x44, 0x40, 0x01], "vmovntdqa zmm0, zmmword [rax + rax*2 + 0x40]");
-    test_display(&[0x62, 0xf2, 0x7d, 0x08, 0x2a, 0x44, 0x40, 0x01], "vmovntdqa xmm0, xmmword [rax + rax*2 + 0x10]");
+    test_display(&[0x62, 0xf2, 0x7d, 0x48, 0x2a, 0x44, 0x40, 0x01], "vmovntdqa zmm0, [rax + rax*2 + 0x40]");
+    test_display(&[0x62, 0xf2, 0x7d, 0x08, 0x2a, 0x44, 0x40, 0x01], "vmovntdqa xmm0, [rax + rax*2 + 0x10]");
 }
 
 #[test]
@@ -207,8 +207,8 @@ fn prefixed_0f() {
     test_display(&[0x0f, 0x12, 0x0f], "movlps xmm1, qword [rdi]");
     test_display(&[0x0f, 0x12, 0xc0], "movhlps xmm0, xmm0");
     test_display(&[0x0f, 0x13, 0xc0], "invalid");
-    test_display(&[0x0f, 0x14, 0x00], "unpcklps xmm1, xmmword [rax]");
-    test_display(&[0x0f, 0x15, 0x00], "unpckhps xmm1, xmmword [rax]");
+    test_display(&[0x0f, 0x14, 0x00], "unpcklps xmm1, [rax]");
+    test_display(&[0x0f, 0x15, 0x00], "unpckhps xmm1, [rax]");
     test_display(&[0x0f, 0x16, 0x0f], "movhps xmm1, qword [rdi]");
     test_display(&[0x0f, 0x16, 0xc0], "movlhps xmm0, xmm0");
     test_display(&[0x0f, 0x17, 0xc0], "invalid");
-- 
cgit v1.1