From aac95687698b1912ba5ce8604db943c1d16d48e9 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Sat, 25 Feb 2017 23:33:23 -0800 Subject: [PATCH] DS: Fix DSRaiseIRQ order-of-operations --- src/ds/ds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ds/ds.c b/src/ds/ds.c index 7fbdf9481..77693b0b0 100644 --- a/src/ds/ds.c +++ b/src/ds/ds.c @@ -815,7 +815,7 @@ void DSRaiseIRQ(struct ARMCore* cpu, uint16_t* io, enum DSIRQ irq) { 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);