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

Compare commits

base: paoda:f601bec0c44f98bcbd4230e7e009860e12eb68f0
Branches Tags
paoda:main
paoda:april-fools
paoda:window
paoda:apu-things
..
compare: paoda:20d9f0a7f4e858b874fb2af6ee6f66c4c68d2cdf
Branches Tags
paoda:main
paoda:april-fools
paoda:window
paoda:apu-things

No commits in common. "f601bec0c44f98bcbd4230e7e009860e12eb68f0" and "20d9f0a7f4e858b874fb2af6ee6f66c4c68d2cdf" have entirely different histories.
f601bec0c4 ... 20d9f0a7f4

1 changed files with 2 additions and 5 deletions
Show Stats Expand all files Collapse all files

7
src/core/cpu.zig
View File

@ -450,7 +450,8 @@ pub const Arm7tdmi = struct {
} }
} }
if (!self.pipe.flushed) self.r[15] += if (self.cpsr.t.read()) 2 else @as(u32, 4); if (self.pipe.flushed) self.r[15] += if (self.cpsr.t.read()) 2 else @as(u32, 4);
self.r[15] += if (self.cpsr.t.read()) 2 else @as(u32, 4);
self.pipe.flushed = false; self.pipe.flushed = false;
} }
@ -541,8 +542,6 @@ pub const Arm7tdmi = struct {
std.debug.print("spsr: 0x{X:0>8} ", .{self.spsr.raw}); std.debug.print("spsr: 0x{X:0>8} ", .{self.spsr.raw});
prettyPrintPsr(&self.spsr); prettyPrintPsr(&self.spsr);
std.debug.print("pipeline: {??X:0>8}\n", .{self.pipe.stage});
if (self.cpsr.t.read()) { if (self.cpsr.t.read()) {
const opcode = self.bus.dbgRead(u16, self.r[15] - 4); const opcode = self.bus.dbgRead(u16, self.r[15] - 4);
const id = thumbIdx(opcode); const id = thumbIdx(opcode);
@ -705,8 +704,6 @@ const Pipline = struct {
self.stage[0] = cpu.bus.read(T, cpu.r[15]); self.stage[0] = cpu.bus.read(T, cpu.r[15]);
self.stage[1] = cpu.bus.read(T, cpu.r[15] + if (T == u32) 4 else @as(u32, 2)); self.stage[1] = cpu.bus.read(T, cpu.r[15] + if (T == u32) 4 else @as(u32, 2));
cpu.r[15] += if (T == u32) 8 else @as(u32, 4);
self.flushed = true; self.flushed = true;
} }
}; };