diff options
| author | Nick Clifton <nickc@redhat.com> | 2000-09-15 23:55:50 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2000-09-15 23:55:50 +0000 |
| commit | 3943c96b075b8584c9d9417c319371394b928bd6 (patch) | |
| tree | c2e8ea4de595f6582fa9833a2f2d62d69a6f6df1 /sim/arm/armdefs.h | |
| parent | f7c9d7b6986678dc1be12199492d97ff2624c2d8 (diff) | |
| download | gdb-3943c96b075b8584c9d9417c319371394b928bd6.zip gdb-3943c96b075b8584c9d9417c319371394b928bd6.tar.gz gdb-3943c96b075b8584c9d9417c319371394b928bd6.tar.bz2 | |
Replace StrongARM property with v4 and v5 properties.
Diffstat (limited to 'sim/arm/armdefs.h')
| -rw-r--r-- | sim/arm/armdefs.h | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/sim/arm/armdefs.h b/sim/arm/armdefs.h index 72dae0a..61ab9c5 100644 --- a/sim/arm/armdefs.h +++ b/sim/arm/armdefs.h @@ -123,9 +123,9 @@ struct ARMul_State const struct Dbg_HostosInterface *hostif; - unsigned is_StrongARM; /* Are we emulating a StrongARM? */ - - int verbose; /* non-zero means print various messages like the banner */ + unsigned is_v4; /* Are we emulating a v4 architecture (or higher) ? */ + unsigned is_v5; /* Are we emulating a v5 architecture ? */ + unsigned verbose; /* Print various messages like the banner */ }; #define ResetPin NresetSig @@ -139,7 +139,7 @@ struct ARMul_State #define LateAbortPin lateabtSig /***************************************************************************\ -* Types of ARM we know about * +* Properties of ARM we know about * \***************************************************************************/ /* The bitflags */ @@ -148,26 +148,8 @@ struct ARMul_State #define ARM_Debug_Prop 0x10 #define ARM_Isync_Prop ARM_Debug_Prop #define ARM_Lock_Prop 0x20 -#define ARM_Strong_Prop 0x40 - -/* ARM2 family */ -#define ARM2 (ARM_Fix26_Prop) -#define ARM2as ARM2 -#define ARM61 ARM2 -#define ARM3 ARM2 - -#ifdef ARM60 /* previous definition in armopts.h */ -#undef ARM60 -#endif - -/* ARM6 family */ -#define ARM6 (ARM_Lock_Prop) -#define ARM60 ARM6 -#define ARM600 ARM6 -#define ARM610 ARM6 -#define ARM620 ARM6 - -#define STRONGARM (ARM_Strong_Prop) +#define ARM_v4_Prop 0x40 +#define ARM_v5_Prop 0x80 /***************************************************************************\ * Macros to extract instruction fields * |