T0b1/test-repo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

format: Handle offset operands properly

Browse Source
This commit is contained in:
Alexis Engelke
2020-06-14 13:55:59 +02:00
parent 9454f5f746
commit 8716bd1991
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
format.c
View File

@@ -55,7 +55,7 @@ fd_format(const FdInstr* instr, char* buffer, size_t len)
if (op_type == FD_OT_NONE)
break;
const char* op_type_name = &"reg\0imm\0mem"[op_type * 4] - 4;
const char* op_type_name = &"reg\0imm\0mem\0off"[op_type * 4] - 4;
FMT_CONCAT(buf, end, " %s%u:", op_type_name, FD_OP_SIZE(instr, i));
switch (op_type)
@@ -70,6 +70,14 @@ fd_format(const FdInstr* instr, char* buffer, size_t len)
else
FMT_CONCAT(buf, end, "r%u", FD_OP_REG(instr, i));
break;
case FD_OT_OFF:
if (FD_OP_SIZE(instr, i) == 2)
FMT_CONCAT(buf, end, "ip+");
else if (FD_OP_SIZE(instr, i) == 4)
FMT_CONCAT(buf, end, "eip+");
else if (FD_OP_SIZE(instr, i) == 8)
FMT_CONCAT(buf, end, "rip+");
// fallthrough
case FD_OT_IMM:
immediate = FD_OP_IMM(instr, i);
if (FD_OP_SIZE(instr, i) == 1)