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

chore: pass destoer's cond_invalid test

This commit is contained in:
Rekai Nyangadzayi Musuka 2022-04-30 20:41:49 -05:00
parent f2f4bb205a
commit 640b1f7c5d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -15,7 +15,7 @@ An in-progress Gameboy Advance Emulator written in Zig ⚡!
- [x] `midikey2freq` - [x] `midikey2freq`
- [ ] `swi-tests-random` - [ ] `swi-tests-random`
- [ ] [destoer's GBA Tests](https://github.com/destoer/gba_tests) - [ ] [destoer's GBA Tests](https://github.com/destoer/gba_tests)
- [ ] `cond_invalid.gba` - [x] `cond_invalid.gba`
- [x] `dma_priority.gba` - [x] `dma_priority.gba`
- [x] `hello_world.gba` - [x] `hello_world.gba`
- [x] `if_ack.gba` - [x] `if_ack.gba`

2
src/cpu.zig
View File

@ -459,7 +459,7 @@ pub fn checkCond(cpsr: PSR, cond: u4) bool {
0xC => !cpsr.z.read() and (cpsr.n.read() == cpsr.v.read()), // GT - Greater than 0xC => !cpsr.z.read() and (cpsr.n.read() == cpsr.v.read()), // GT - Greater than
0xD => cpsr.z.read() or (cpsr.n.read() != cpsr.v.read()), // LE - Less than or equal 0xD => cpsr.z.read() or (cpsr.n.read() != cpsr.v.read()), // LE - Less than or equal
0xE => true, // AL - Always 0xE => true, // AL - Always
0xF => std.debug.panic("[CPU/Cond] 0xF is a reserved condition field", .{}), 0xF => false, // NV - Never (reserved in ARMv3 and up, but seems to have not changed?)
}; };
} }