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

fix: get beeg.gba working again

This commit is contained in:
Rekai Nyangadzayi Musuka 2022-07-02 03:15:26 -03:00
parent a0cb1a4708
commit df3538caeb
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cpu.zig
View File

@ -241,6 +241,7 @@ pub const Arm7tdmi = struct {
} }
self.cpsr.mode.write(@enumToInt(next)); self.cpsr.mode.write(@enumToInt(next));
self.pipe.flush();
} }
pub fn fastBoot(self: *Self) void { pub fn fastBoot(self: *Self) void {

3
src/cpu/arm/data_processing.zig
View File

@ -13,6 +13,7 @@ pub fn dataProcessing(comptime I: bool, comptime S: bool, comptime instrKind: u4
const old_carry = @boolToInt(cpu.cpsr.c.read()); const old_carry = @boolToInt(cpu.cpsr.c.read());
// If certain conditions are met, PC is 12 ahead instead of 8 // If certain conditions are met, PC is 12 ahead instead of 8
// TODO: What are these conditions? I can't remember
if (!I and opcode >> 4 & 1 == 1) cpu.r[15] += 4; if (!I and opcode >> 4 & 1 == 1) cpu.r[15] += 4;
const op1 = if (rn == 0xF) cpu.fakePC() else cpu.r[rn]; const op1 = if (rn == 0xF) cpu.fakePC() else cpu.r[rn];
@ -127,6 +128,8 @@ pub fn dataProcessing(comptime I: bool, comptime S: bool, comptime instrKind: u4
setArmLogicOpFlags(S, cpu, rd, result); setArmLogicOpFlags(S, cpu, rd, result);
}, },
} }
if (rd == 0xF) cpu.pipe.flush();
} }
}.inner; }.inner;
} }