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

DS: Fix DSRaiseIRQ order-of-operations

This commit is contained in:
Vicki Pfau 2017-02-25 23:33:23 -08:00
parent a7f1567286
commit aac9568769
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ds/ds.c
View File

@ -815,7 +815,7 @@ void DSRaiseIRQ(struct ARMCore* cpu, uint16_t* io, enum DSIRQ irq) {
io[DS_REG_IF_HI >> 1] |= 1 << (irq - 16); io[DS_REG_IF_HI >> 1] |= 1 << (irq - 16);
} }
if ((irq < 16 && (io[DS_REG_IE_LO >> 1] & 1 << irq)) || (io[DS_REG_IE_HI >> 1] & 1 << (irq - 16))) { if ((irq < 16 && (io[DS_REG_IE_LO >> 1] & 1 << irq)) || (io[DS_REG_IE_HI >> 1] & (1 << (irq - 16)))) {
cpu->halted = 0; cpu->halted = 0;
if (io[DS_REG_IME >> 1]) { if (io[DS_REG_IME >> 1]) {
ARMRaiseIRQ(cpu); ARMRaiseIRQ(cpu);