Commit 5fe91019 authored by Mark Langsdorf's avatar Mark Langsdorf Committed by Peter Maydell
Browse files

arm: store the config_base_register during cpu_reset 



Long term, the config_base_register will be a QDM parameter. In the
meantime, models that use it need to be able to preserve it across
cpu_reset() calls.

Signed-off-by: default avatarMark Langsdorf <mark.langsdorf@calxeda.com>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 85836979

target-arm/helper.c

+3 −0
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id) 
void cpu_reset(CPUARMState *env)

{

    uint32_t id;

    uint32_t tmp = 0;



    if (qemu_loglevel_mask(CPU_LOG_RESET)) {

        qemu_log("CPU Reset (CPU %d)\n", env->cpu_index);
@@ -262,9 +263,11 @@ void cpu_reset(CPUARMState *env) 
    }



    id = env->cp15.c0_cpuid;

    tmp = env->cp15.c15_config_base_address;

    memset(env, 0, offsetof(CPUARMState, breakpoints));

    if (id)

        cpu_reset_model_id(env, id);

    env->cp15.c15_config_base_address = tmp;

#if defined (CONFIG_USER_ONLY)

    env->uncached_cpsr = ARM_CPU_MODE_USR;

    /* For user mode we must enable access to coprocessors */