aboutsummaryrefslogtreecommitdiff
path: root/target-xtensa/cpu.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-04-11 18:24:49 +0200
committerMax Filippov <jcmvbkbc@gmail.com>2012-04-14 03:48:08 +0400
commit5087a72cb3e94f48c1d447babd67e33bfd9dda12 (patch)
tree268052b43daca566670134666d90f08db4adee04 /target-xtensa/cpu.c
parenta4633e16d77bd1cf0c25e500d15943499b94f2f9 (diff)
target-xtensa: QOM'ify CPU reset
Move code from cpu_state_reset() into QOM xtensa_cpu_reset(). To avoid moving reset_mmu() and dependencies, make it non-static. Signed-off-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'target-xtensa/cpu.c')
-rw-r--r--target-xtensa/cpu.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/target-xtensa/cpu.c b/target-xtensa/cpu.c
index d68be226ee..55d2dea266 100644
--- a/target-xtensa/cpu.c
+++ b/target-xtensa/cpu.c
@@ -1,6 +1,7 @@
/*
* QEMU Xtensa CPU
*
+ * Copyright (c) 2011, Max Filippov, Open Source and Linux Lab.
* Copyright (c) 2012 SUSE LINUX Products GmbH
* All rights reserved.
*
@@ -40,7 +41,16 @@ static void xtensa_cpu_reset(CPUState *s)
xcc->parent_reset(s);
- cpu_state_reset(env);
+ env->exception_taken = 0;
+ env->pc = env->config->exception_vector[EXC_RESET];
+ env->sregs[LITBASE] &= ~1;
+ env->sregs[PS] = xtensa_option_enabled(env->config,
+ XTENSA_OPTION_INTERRUPT) ? 0x1f : 0x10;
+ env->sregs[VECBASE] = env->config->vecbase;
+ env->sregs[IBREAKENABLE] = 0;
+
+ env->pending_irq_level = 0;
+ reset_mmu(env);
}
static void xtensa_cpu_class_init(ObjectClass *oc, void *data)