[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/5] arm: store the config_base_register during cpu_
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 3/5] arm: store the config_base_register during cpu_reset |
Date: |
Wed, 25 Jan 2012 15:27:43 +0000 |
From: Mark Langsdorf <address@hidden>
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: Mark Langsdorf <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
target-arm/helper.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/target-arm/helper.c b/target-arm/helper.c
index f6e998b..22e40fc 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -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 */
--
1.7.1
- [Qemu-devel] [PULL 0/5] target-arm queue, Peter Maydell, 2012/01/25
- [Qemu-devel] [PATCH 1/5] target-arm: Fix implementation of TLB invalidate operations, Peter Maydell, 2012/01/25
- [Qemu-devel] [PATCH 2/5] target-arm/helper.c: Don't assume softfloat int32 is 32 bits only, Peter Maydell, 2012/01/25
- [Qemu-devel] [PATCH 3/5] arm: store the config_base_register during cpu_reset,
Peter Maydell <=
- [Qemu-devel] [PATCH 4/5] Add dummy implementation of generic timer cp15 registers, Peter Maydell, 2012/01/25
- [Qemu-devel] [PATCH 5/5] Add Cortex-A15 CPU definition, Peter Maydell, 2012/01/25
- Re: [Qemu-devel] [PULL 0/5] target-arm queue, Blue Swirl, 2012/01/28