summaryrefslogtreecommitdiffstats
path: root/target-arm/cpu.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-04-15 19:18:42 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-04-17 21:34:04 +0100
commita0618a1990e4df30a76cf5b441b4aa7f002b0d64 (patch)
tree7a49aa78bfc908fecaf4cafd53798556082b5f6f /target-arm/cpu.h
parent6cd8a2649aafb8e53db4a8f0bf0ea629441f8c03 (diff)
downloadhqemu-a0618a1990e4df30a76cf5b441b4aa7f002b0d64.zip
hqemu-a0618a1990e4df30a76cf5b441b4aa7f002b0d64.tar.gz
target-arm: Add AArch64 ELR_EL1 register.
Add the AArch64 ELR_EL1 register. Note that this does not live in env->cp15: for KVM migration compatibility we need to migrate it separately rather than as part of the system registers, because the KVM-to-userspace interface puts it in the struct kvm_regs rather than making them visible via the ONE_REG ioctls. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Diffstat (limited to 'target-arm/cpu.h')
-rw-r--r--target-arm/cpu.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index 4ca75cd..ecdd7a7 100644
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -162,6 +162,8 @@ typedef struct CPUARMState {
uint32_t condexec_bits; /* IT bits. cpsr[15:10,26:25]. */
uint64_t daif; /* exception masks, in the bits they are in in PSTATE */
+ uint64_t elr_el1; /* AArch64 ELR_EL1 */
+
/* System control coprocessor (cp15) */
struct {
uint32_t c0_cpuid;
OpenPOWER on IntegriCloud