From 0a0181bf3aff84be4515a034e0be208d847fefca Mon Sep 17 00:00:00 2001
From: masscat <masscat@users.sf.net>
Date: Fri, 16 Mar 2007 14:41:02 +0000
Subject: [PATCH] Bug 1681415 fix: flag interrupt sources correctly.

---
 desmume/src/armcpu.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/desmume/src/armcpu.h b/desmume/src/armcpu.h
index dcdeb9893..6114f2aba 100644
--- a/desmume/src/armcpu.h
+++ b/desmume/src/armcpu.h
@@ -182,9 +182,12 @@ extern armcpu_t NDS_ARM9;
 
 static INLINE void NDS_makeARM9Int(u32 num)
 {
+        /* flag the interrupt request source */
+        MMU.reg_IF[0] |= (1<<num);
+
+        /* generate the interrupt if enabled */
 	if ((MMU.reg_IE[0] & (1 << num)) && MMU.reg_IME[0])
 	{
-		MMU.reg_IF[0] |= (1<<num);
 		NDS_ARM9.wIRQ = TRUE;
 		NDS_ARM9.waitIRQ = FALSE;
 	}
@@ -192,9 +195,12 @@ static INLINE void NDS_makeARM9Int(u32 num)
        
 static INLINE void NDS_makeARM7Int(u32 num)
 {
+        /* flag the interrupt request source */
+	MMU.reg_IF[1] |= (1<<num);
+
+        /* generate the interrupt if enabled */
 	if ((MMU.reg_IE[1] & (1 << num)) && MMU.reg_IME[1])
 	{
-		MMU.reg_IF[1] |= (1<<num);
 		NDS_ARM7.wIRQ = TRUE;
 		NDS_ARM7.waitIRQ = FALSE;
 	}