From 3ee3f55f9a5239664ff9fb0d4b73926c4d76ac26 Mon Sep 17 00:00:00 2001 From: iximeow Date: Sun, 21 Mar 2021 17:40:39 -0700 Subject: include memory sizes on inc/dec in C format --- src/long_mode/display.rs | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/long_mode/display.rs b/src/long_mode/display.rs index 8750cc6..3631800 100644 --- a/src/long_mode/display.rs +++ b/src/long_mode/display.rs @@ -2709,10 +2709,28 @@ fn contextualize_c>(inst write!(out, "{} = movntq({})", instr.operand(0), instr.operand(1))?; } Opcode::INC => { - write!(out, "{}++", instr.operand(0))?; + if instr.operand(0).is_memory() { + match instr.mem_size { + 1 => { write!(out, "byte {}++", instr.operand(0))?; }, + 2 => { write!(out, "word {}++", instr.operand(0))?; }, + 4 => { write!(out, "dword {}++", instr.operand(0))?; }, + _ => { write!(out, "qword {}++", instr.operand(0))?; }, // sizes that are not 1, 2, or 4, *better* be 8. + } + } else { + write!(out, "{}++", instr.operand(0))?; + } } Opcode::DEC => { - write!(out, "{}--", instr.operand(0))?; + if instr.operand(0).is_memory() { + match instr.mem_size { + 1 => { write!(out, "byte {}--", instr.operand(0))?; }, + 2 => { write!(out, "word {}--", instr.operand(0))?; }, + 4 => { write!(out, "dword {}--", instr.operand(0))?; }, + _ => { write!(out, "qword {}--", instr.operand(0))?; }, // sizes that are not 1, 2, or 4, *better* be 8. + } + } else { + write!(out, "{}--", instr.operand(0))?; + } } Opcode::JG => { write!(out, "if greater(rflags) then jmp {}", instr.operand(0))?; -- cgit v1.1