From 57165fb4bbe6ef80adae9273d8365c29c18fc815 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Thu, 10 Jan 2002 11:14:57 +0000
Subject: Fix parameters passed to CPRead[13] and CPRead[14].

---
 sim/arm/arminit.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'sim/arm/arminit.c')

diff --git a/sim/arm/arminit.c b/sim/arm/arminit.c
index bdbb2c7..c0312e9 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;
     }
-- 
cgit v1.1