From 2ccfbdf116346c80593976d971e71591060a9bb4 Mon Sep 17 00:00:00 2001
From: mightymax <mightymax@users.sf.net>
Date: Sat, 13 Jan 2007 19:08:58 +0000
Subject: [PATCH] added IE and IME check to interrupts

---
 desmume/src/armcpu.h | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/desmume/src/armcpu.h b/desmume/src/armcpu.h
index 10c68cdc3..e5136f6c4 100644
--- a/desmume/src/armcpu.h
+++ b/desmume/src/armcpu.h
@@ -181,16 +181,22 @@ extern armcpu_t NDS_ARM9;
 
 static INLINE void NDS_makeARM9Int(u32 num)
 {
-	MMU.reg_IF[0] |= (1<<num);// & (MMU.reg_IME[0] << num);//& (MMU.reg_IE[0] & (1<<num));
-	NDS_ARM9.wIRQ = TRUE;
-	NDS_ARM9.waitIRQ = FALSE;
+	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;
+	}
 }
        
 static INLINE void NDS_makeARM7Int(u32 num)
 {
-	MMU.reg_IF[1] |= (1<<num);// & (MMU.reg_IME[1] << num);// (MMU.reg_IE[1] & (1<<num));
-	NDS_ARM7.wIRQ = TRUE;
-	NDS_ARM7.waitIRQ = FALSE;
+	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;
+	}
 }
 
 #ifdef __cplusplus