paoda
/
zba
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: resolve off-by-{word, halfword} errors when printing debug info

This commit is contained in:
Rekai Nyangadzayi Musuka 2022-07-28 21:03:32 -03:00
parent 4922106915
commit d37c130deb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/util.zig
View File

@ -137,7 +137,7 @@ pub const Logger = struct {
if (arm7tdmi.cpsr.t.read()) { if (arm7tdmi.cpsr.t.read()) {
if (opcode >> 11 == 0x1E) { if (opcode >> 11 == 0x1E) {
// Instruction 1 of a BL Opcode, print in ARM mode // Instruction 1 of a BL Opcode, print in ARM mode
const low = arm7tdmi.bus.debugRead(u16, arm7tdmi.r[15]); const low = arm7tdmi.bus.debugRead(u16, arm7tdmi.r[15] - 2);
const bl_opcode = @as(u32, opcode) << 16 | low; const bl_opcode = @as(u32, opcode) << 16 | low;
self.print(arm_fmt, Self.fmtArgs(arm7tdmi, bl_opcode)) catch @panic("failed to write to log file"); self.print(arm_fmt, Self.fmtArgs(arm7tdmi, bl_opcode)) catch @panic("failed to write to log file");
@ -166,7 +166,7 @@ pub const Logger = struct {
arm7tdmi.r[12], arm7tdmi.r[12],
arm7tdmi.r[13], arm7tdmi.r[13],
arm7tdmi.r[14], arm7tdmi.r[14],
arm7tdmi.r[15] - 4, arm7tdmi.r[15] - if (arm7tdmi.cpsr.t.read()) 2 else @as(u32, 4),
arm7tdmi.cpsr.raw, arm7tdmi.cpsr.raw,
opcode, opcode,
}; };