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

GB, GBA: Fix emulator hardlocking when halting with IRQs off

This commit is contained in:
Jeffrey Pfau 2016-09-25 16:48:41 -07:00
parent e8c51b16b4
commit 59e61c31ea
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -16,6 +16,7 @@ Bugfixes:
- Core: Fix importing save games as read-only - Core: Fix importing save games as read-only
- Util: Fix PNG identification on files too small to be a PNG - Util: Fix PNG identification on files too small to be a PNG
- GB: Fix invalid STOP behavior on Game Boy Color - GB: Fix invalid STOP behavior on Game Boy Color
- GB, GBA: Fix emulator hardlocking when halting with IRQs off
Misc: Misc:
- All: Only update version info if needed - All: Only update version info if needed
- FFmpeg: Encoding cleanup - FFmpeg: Encoding cleanup

3
src/gb/gb.c
View File

@ -537,6 +537,9 @@ void GBProcessEvents(struct LR35902Core* cpu) {
if (cpu->halted) { if (cpu->halted) {
cpu->cycles = cpu->nextEvent; cpu->cycles = cpu->nextEvent;
if (!gb->memory.ie || !gb->memory.ime) {
break;
}
} }
} while (cpu->cycles >= cpu->nextEvent); } while (cpu->cycles >= cpu->nextEvent);
} }

3
src/gba/gba.c
View File

@ -287,6 +287,9 @@ static void GBAProcessEvents(struct ARMCore* cpu) {
if (cpu->halted) { if (cpu->halted) {
cpu->cycles = cpu->nextEvent; cpu->cycles = cpu->nextEvent;
if (!gba->memory.io[REG_IME >> 1] || !gba->memory.io[REG_IE >> 1]) {
break;
}
} }
if (nextEvent == 0) { if (nextEvent == 0) {
break; break;