ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GBA: Only unhalt CPU if appropriate bit is set in IE

This commit is contained in:
Jeffrey Pfau 2016-12-11 20:39:14 -08:00
parent 3415484d9d
commit 85367c3713
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -33,7 +33,7 @@ Bugfixes:
- GBA BIOS: Implement BitUnPack - GBA BIOS: Implement BitUnPack
- GBA: Add savegame override for Crash Bandicoot 2 - GBA: Add savegame override for Crash Bandicoot 2
- ARM7: PSR mode bits should not get sign extended - ARM7: PSR mode bits should not get sign extended
- GBA: Only unhalt CPU if an IRQ actually fires - GBA: Only unhalt CPU if appropriate bit is set in IE
- GBA Video: Fix out of bounds sprite transforms - GBA Video: Fix out of bounds sprite transforms
Misc: Misc:
- SDL: Remove scancode key input - SDL: Remove scancode key input

1
src/arm/arm.c
View File

@ -147,7 +147,6 @@ void ARMReset(struct ARMCore* cpu) {
} }
void ARMRaiseIRQ(struct ARMCore* cpu) { void ARMRaiseIRQ(struct ARMCore* cpu) {
cpu->halted = 0;
if (cpu->cpsr.i) { if (cpu->cpsr.i) {
return; return;
} }

7
src/gba/gba.c
View File

@ -665,8 +665,11 @@ void GBAWriteIME(struct GBA* gba, uint16_t value) {
void GBARaiseIRQ(struct GBA* gba, enum GBAIRQ irq) { void GBARaiseIRQ(struct GBA* gba, enum GBAIRQ irq) {
gba->memory.io[REG_IF >> 1] |= 1 << irq; gba->memory.io[REG_IF >> 1] |= 1 << irq;
if (gba->memory.io[REG_IME >> 1] && (gba->memory.io[REG_IE >> 1] & 1 << irq)) { if (gba->memory.io[REG_IE >> 1] & 1 << irq) {
ARMRaiseIRQ(gba->cpu); gba->cpu->halted = 0;
if (gba->memory.io[REG_IME >> 1]) {
ARMRaiseIRQ(gba->cpu);
}
} }
} }