From: Meador Inge <[email protected]> This patch adds support for `-cpu anyvfp`, which is just like `-cpu any`, but enables the coprocessors by default. This is useful for working with a wide range of bare-metal C/C++ applications that have been compiled in different ways and assume the coprocessor has been enabled already.
Original patch by Daniel Jacobowitz. Signed-off-by: Meador Inge <[email protected]> --- target-arm/cpu.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/target-arm/cpu.c b/target-arm/cpu.c index 3665f6b..2a00e73 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -181,7 +181,14 @@ static void arm_cpu_reset(CPUState *s) env->regs[15] = 0xFFFF0000; } - env->vfp.xregs[ARM_VFP_FPEXC] = 0; + /* For -cpu anyvfp, enable coprocessors by default. Useful for + testing code that expects something else to turn on the + coprocessor. */ + if (cpu->midr == 0xfffffffe) { + env->vfp.xregs[ARM_VFP_FPEXC] = 1 << 30; + } else { + env->vfp.xregs[ARM_VFP_FPEXC] = 0; + } #endif set_flush_to_zero(1, &env->vfp.standard_fp_status); set_flush_inputs_to_zero(1, &env->vfp.standard_fp_status); @@ -1258,6 +1265,13 @@ static void arm_any_initfn(Object *obj) cpu->midr = 0xffffffff; } +static void arm_anyvfp_initfn(Object *obj) +{ + ARMCPU *cpu = ARM_CPU(obj); + arm_any_initfn(obj); + cpu->midr = 0xfffffffe; +} + #endif /* !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) */ typedef struct ARMCPUInfo { @@ -1304,6 +1318,7 @@ static const ARMCPUInfo arm_cpus[] = { { .name = "pxa270-c0", .initfn = pxa270c0_initfn }, { .name = "pxa270-c5", .initfn = pxa270c5_initfn }, { .name = "any", .initfn = arm_any_initfn }, + { .name = "anyvfp", .initfn = arm_anyvfp_initfn }, #endif { .name = NULL } }; -- 1.8.1.1
