Skip to content

M68K: Handle minimum signed displacements #3041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
carrerasdarren-cell wants to merge 1 commit into from
+70 −3
Closed

M68K: Handle minimum signed displacements #3041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions arch/M68K/M68KInstPrinter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,11 @@ static void printScaleFactor(SStream *O, uint8_t scale, int threshold)
SStream_concat(O, "%s*%s%" PRId8, s_spacing, s_spacing, scale);
}

static uint32_t unsignedMagnitude(int32_t value)
{
return value < 0 ? (uint32_t)(-(int64_t)value) : (uint32_t)value;
}

static void printIndexReg(SStream *O, const cs_m68k_op *op)
{
SStream_concat(O, "%s.%c", getRegName(op->mem.index_reg),
Expand Down Expand Up @@ -289,7 +294,7 @@ static void printBaseDisp(SStream *O, uint32_t pc, const cs_m68k_op *op)
} else if (op->mem.in_disp != 0) {
SStream_concat(O, "%s$%" PRIx32,
op->mem.in_disp >= 0 ? "" : "-",
abs(op->mem.in_disp));
unsignedMagnitude(op->mem.in_disp));
}

SStream_concat0(O, "(");
Expand Down Expand Up @@ -328,7 +333,7 @@ static void printMemIndirect(SStream *O, uint32_t pc, const cs_m68k_op *op)
} else if (op->mem.in_disp != 0) {
SStream_concat(O, "%s$%" PRIx32,
op->mem.in_disp >= 0 ? "" : "-",
abs(op->mem.in_disp));
unsignedMagnitude(op->mem.in_disp));
}

if (op->mem.base_reg != M68K_REG_INVALID) {
Expand All @@ -355,7 +360,7 @@ static void printMemIndirect(SStream *O, uint32_t pc, const cs_m68k_op *op)
if (op->mem.out_disp != 0) {
SStream_concat(O, ",%s%s$%" PRIx32, s_spacing,
op->mem.out_disp >= 0 ? "" : "-",
abs(op->mem.out_disp));
unsignedMagnitude(op->mem.out_disp));
}

SStream_concat0(O, ")");
Expand Down
62 changes: 62 additions & 0 deletions tests/details/m68k.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,6 +1103,68 @@ test_cases:
- type: M68K_OP_REG
reg: a3

# INT32_MIN displacements must not be negated as signed 32-bit values.
- input:
bytes: [0x47, 0xf1, 0x21, 0x30, 0x80, 0x00, 0x00, 0x00]
arch: "m68k"
options: [CS_OPT_DETAIL, CS_MODE_BIG_ENDIAN, CS_MODE_M68K_040]
address: 0x0
expected:
insns:
- asm_text: "lea.l -$80000000(a1, d2.w), a3"
details:
regs_read: [d2, a1]
regs_write: [a3]
m68k:
operands:
- type: M68K_OP_MEM
mem:
base_reg: a1
index_reg: d2
index_size: -1
in_disp: -0x80000000
in_disp_size: 1
address_mode: M68K_AM_AREGI_INDEX_BASE_DISP
- type: M68K_OP_REG
reg: a3
- input:
bytes:
[
0x20,
0xf0,
0xff,
0xff,
0x80,
0x00,
0x00,
0x00,
0x80,
0x00,
0x00,
0x00,
]
arch: "m68k"
options: [CS_OPT_DETAIL, CS_MODE_BIG_ENDIAN, CS_MODE_M68K_040]
address: 0x0
expected:
insns:
- asm_text: "move.l ([-$80000000], -$80000000), (a0)+"
details:
regs_write: [a0]
m68k:
operands:
- type: M68K_OP_MEM
mem:
in_disp: -0x80000000
out_disp: -0x80000000
in_disp_size: 1
out_disp_size: 1
address_mode: M68K_AM_MEMI_POST_INDEX
- type: M68K_OP_MEM
mem:
base_reg: a0
address_mode: M68K_AM_REGI_ADDR_POST_INC

# ==========================================================================
# 68040/060 PFLUSH variants (Line-F 0xF5xx)
# These are 2-byte instructions. Currently decoded as F-line emulator trap.
Expand Down