# HG changeset patch # User nkeynes # Date 1135810208 0 # Node ID 429b7fc6b843dd5816b0d372d5e2c0105582b89d # Parent ed6c27067502f53f9c64cd3814e64b000e840cd4 Grr, irq/fiq mask was backwards, fixed --- a/src/aica/armcore.c Wed Dec 28 22:49:26 2005 +0000 +++ b/src/aica/armcore.c Wed Dec 28 22:50:08 2005 +0000 @@ -1,5 +1,5 @@ /** - * $Id: armcore.c,v 1.12 2005-12-28 22:49:26 nkeynes Exp $ + * $Id: armcore.c,v 1.13 2005-12-28 22:50:08 nkeynes Exp $ * * ARM7TDMI CPU emulation core. * @@ -662,7 +662,7 @@ uint32_t ir = MEM_READ_LONG(pc); uint32_t operand, operand2, tmp, tmp2, cond; - tmp = armr.int_pending & armr.cpsr; + tmp = armr.int_pending & (~armr.cpsr); if( tmp ) { if( tmp & CPSR_F ) { arm_raise_exception( EXC_FAST_IRQ );