fix important memory decode error in long mode

add tests for modrm/sib decoding, xsave extensions

1 files changed, 70 insertions, 0 deletions

diff --git a/test/long_mode/mod.rs b/test/long_mode/mod.rs
index f6f02a1..97f0bd5 100644
--- a/test/long_mode/mod.rs
+++ b/test/long_mode/mod.rs
@@ -50,6 +50,68 @@ fn test_display_under(decoder: &InstDecoder, data: &[u8], expected: &'static str
 }
 
 #[test]
+fn test_modrm_decode() {
+    // just modrm
+    test_display(&[0x33, 0x08], "xor ecx, [rax]");
+    test_display(&[0x33, 0x20], "xor esp, [rax]");
+    test_display(&[0x33, 0x05, 0x78, 0x56, 0x34, 0x12], "xor eax, [rip + 0x12345678]");
+    test_display(&[0x33, 0x41, 0x23], "xor eax, [rcx + 0x23]");
+    test_display(&[0x33, 0x81, 0x23, 0x01, 0x65, 0x43], "xor eax, [rcx + 0x43650123]");
+    test_display(&[0x33, 0xc1], "xor eax, ecx");
+
+    // modrm + rex.w
+    test_display(&[0x48, 0x33, 0x08], "xor rcx, [rax]");
+    test_display(&[0x48, 0x33, 0x20], "xor rsp, [rax]");
+    test_display(&[0x48, 0x33, 0x05, 0x78, 0x56, 0x34, 0x12], "xor rax, [rip + 0x12345678]");
+    test_display(&[0x48, 0x33, 0x41, 0x23], "xor rax, [rcx + 0x23]");
+    test_display(&[0x48, 0x33, 0x81, 0x23, 0x01, 0x65, 0x43], "xor rax, [rcx + 0x43650123]");
+    test_display(&[0x48, 0x33, 0xc1], "xor rax, rcx");
+
+    // modrm + rex.r
+    test_display(&[0x44, 0x33, 0x08], "xor r9d, [rax]");
+    test_display(&[0x44, 0x33, 0x20], "xor r12d, [rax]");
+    test_display(&[0x44, 0x33, 0x05, 0x78, 0x56, 0x34, 0x12], "xor r8d, [rip + 0x12345678]");
+    test_display(&[0x44, 0x33, 0x41, 0x23], "xor r8d, [rcx + 0x23]");
+    test_display(&[0x44, 0x33, 0x81, 0x23, 0x01, 0x65, 0x43], "xor r8d, [rcx + 0x43650123]");
+    test_display(&[0x44, 0x33, 0xc1], "xor r8d, ecx");
+
+    // modrm + rex.rb
+    test_display(&[0x45, 0x33, 0x08], "xor r9d, [r8]");
+    test_display(&[0x45, 0x33, 0x20], "xor r12d, [r8]");
+    test_display(&[0x45, 0x33, 0x05, 0x78, 0x56, 0x34, 0x12], "xor r8d, [rip + 0x12345678]");
+    test_display(&[0x45, 0x33, 0x41, 0x23], "xor r8d, [r9 + 0x23]");
+    test_display(&[0x45, 0x33, 0x81, 0x23, 0x01, 0x65, 0x43], "xor r8d, [r9 + 0x43650123]");
+    test_display(&[0x45, 0x33, 0xc1], "xor r8d, r9d");
+
+    // sib
+    test_display(&[0x33, 0x04, 0x0a], "xor eax, [rdx + rcx * 1]");
+    test_display(&[0x33, 0x04, 0x4a], "xor eax, [rdx + rcx * 2]");
+    test_display(&[0x33, 0x04, 0x8a], "xor eax, [rdx + rcx * 4]");
+    test_display(&[0x33, 0x04, 0xca], "xor eax, [rdx + rcx * 8]");
+    test_display(&[0x33, 0x04, 0x20], "xor eax, [rax]");
+    test_display(&[0x33, 0x04, 0x60], "xor eax, [rax]");
+    test_display(&[0x33, 0x04, 0xa0], "xor eax, [rax]");
+    test_display(&[0x33, 0x04, 0xe0], "xor eax, [rax]");
+    test_display(&[0x42, 0x33, 0x04, 0x20], "xor eax, [rax + r12 * 1]");
+    test_display(&[0x42, 0x33, 0x04, 0x60], "xor eax, [rax + r12 * 2]");
+    test_display(&[0x42, 0x33, 0x04, 0xa0], "xor eax, [rax + r12 * 4]");
+    test_display(&[0x42, 0x33, 0x04, 0xe0], "xor eax, [rax + r12 * 8]");
+    test_display(&[0x43, 0x33, 0x04, 0x20], "xor eax, [r8 + r12 * 1]");
+    test_display(&[0x43, 0x33, 0x04, 0x60], "xor eax, [r8 + r12 * 2]");
+    test_display(&[0x43, 0x33, 0x04, 0xa0], "xor eax, [r8 + r12 * 4]");
+    test_display(&[0x43, 0x33, 0x04, 0xe0], "xor eax, [r8 + r12 * 8]");
+    test_display(&[0x33, 0x04, 0x25, 0x11, 0x22, 0x33, 0x44], "xor eax, [0x44332211]");
+    test_display(&[0x41, 0x33, 0x04, 0x25, 0x11, 0x22, 0x33, 0x44], "xor eax, [0x44332211]");
+
+    test_display(&[0x33, 0x44, 0x65, 0x11], "xor eax, [rbp + 0x11]");
+    test_display(&[0x41, 0x33, 0x44, 0x65, 0x11], "xor eax, [r13 + 0x11]");
+    test_display(&[0x33, 0x84, 0xa5, 0x11, 0x22, 0x33, 0x44], "xor eax, [rbp + 0x44332211]");
+    test_display(&[0x41, 0x33, 0x84, 0xa5, 0x11, 0x22, 0x33, 0x44], "xor eax, [r13 + 0x44332211]");
+    test_display(&[0x33, 0x04, 0xe5, 0x11, 0x22, 0x33, 0x44], "xor eax, [0x44332211]");
+    test_display(&[0x41, 0x33, 0x04, 0xe5, 0x11, 0x22, 0x33, 0x44], "xor eax, [0x44332211]");
+}
+
+#[test]
 fn test_mmx() {
     test_display(&[0x4f, 0x0f, 0x7e, 0xcf], "movd r15, mm1");
     test_display(&[0x41, 0x0f, 0x7e, 0xcf], "movd r15d, mm1");
@@ -538,6 +600,14 @@ fn test_0fae() {
     test_display(&[0x0f, 0xae, 0x14, 0x4f], "ldmxcsr [rdi + rcx * 2]");
     test_display(&[0x0f, 0xae, 0x1c, 0x4f], "stmxcsr [rdi + rcx * 2]");
     test_display(&[0x0f, 0xae, 0x24, 0x4f], "xsave [rdi + rcx * 2]");
+    test_display(&[0x0f, 0xc7, 0x5c, 0x24, 0x40], "xrstors [rsp + 0x40]");
+    test_display(&[0x0f, 0xc7, 0x64, 0x24, 0x40], "xsavec [rsp + 0x40]");
+    test_display(&[0x0f, 0xc7, 0x6c, 0x24, 0x40], "xsaves [rsp + 0x40]");
+    test_display(&[0x4f, 0x0f, 0xc7, 0x5c, 0x24, 0x40], "xrstors64 [r12 + r12 * 1 + 0x40]");
+    test_display(&[0x4f, 0x0f, 0xc7, 0x64, 0x24, 0x40], "xsavec64 [r12 + r12 * 1 + 0x40]");
+    test_display(&[0x4f, 0x0f, 0xc7, 0x6c, 0x24, 0x40], "xsaves64 [r12 + r12 * 1 + 0x40]");
+    test_display(&[0x0f, 0xc7, 0x74, 0x24, 0x40], "vmptrld [rsp + 0x40]");
+    test_display(&[0x0f, 0xc7, 0x7c, 0x24, 0x40], "vmptrst [rsp + 0x40]");
     test_display(&[0x0f, 0xae, 0x2c, 0x4f], "xrstor [rdi + rcx * 2]");
     test_display(&[0x0f, 0xae, 0x34, 0x4f], "xsaveopt [rdi + rcx * 2]");
     test_display(&[0x0f, 0xae, 0x3c, 0x4f], "clflush [rdi + rcx * 2]");