ARM7TDMI emulation
PATCH 1/1 ARM7TDMI emulation
While most of the ARMv5 instructions are backward compatible with ARMv4, there are few important differences. Most notably the stack pop and load instructions ignore the lowest bit, which is used by ARMv5 to switch to Thumb mode. A base-updated data-abort model is used on ARM7TDMI, CP15 coprocessor is not present and several instructions of later architectures are not implemented.
This patch introduces flags for the V5, CP15 and ABORT_BU (base-updated abort model) features. When V5 feature is not set the bit 0 on POP, LD and LDM of PC register is ignored and doesn't swith to/from Thumb mode and several instructions are treated as unimplemented (BLX, PLD, BKPT, LDRD, STRD).
Based on patch by Ulrich Hecht <[email protected]>.
--- target-arm/cpu.h | 6 ++- target-arm/helper.c | 24 ++++++++++ target-arm/translate.c | 116 ++++++++++++++++++++++++++++++++++-------------- 3 files changed, 112 insertions(+), 34 deletions(-)
target-arm/cpu.h +5 -1
@@ -331,6 +331,7 @@ enum arm_features {ARM_FEATURE_AUXCR ,/* ARM1026 Auxiliary control register. */ ARM_FEATURE_XSCALE ,/* Intel XScale extensions. */ ARM_FEATURE_IWMMXT ,/* Intel iwMMXt extension. */ +ARM_FEATURE_V5 ,ARM_FEATURE_V6 ,ARM_FEATURE_V6K , ARM_FEATURE_V7,
@@ -341,7 +342,9 @@ enum arm_features {ARM_FEATURE_DIV ,ARM_FEATURE_M ,/* Microcontroller profile. */ ARM_FEATURE_OMAPCP ,/* OMAP specific CP15 ops handling. */ - ARM_FEATURE_THUMB2EE +ARM_FEATURE_THUMB2EE , +ARM_FEATURE_CP15 ,/* ARM7TDMI, ARM7TDMI-S, ARM7EJ-S, and ARM9TDMI cores do not have a CP15 */ + ARM_FEATURE_ABORT_BU /* base updated abort model, e.g. ARMxTDMI */ };static inline int arm_feature (CPUARMState *env,int feature)
@@ -367,6 +370,7 @@ void cpu_arm_set_cp_io(CPUARMState *env, int cpnum,#define IS_M (env) arm_feature(env, ARM_FEATURE_M)#define ARM_CPUID (env) (env->cp15.c0_cpuid) +#define ARM_CPUID_ARM7TDMI 0x41807000/* guess; no CP15 on ARM7TDMI */ #define ARM_CPUID_ARM1026 0x4106a262#define ARM_CPUID_ARM926 0x41069265#define ARM_CPUID_ARM946 0x41059461
target-arm/helper.c +24 -0
@@ -37,19 +37,28 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id) { env->cp15.c0_cpuid = id;switch (id) { +case ARM_CPUID_ARM7TDMI : +set_feature (env,ARM_FEATURE_ABORT_BU ); +break ;case ARM_CPUID_ARM926 : +set_feature (env,ARM_FEATURE_V5 );set_feature (env,ARM_FEATURE_VFP ); +set_feature (env,ARM_FEATURE_CP15 ); env->vfp.xregs[ARM_VFP_FPSID ] =0x41011090 ; env->cp15.c0_cachetype =0x1dd20d2 ; env->cp15.c1_sys =0x00090078 ;break ;case ARM_CPUID_ARM946 : +set_feature (env,ARM_FEATURE_V5 ); +set_feature (env,ARM_FEATURE_CP15 );set_feature (env,ARM_FEATURE_MPU ); env->cp15.c0_cachetype =0x0f004006 ; env->cp15.c1_sys =0x00000078 ;break ;case ARM_CPUID_ARM1026 : +set_feature (env,ARM_FEATURE_V5 );set_feature (env,ARM_FEATURE_VFP ); +set_feature (env,ARM_FEATURE_CP15 );set_feature (env,ARM_FEATURE_AUXCR ); env->vfp.xregs[ARM_VFP_FPSID ] =0x410110a0 ; env->cp15.c0_cachetype =0x1dd20d2 ;
@@ -57,8 +66,10 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id)break ;case ARM_CPUID_ARM1136_R2 :case ARM_CPUID_ARM1136 : +set_feature (env,ARM_FEATURE_V5 );set_feature (env,ARM_FEATURE_V6 );set_feature (env,ARM_FEATURE_VFP ); +set_feature (env,ARM_FEATURE_CP15 );set_feature (env,ARM_FEATURE_AUXCR ); env->vfp.xregs[ARM_VFP_FPSID ] =0x410120b4 ; env->vfp.xregs[ARM_VFP_MVFR0 ] =0x11111111 ;
@@ -68,9 +79,11 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id) env->cp15.c0_cachetype =0x1dd20d2 ;break ;case ARM_CPUID_ARM11MPCORE : +set_feature (env,ARM_FEATURE_V5 );set_feature (env,ARM_FEATURE_V6 );set_feature (env,ARM_FEATURE_V6K );set_feature (env,ARM_FEATURE_VFP ); +set_feature (env,ARM_FEATURE_CP15 );set_feature (env,ARM_FEATURE_AUXCR ); env->vfp.xregs[ARM_VFP_FPSID ] =0x410120b4 ; env->vfp.xregs[ARM_VFP_MVFR0 ] =0x11111111 ;
@@ -80,9 +93,11 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id) env->cp15.c0_cachetype =0x1dd20d2 ;break ;case ARM_CPUID_CORTEXA8 : +set_feature (env,ARM_FEATURE_V5 );set_feature (env,ARM_FEATURE_V6 );set_feature (env,ARM_FEATURE_V6K );set_feature (env,ARM_FEATURE_V7 ); +set_feature (env,ARM_FEATURE_CP15 );set_feature (env,ARM_FEATURE_AUXCR );set_feature (env,ARM_FEATURE_THUMB2 );set_feature (env,ARM_FEATURE_VFP );
@@ -101,6 +116,7 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id) env->cp15.c0_ccsid[2 ] =0xf0000000 ;/* No L2 icache. */ break ;case ARM_CPUID_CORTEXM3 : +set_feature (env,ARM_FEATURE_V5 );set_feature (env,ARM_FEATURE_V6 );set_feature (env,ARM_FEATURE_THUMB2 );set_feature (env,ARM_FEATURE_V7 );
@@ -108,6 +124,7 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id)set_feature (env,ARM_FEATURE_DIV );break ;case ARM_CPUID_ANY :/* For userspace emulation. */ +set_feature (env,ARM_FEATURE_V5 );set_feature (env,ARM_FEATURE_V6 );set_feature (env,ARM_FEATURE_V6K );set_feature (env,ARM_FEATURE_V7 );
@@ -120,6 +137,8 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id)break ;case ARM_CPUID_TI915T :case ARM_CPUID_TI925T : +set_feature (env,ARM_FEATURE_V5 ); +set_feature (env,ARM_FEATURE_CP15 );set_feature (env,ARM_FEATURE_OMAPCP ); env->cp15.c0_cpuid =ARM_CPUID_TI925T ;/* Depends on wiring. */ env->cp15.c0_cachetype =0x5109149 ;
@@ -132,6 +151,8 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id)case ARM_CPUID_PXA260 :case ARM_CPUID_PXA261 :case ARM_CPUID_PXA262 : +set_feature (env,ARM_FEATURE_V5 ); +set_feature (env,ARM_FEATURE_CP15 );set_feature (env,ARM_FEATURE_XSCALE );/* JTAG_ID is ((id << 28) | 0x09265013) */ env->cp15.c0_cachetype =0xd172172 ;
@@ -143,6 +164,8 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id)case ARM_CPUID_PXA270_B1 :case ARM_CPUID_PXA270_C0 :case ARM_CPUID_PXA270_C5 : +set_feature (env,ARM_FEATURE_V5 ); +set_feature (env,ARM_FEATURE_CP15 );set_feature (env,ARM_FEATURE_XSCALE );/* JTAG_ID is ((id << 28) | 0x09265013) */ set_feature (env,ARM_FEATURE_IWMMXT );
@@ -277,6 +300,7 @@ struct arm_cpu_t { };static const struct arm_cpu_t arm_cpu_names[] = { + {ARM_CPUID_ARM7TDMI ,"arm7tdmi" }, {ARM_CPUID_ARM926 ,"arm926" }, {ARM_CPUID_ARM946 ,"arm946" }, {ARM_CPUID_ARM1026 ,"arm1026" },
target-arm/translate.c +83 -33
253 lines not on this page · raw message
Signature · 1 line
1.6.3.msysgit.0