diff options
| author | Nick Clifton <nickc@redhat.com> | 2002-01-10 11:14:57 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2002-01-10 11:14:57 +0000 |
| commit | 57165fb4bbe6ef80adae9273d8365c29c18fc815 (patch) | |
| tree | 63fffe959b8d1325c5fd52f0f47f76b5a1b25107 /sim/arm/arminit.c | |
| parent | db60ec6263a44dae741e54521ccd154ff8b76469 (diff) | |
| download | binutils-gdb-57165fb4bbe6ef80adae9273d8365c29c18fc815.tar.gz | |
Fix parameters passed to CPRead[13] and CPRead[14].
Diffstat (limited to 'sim/arm/arminit.c')
| -rw-r--r-- | sim/arm/arminit.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sim/arm/arminit.c b/sim/arm/arminit.c index bdbb2c77771..c0312e95239 100644 --- a/sim/arm/arminit.c +++ b/sim/arm/arminit.c @@ -302,13 +302,15 @@ ARMul_Abort (ARMul_State * state, ARMword vector) SETABORT (IBIT, SVC26MODE, isize); break; case ARMul_IRQV: /* IRQ */ - if (!state->is_XScale - || (state->CPRead[13](state, 0, 0) & ARMul_CP13_R0_IRQ)) + if ( ! state->is_XScale + || ! state->CPRead[13] (state, 0, & temp) + || (temp & ARMul_CP13_R0_IRQ)) SETABORT (IBIT, state->prog32Sig ? IRQ32MODE : IRQ26MODE, esize); break; case ARMul_FIQV: /* FIQ */ - if (!state->is_XScale - || (state->CPRead[13](state, 0, 0) & ARMul_CP13_R0_FIQ)) + if ( ! state->is_XScale + || ! state->CPRead[13] (state, 0, & temp) + || (temp & ARMul_CP13_R0_FIQ)) SETABORT (INTBITS, state->prog32Sig ? FIQ32MODE : FIQ26MODE, esize); break; } |