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

fix: reimpl debug reads w/out throwing away *const Self

Browse Source
This commit is contained in:
Rekai Nyangadzayi Musuka
2022-10-21 05:12:55 -03:00
parent 20056eff2c
commit 7488fd7fd5
6 changed files with 155 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/cpu.zig
View File

@@ -520,11 +520,11 @@ pub const Arm7tdmi = struct {
prettyPrintPsr(&self.spsr);
if (self.cpsr.t.read()) {
const opcode = self.bus.debugRead(u16, self.r[15] - 4);
const opcode = self.bus.dbgRead(u16, self.r[15] - 4);
const id = thumbIdx(opcode);
std.debug.print("opcode: ID: 0x{b:0>10} 0x{X:0>4}\n", .{ id, opcode });
} else {
const opcode = self.bus.debugRead(u32, self.r[15] - 4);
const opcode = self.bus.dbgRead(u32, self.r[15] - 4);
const id = armIdx(opcode);
std.debug.print("opcode: ID: 0x{X:0>3} 0x{X:0>8}\n", .{ id, opcode });
}
@@ -590,7 +590,7 @@ pub const Arm7tdmi = struct {
if (self.cpsr.t.read()) {
if (opcode >> 11 == 0x1E) {
// Instruction 1 of a BL Opcode, print in ARM mode
const other_half = self.bus.debugRead(u16, self.r[15]);
const other_half = self.bus.dbgRead(u16, self.r[15]);
const bl_opcode = @as(u32, opcode) << 16 | other_half;
log_str = try std.fmt.bufPrint(&buf, arm_fmt, .{ r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, r13, r14, r15, c_psr, bl_opcode });