From 2002347272391dc6a70d83fe8293f2ce35ed26ee Mon Sep 17 00:00:00 2001
From: iximeow <me@iximeow.net>
Date: Sun, 23 Jun 2024 15:15:50 -0700
Subject: add additional `call` test cases

fix 32-bit 66-prefixed ff /2 call not having 16-bit operands

fix momentary regression in rendering `call` instructions to string
---
 test/long_mode/mod.rs      | 11 +++++++++++
 test/protected_mode/mod.rs | 13 ++++++++++++-
 test/real_mode/mod.rs      |  3 +++
 3 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/long_mode/mod.rs b/test/long_mode/mod.rs
index d8cb0ef..917d16a 100644
--- a/test/long_mode/mod.rs
+++ b/test/long_mode/mod.rs
@@ -1303,14 +1303,25 @@ fn test_control_flow() {
     test_display(&[0x73, 0x31], "jnb $+0x31");
     test_display(&[0x72, 0x5a], "jb $+0x5a");
     test_display(&[0x72, 0xf0], "jb $-0x10");
+    test_display(&[0xe8, 0x01, 0x00, 0x00, 0x00], "call $+0x1");
+    test_display(&[0xe8, 0x80, 0x00, 0x00, 0x00], "call $+0x80");
+    test_display(&[0xe8, 0xff, 0xff, 0xff, 0xff], "call $-0x1");
+    test_display(&[0xe9, 0x01, 0x00, 0x00, 0x00], "jmp $+0x1");
+    test_display(&[0xe9, 0x80, 0x00, 0x00, 0x00], "jmp $+0x80");
+    test_display(&[0xe9, 0xff, 0xff, 0xff, 0xff], "jmp $-0x1");
     test_display(&[0x0f, 0x86, 0x8b, 0x01, 0x00, 0x00], "jna $+0x18b");
     test_display(&[0x0f, 0x85, 0x3b, 0x25, 0x00, 0x00], "jnz $+0x253b");
     test_display(&[0x74, 0x47], "jz $+0x47");
     test_display(&[0xff, 0x15, 0x7e, 0x72, 0x24, 0x00], "call qword [rip + 0x24727e]");
+    test_display(&[0xff, 0x15, 0x7e, 0x72, 0x24, 0x00], "call qword [rip + 0x24727e]");
     test_display(&[0xff, 0x24, 0xcd, 0x70, 0xa0, 0xbc, 0x01], "jmp qword [rcx * 8 + 0x1bca070]");
+    test_display(&[0xff, 0x14, 0xcd, 0x70, 0xa0, 0xbc, 0x01], "call qword [rcx * 8 + 0x1bca070]");
     test_display(&[0xff, 0xe0], "jmp rax");
+    test_display(&[0xff, 0xd0], "call rax");
     test_display(&[0x66, 0xff, 0xe0], "jmp rax");
     test_display(&[0x67, 0xff, 0xe0], "jmp rax");
+    test_display(&[0x66, 0xff, 0xd0], "call rax");
+    test_display(&[0x67, 0xff, 0xd0], "call rax");
     test_invalid(&[0xff, 0xd8]);
     test_display(&[0xff, 0x18], "callf mword [rax]");
     test_display(&[0xe0, 0x12], "loopnz $+0x12");
diff --git a/test/protected_mode/mod.rs b/test/protected_mode/mod.rs
index 0f3a6ff..8fecdab 100644
--- a/test/protected_mode/mod.rs
+++ b/test/protected_mode/mod.rs
@@ -1123,13 +1123,24 @@ fn test_control_flow() {
     test_display(&[0x73, 0x31], "jnb $+0x31");
     test_display(&[0x72, 0x5a], "jb $+0x5a");
     test_display(&[0x72, 0xf0], "jb $-0x10");
+    test_display(&[0xe8, 0x01, 0x00, 0x00, 0x00], "call $+0x1");
+    test_display(&[0xe8, 0x80, 0x00, 0x00, 0x00], "call $+0x80");
+    test_display(&[0xe8, 0xff, 0xff, 0xff, 0xff], "call $-0x1");
+    test_display(&[0xe9, 0x01, 0x00, 0x00, 0x00], "jmp $+0x1");
+    test_display(&[0xe9, 0x80, 0x00, 0x00, 0x00], "jmp $+0x80");
+    test_display(&[0xe9, 0xff, 0xff, 0xff, 0xff], "jmp $-0x1");
     test_display(&[0x0f, 0x86, 0x8b, 0x01, 0x00, 0x00], "jna $+0x18b");
+    test_display(&[0x0f, 0x85, 0x3b, 0x25, 0x00, 0x00], "jnz $+0x253b");
     test_display(&[0x74, 0x47], "jz $+0x47");
     test_display(&[0xff, 0x15, 0x7e, 0x72, 0x24, 0x00], "call dword [0x24727e]");
     test_display(&[0xff, 0x24, 0xcd, 0x70, 0xa0, 0xbc, 0x01], "jmp dword [ecx * 8 + 0x1bca070]");
+    test_display(&[0xff, 0x14, 0xcd, 0x70, 0xa0, 0xbc, 0x01], "call dword [ecx * 8 + 0x1bca070]");
     test_display(&[0xff, 0xe0], "jmp eax");
-    test_display(&[0x66, 0xff, 0xe0], "jmp eax");
+    test_display(&[0xff, 0xd0], "call eax");
+    test_display(&[0x66, 0xff, 0xe0], "jmp ax");
     test_display(&[0x67, 0xff, 0xe0], "jmp eax");
+    test_display(&[0x66, 0xff, 0xd0], "call ax");
+    test_display(&[0x67, 0xff, 0xd0], "call eax");
     test_invalid(&[0xff, 0xd8]);
     test_display(&[0xff, 0x18], "callf far [eax]");
     test_display(&[0xe0, 0x12], "loopnz $+0x12");
diff --git a/test/real_mode/mod.rs b/test/real_mode/mod.rs
index c5b1548..844a95e 100644
--- a/test/real_mode/mod.rs
+++ b/test/real_mode/mod.rs
@@ -16950,6 +16950,7 @@ fn test_real_mode() {
     test_display(&[0x66, 0xf3, 0x0f, 0x01, 0xe8], "setssbsy");
     test_display(&[0x66, 0xf3, 0x0f, 0x01, 0xea], "saveprevssp");
     test_display(&[0x66, 0xf3, 0x0f, 0xbd, 0xc1], "lzcnt eax, ecx");
+    test_display(&[0x66, 0xff, 0xd0], "call eax");
     test_display(&[0x66, 0xff, 0xe0], "jmp eax");
     test_display(&[0x67, 0x0f, 0x5b, 0x01], "cvtdq2ps xmm0, xmmword [ecx]");
     test_display(&[0x67, 0x66, 0x0f, 0x28, 0x00], "movapd xmm0, xmmword [eax]");
@@ -16960,6 +16961,7 @@ fn test_real_mode() {
     test_display(&[0x67, 0x66, 0x0f, 0x38, 0xdf, 0x0f], "aesdeclast xmm1, xmmword [edi]");
     test_display(&[0x67, 0x66, 0x65, 0x3e, 0x0f, 0x6d, 0xd1], "punpckhqdq xmm2, xmm1");
     test_display(&[0x67, 0xe5, 0x99], "in ax, 0x99");
+    test_display(&[0x67, 0xff, 0xd0], "call ax");
     test_display(&[0x67, 0xff, 0xe0], "jmp ax");
     test_display(&[0x68, 0x7f, 0x63], "push 0x637f");
     test_display(&[0x6b, 0x43, 0x6f, 0x6d], "imul ax, word [bp + di * 1 + 0x6f], 0x6d");
@@ -17945,6 +17947,7 @@ fn test_real_mode() {
     test_display(&[0xff, 0x75, 0x08], "push word [di + 0x8]");
     test_display(&[0xff, 0x75, 0xb8], "push word [di - 0x48]");
     test_display(&[0xff, 0xe0], "jmp ax");
+    test_display(&[0xff, 0xd0], "call ax");
 }
 
 #[test]
-- 
cgit v1.1