aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2013-12-03 15:26:18 +0000
committerPeter Maydell <peter.maydell@linaro.org>2013-12-04 15:59:21 +0000
commita9929f1c672587b464386f185115c60666a32695 (patch)
tree363a5a95e8bd0e9c7459f6b45539dc4d6e120403
parentdec82c63b284491eaacd08b5f1532cc494f22c2f (diff)
downloadqemu-arm-a9929f1c672587b464386f185115c60666a32695.tar.gz
target-arm: A64: add set_pc cpu method
When executing translation blocks we need to be able to recover our program counter. Add a method to set it for AArch64 CPUs. This covers user-mode, but for system mode emulation we will need to check if the CPU is in an AArch32 execution state. Signed-off-by: Alexander Graf <agraf@suse.de> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Richard Henderson <rth@twiddle.net>
-rw-r--r--target-arm/cpu64.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/target-arm/cpu64.c b/target-arm/cpu64.c
index 3e99c2140a..04ce87951c 100644
--- a/target-arm/cpu64.c
+++ b/target-arm/cpu64.c
@@ -68,11 +68,22 @@ static void aarch64_cpu_finalizefn(Object *obj)
{
}
+static void aarch64_cpu_set_pc(CPUState *cs, vaddr value)
+{
+ ARMCPU *cpu = ARM_CPU(cs);
+ /*
+ * TODO: this will need updating for system emulation,
+ * when the core may be in AArch32 mode.
+ */
+ cpu->env.pc = value;
+}
+
static void aarch64_cpu_class_init(ObjectClass *oc, void *data)
{
CPUClass *cc = CPU_CLASS(oc);
cc->dump_state = aarch64_cpu_dump_state;
+ cc->set_pc = aarch64_cpu_set_pc;
cc->gdb_read_register = aarch64_cpu_gdb_read_register;
cc->gdb_write_register = aarch64_cpu_gdb_write_register;
cc->gdb_num_core_regs = 34;