all repos — mgba @ aac95687698b1912ba5ce8604db943c1d16d48e9

mGBA Game Boy Advance Emulator

DS: Fix DSRaiseIRQ order-of-operations
Vicki Pfau vi@endrift.com
Sat, 25 Feb 2017 23:33:23 -0800
commit

aac95687698b1912ba5ce8604db943c1d16d48e9

parent

a7f15672861a46767a37cd0fec1398c05a2790fc

1 files changed, 1 insertions(+), 1 deletions(-)

jump to
M src/ds/ds.csrc/ds/ds.c

@@ -815,7 +815,7 @@ } else {

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; if (io[DS_REG_IME >> 1]) { ARMRaiseIRQ(cpu);