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

Compare commits

base: paoda:3be084cb820d1df8dd76523565481584b5251acd
Branches Tags
paoda:main
paoda:april-fools
paoda:window
paoda:apu-things
...
compare: paoda:3596caf106c903d95513ffa0fa062429b5816454
Branches Tags
paoda:main
paoda:april-fools
paoda:window
paoda:apu-things

3 Commits
3be084cb82 ... 3596caf106

Author SHA1 Message Date
Rekai Nyangadzayi Musuka 3596caf106 Merge branch 'main' of ssh://musuka.dev:2222/paoda/zba 2022-01-11 02:36:37 -04:00
Rekai Nyangadzayi Musuka c1be53bcb2 fix(bus): remove accidental recursion 2022-01-10 21:25:45 -04:00
Rekai Nyangadzayi Musuka 072a66cfdb fix(cpu): write results of ORR to destination register 2022-01-10 10:56:41 -04:00
2 changed files with 2 additions and 1 deletions
Show Stats Expand all files Collapse all files

2
src/Bus.zig
View File

@ -43,7 +43,7 @@ pub fn read32(self: *const Self, addr: u32) u32 {
0x0000_0000...0x0000_3FFF => self.bios.get32(@as(usize, addr)), 0x0000_0000...0x0000_3FFF => self.bios.get32(@as(usize, addr)),
0x0200_0000...0x0203_FFFF => self.iwram.get32(addr - 0x0200_0000), 0x0200_0000...0x0203_FFFF => self.iwram.get32(addr - 0x0200_0000),
0x0300_0000...0x0300_7FFF => self.ewram.get32(addr - 0x0300_0000), 0x0300_0000...0x0300_7FFF => self.ewram.get32(addr - 0x0300_0000),
0x0400_0000...0x0400_03FE => self.read32(addr), 0x0400_0000...0x0400_03FE => self.io.read32(addr),
// Internal Display Memory // Internal Display Memory
0x0500_0000...0x0500_03FF => self.ppu.palette.get32(@as(usize, addr - 0x0500_0000)), 0x0500_0000...0x0500_03FF => self.ppu.palette.get32(@as(usize, addr - 0x0500_0000)),

1
src/cpu/data_processing.zig
View File

@ -76,6 +76,7 @@ pub fn dataProcessing(comptime I: bool, comptime S: bool, comptime instrKind: u4
0xC => { 0xC => {
// ORR // ORR
const result = cpu.r[op1] | op2; const result = cpu.r[op1] | op2;
cpu.r[rd] = result;
if (S and rd != 0xF) { if (S and rd != 0xF) {
cpu.cpsr.n.write(result >> 31 & 1 == 1); cpu.cpsr.n.write(result >> 31 & 1 == 1);