revision 52:429b7fc6b843
summary |
tree |
shortlog |
changelog |
graph |
changeset |
raw | bz2 | zip | gz changeset | 52:429b7fc6b843 |
parent | 51:ed6c27067502 |
child | 53:f2981805b929 |
author | nkeynes |
date | Wed Dec 28 22:50:08 2005 +0000 (17 years ago) |
Grr, irq/fiq mask was backwards, fixed
1.1 --- a/src/aica/armcore.c Wed Dec 28 22:49:26 2005 +00001.2 +++ b/src/aica/armcore.c Wed Dec 28 22:50:08 2005 +00001.3 @@ -1,5 +1,5 @@1.4 /**1.5 - * $Id: armcore.c,v 1.12 2005-12-28 22:49:26 nkeynes Exp $1.6 + * $Id: armcore.c,v 1.13 2005-12-28 22:50:08 nkeynes Exp $1.7 *1.8 * ARM7TDMI CPU emulation core.1.9 *1.10 @@ -662,7 +662,7 @@1.11 uint32_t ir = MEM_READ_LONG(pc);1.12 uint32_t operand, operand2, tmp, tmp2, cond;1.14 - tmp = armr.int_pending & armr.cpsr;1.15 + tmp = armr.int_pending & (~armr.cpsr);1.16 if( tmp ) {1.17 if( tmp & CPSR_F ) {1.18 arm_raise_exception( EXC_FAST_IRQ );
.