aboutsummaryrefslogtreecommitdiff
path: root/test/protected_mode/display.rs
diff options
context:
space:
mode:
Diffstat (limited to 'test/protected_mode/display.rs')
-rw-r--r--test/protected_mode/display.rs104
1 files changed, 55 insertions, 49 deletions
diff --git a/test/protected_mode/display.rs b/test/protected_mode/display.rs
index 694c38c..5f0c68d 100644
--- a/test/protected_mode/display.rs
+++ b/test/protected_mode/display.rs
@@ -4,10 +4,14 @@ use yaxpeax_arch::{AddressBase, Decoder, LengthedInstruction};
use yaxpeax_x86::protected_mode::{DisplayStyle, InstDecoder};
fn test_display(data: &[u8], expected: &'static str) {
- test_display_under(&InstDecoder::default(), data, expected);
+ test_display_under(&InstDecoder::default(), DisplayStyle::Intel, data, expected);
}
-fn test_display_under(decoder: &InstDecoder, data: &[u8], expected: &'static str) {
+fn test_c_display(data: &[u8], expected: &'static str) {
+ test_display_under(&InstDecoder::default(), DisplayStyle::C, data, expected);
+}
+
+fn test_display_under(decoder: &InstDecoder, style: DisplayStyle, data: &[u8], expected: &'static str) {
let mut hex = String::new();
for b in data {
write!(hex, "{:02x}", b).unwrap();
@@ -15,7 +19,7 @@ fn test_display_under(decoder: &InstDecoder, data: &[u8], expected: &'static str
let mut reader = yaxpeax_arch::U8Reader::new(data);
match decoder.decode(&mut reader) {
Ok(instr) => {
- let text = format!("{}", instr.display_with(DisplayStyle::C));
+ let text = format!("{}", instr.display_with(style));
assert!(
text == expected,
"display error for {}:\n decoded: {:?} under decoder {}\n displayed: {}\n expected: {}\n",
@@ -68,65 +72,67 @@ fn test_instructions_atnt() {
#[test]
fn test_instructions_c() {
// just modrm
- test_display(&[0x33, 0x08], "ecx ^= [eax]");
- test_display(&[0x33, 0x20], "esp ^= [eax]");
- test_display(&[0x33, 0x05, 0x78, 0x56, 0x34, 0x12], "eax ^= [0x12345678]");
- test_display(&[0x33, 0x41, 0x23], "eax ^= [ecx + 0x23]");
- test_display(&[0x33, 0x81, 0x23, 0x01, 0x65, 0x43], "eax ^= [ecx + 0x43650123]");
- test_display(&[0x33, 0xc1], "eax ^= ecx");
+ test_c_display(&[0x33, 0x08], "ecx ^= [eax]");
+ test_c_display(&[0x33, 0x20], "esp ^= [eax]");
+ test_c_display(&[0x33, 0x05, 0x78, 0x56, 0x34, 0x12], "eax ^= [0x12345678]");
+ test_c_display(&[0x33, 0x41, 0x23], "eax ^= [ecx + 0x23]");
+ test_c_display(&[0x33, 0x81, 0x23, 0x01, 0x65, 0x43], "eax ^= [ecx + 0x43650123]");
+ test_c_display(&[0x33, 0xc1], "eax ^= ecx");
// sib
- test_display(&[0x33, 0x04, 0x25, 0x11, 0x22, 0x33, 0x44], "eax ^= [0x44332211]");
+ test_c_display(&[0x33, 0x04, 0x25, 0x11, 0x22, 0x33, 0x44], "eax ^= [0x44332211]");
+
+ test_c_display(&[0x33, 0x44, 0x65, 0x11], "eax ^= [ebp + 0x11]");
- test_display(&[0x33, 0x44, 0x65, 0x11], "eax ^= [ebp + 0x11]");
+ test_c_display(&[0x33, 0x34, 0x25, 0x20, 0x30, 0x40, 0x50], "esi ^= [0x50403020]");
- test_display(&[0x33, 0x34, 0x25, 0x20, 0x30, 0x40, 0x50], "esi ^= [0x50403020]");
+ test_c_display(&[0x0f, 0xe7, 0x03], "[ebx] = movntq(mm0)");
- test_display(&[0x0f, 0xe7, 0x03], "[ebx] = movntq(mm0)");
+ test_c_display(&[0x0f, 0x7f, 0x0f], "[edi] = movq(mm1)");
+ test_c_display(&[0x0f, 0xc4, 0xc0, 0x14], "mm0 = pinsrw(mm0, eax, 0x14)");
- test_display(&[0x0f, 0x7f, 0x0f], "[edi] = movq(mm1)");
- test_display(&[0x0f, 0xc4, 0xc0, 0x14], "mm0 = pinsrw(mm0, eax, 0x14)");
+ test_c_display(&[0x0f, 0xd1, 0x00], "mm0 = psrlw(mm0, [eax])");
+ test_c_display(&[0x0f, 0xe5, 0x3d, 0xaa, 0xbb, 0xcc, 0x77], "mm7 = pmulhw(mm7, [0x77ccbbaa])");
- test_display(&[0x0f, 0xd1, 0x00], "mm0 = psrlw(mm0, [eax])");
- test_display(&[0x0f, 0xe5, 0x3d, 0xaa, 0xbb, 0xcc, 0x77], "mm7 = pmulhw(mm7, [0x77ccbbaa])");
+ test_c_display(&[0xf3, 0xa5], "rep dword { es:[edi++] = ds:[esi++] }");
+ test_c_display(&[0xf3, 0x66, 0xa5], "rep word { es:[edi++] = ds:[esi++] }");
+ test_c_display(&[0xf3, 0xa4], "rep byte { es:[edi++] = ds:[esi++] }");
- test_display(&[0xf3, 0xa5], "rep dword { es:[edi++] = ds:[esi++] }");
- test_display(&[0xf3, 0x66, 0xa5], "rep word { es:[edi++] = ds:[esi++] }");
- test_display(&[0xf3, 0xa4], "rep byte { es:[edi++] = ds:[esi++] }");
+ test_c_display(&[0xf6, 0xc2, 0x18], "eflags = flags(dl & 0x18)");
+ test_c_display(&[0xf6, 0xc2, 0x18], "eflags = flags(dl & 0x18)");
+ test_c_display(&[0x84, 0xc0], "eflags = flags(al & al)");
+ test_c_display(&[0x85, 0xc0], "eflags = flags(eax & eax)");
+ test_c_display(&[0x3a, 0xc0], "eflags = flags(al - al)");
+ test_c_display(&[0x3b, 0xc0], "eflags = flags(eax - eax)");
- test_display(&[0xf6, 0xc2, 0x18], "eflags = flags(dl & 0x18)");
- test_display(&[0xf6, 0xc2, 0x18], "eflags = flags(dl & 0x18)");
- test_display(&[0x84, 0xc0], "eflags = flags(al & al)");
- test_display(&[0x85, 0xc0], "eflags = flags(eax & eax)");
- test_display(&[0x3a, 0xc0], "eflags = flags(al - al)");
- test_display(&[0x3b, 0xc0], "eflags = flags(eax - eax)");
+ test_c_display(&[0x0f, 0xbc, 0xd3], "edx = lsb(ebx) (x86 bsf)");
+ test_c_display(&[0xf3, 0x0f, 0xbc, 0xd3], "edx = lsb(ebx)");
+ // test_c_display(&[0x41, 0x0f, 0xbc, 0xd3], "edx = lsb(ebx) (x86 bsf"); // for non-bm1
+ test_c_display(&[0x0f, 0xbd, 0xd3], "edx = msb(ebx)");
+ // test_c_display(&[0x41, 0x0f, 0xbc, 0xd3], "edx = lsb(ebx) (x86 bsr"); // for non-bm1
+ test_c_display(&[0xd2, 0xc0], "al = al rol cl");
+ test_c_display(&[0xd2, 0xc8], "al = al ror cl");
+ test_c_display(&[0xd2, 0xd0], "al = al rcl cl");
+ test_c_display(&[0xd2, 0xd8], "al = al rcr cl");
+ test_c_display(&[0xd2, 0xe0], "al = al << cl");
+ test_c_display(&[0xd2, 0xe8], "al = al >> cl");
+ test_c_display(&[0xd2, 0xf0], "al = al <<< cl");
+ test_c_display(&[0xd2, 0xf8], "al = al >>> cl");
- test_display(&[0x0f, 0xbc, 0xd3], "edx = lsb(ebx) (x86 bsf)");
- test_display(&[0xf3, 0x0f, 0xbc, 0xd3], "edx = lsb(ebx)");
- // test_display(&[0x41, 0x0f, 0xbc, 0xd3], "edx = lsb(ebx) (x86 bsf"); // for non-bm1
- test_display(&[0x0f, 0xbd, 0xd3], "edx = msb(ebx)");
- // test_display(&[0x41, 0x0f, 0xbc, 0xd3], "edx = lsb(ebx) (x86 bsr"); // for non-bm1
- test_display(&[0xd2, 0xc0], "al = al rol cl");
- test_display(&[0xd2, 0xc8], "al = al ror cl");
- test_display(&[0xd2, 0xd0], "al = al rcl cl");
- test_display(&[0xd2, 0xd8], "al = al rcr cl");
- test_display(&[0xd2, 0xe0], "al = al << cl");
- test_display(&[0xd2, 0xe8], "al = al >> cl");
- test_display(&[0xd2, 0xf0], "al = al <<< cl");
- test_display(&[0xd2, 0xf8], "al = al >>> cl");
+ test_c_display(&[0xc4, 0xc3, 0x7b, 0xf0, 0x01, 0x05], "eax = [ecx] ror 0x5 (x86 rorx)");
+ test_c_display(&[0xc4, 0xc2, 0xe3, 0xf7, 0x01], "eax = [ecx] >> ebx (x86 shrx)");
+ test_c_display(&[0xc4, 0xc2, 0xe1, 0xf7, 0x01], "eax = [ecx] << ebx (x86 shlx)");
- test_display(&[0xc4, 0xc3, 0x7b, 0xf0, 0x01, 0x05], "eax = [ecx] ror 0x5 (x86 rorx)");
- test_display(&[0xc4, 0xc2, 0xe3, 0xf7, 0x01], "eax = [ecx] >> ebx (x86 shrx)");
- test_display(&[0xc4, 0xc2, 0xe1, 0xf7, 0x01], "eax = [ecx] << ebx (x86 shlx)");
+ test_c_display(&[0xd2, 0xe0], "al = al << cl");
- test_display(&[0xd2, 0xe0], "al = al << cl");
+ test_c_display(&[0x66, 0x0f, 0xac, 0xcf, 0x11], "di = shrd(di, cx, 0x11)");
+ test_c_display(&[0x0f, 0xa5, 0xc9], "ecx = shld(ecx, ecx, cl)");
- test_display(&[0x66, 0x0f, 0xac, 0xcf, 0x11], "di = shrd(di, cx, 0x11)");
- test_display(&[0x0f, 0xa5, 0xc9], "ecx = shld(ecx, ecx, cl)");
+ test_c_display(&[0x66, 0x0f, 0x38, 0xf6, 0x01], "eax += [ecx] + eflags.cf");
- test_display(&[0x66, 0x0f, 0x38, 0xf6, 0x01], "eax += [ecx] + eflags.cf");
+ test_c_display(&[0xfe, 0x00], "byte [eax]++");
+ test_c_display(&[0x66, 0xff, 0x08], "word [eax]--");
+ test_c_display(&[0xff, 0x00], "dword [eax]++");
- test_display(&[0xfe, 0x00], "byte [eax]++");
- test_display(&[0x66, 0xff, 0x08], "word [eax]--");
- test_display(&[0xff, 0x00], "dword [eax]++");
+ test_c_display(&[0xff, 0xe0], "jmp eax");
}