From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39465) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnxtV-0004m0-MF for qemu-devel@nongnu.org; Tue, 03 Dec 2013 16:52:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VnxtQ-0007oe-50 for qemu-devel@nongnu.org; Tue, 03 Dec 2013 16:52:37 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:35990) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnxtP-0007nW-VA for qemu-devel@nongnu.org; Tue, 03 Dec 2013 16:52:32 -0500 From: Peter Maydell Date: Tue, 3 Dec 2013 21:51:07 +0000 Message-Id: <1386107477-24165-3-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1386107477-24165-1-git-send-email-peter.maydell@linaro.org> References: <1386107477-24165-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 02/12] target-arm: A64: add set_pc cpu method List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: patches@linaro.org, Michael Matz , Alexander Graf , C Fontana , Dirk Mueller , Laurent Desnogues , kvmarm@lists.cs.columbia.edu, Richard Henderson From: Alexander Graf 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 Signed-off-by: Peter Maydell --- target-arm/cpu64.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/target-arm/cpu64.c b/target-arm/cpu64.c index 3e99c21..04ce879 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; -- 1.7.9.5