From 3943c96b075b8584c9d9417c319371394b928bd6 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 15 Sep 2000 23:55:50 +0000 Subject: Replace StrongARM property with v4 and v5 properties. --- sim/arm/arminit.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'sim/arm/arminit.c') diff --git a/sim/arm/arminit.c b/sim/arm/arminit.c index 3ee4c69..a3f0001 100644 --- a/sim/arm/arminit.c +++ b/sim/arm/arminit.c @@ -85,7 +85,7 @@ ARMul_NewState (void) } for (i = 0; i < 7; i++) state->Spsr[i] = 0; - + state->Mode = USER26MODE; state->CallDebug = FALSE; @@ -124,20 +124,22 @@ ARMul_NewState (void) state->lateabtSig = LOW; state->bigendSig = LOW; - state->is_StrongARM = LOW; + state->is_v4 = LOW; + state->is_v5 = LOW; ARMul_Reset (state); - return (state); + + return state; } /***************************************************************************\ -* Call this routine to set ARMulator to model a certain processor * + Call this routine to set ARMulator to model certain processor properities \***************************************************************************/ void -ARMul_SelectProcessor (ARMul_State * state, unsigned processor) +ARMul_SelectProcessor (ARMul_State * state, unsigned properties) { - if (processor & ARM_Fix26_Prop) + if (properties & ARM_Fix26_Prop) { state->prog32Sig = LOW; state->data32Sig = LOW; @@ -150,7 +152,8 @@ ARMul_SelectProcessor (ARMul_State * state, unsigned processor) state->lateabtSig = LOW; - state->is_StrongARM = (processor & ARM_Strong_Prop) ? HIGH : LOW; + state->is_v4 = (properties & (ARM_v4_Prop | ARM_v5_Prop)) ? HIGH : LOW; + state->is_v5 = (properties & ARM_v5_Prop) ? HIGH : LOW; } /***************************************************************************\ -- cgit v1.1