target-arm: A64: Add ELR entries for EL2 and 3
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Message-id: 1400980132-25949-11-git-send-email-edgar.iglesias@gmail.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
73fb3b764b
commit
1b1742386c
|
@ -162,7 +162,7 @@ typedef struct CPUARMState {
|
||||||
uint32_t condexec_bits; /* IT bits. cpsr[15:10,26:25]. */
|
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 daif; /* exception masks, in the bits they are in in PSTATE */
|
||||||
|
|
||||||
uint64_t elr_el[2]; /* AArch64 exception link regs */
|
uint64_t elr_el[4]; /* AArch64 exception link regs */
|
||||||
uint64_t sp_el[4]; /* AArch64 banked stack pointers */
|
uint64_t sp_el[4]; /* AArch64 banked stack pointers */
|
||||||
|
|
||||||
/* System control coprocessor (cp15) */
|
/* System control coprocessor (cp15) */
|
||||||
|
|
|
@ -218,8 +218,8 @@ static int cpu_post_load(void *opaque, int version_id)
|
||||||
|
|
||||||
const VMStateDescription vmstate_arm_cpu = {
|
const VMStateDescription vmstate_arm_cpu = {
|
||||||
.name = "cpu",
|
.name = "cpu",
|
||||||
.version_id = 18,
|
.version_id = 19,
|
||||||
.minimum_version_id = 18,
|
.minimum_version_id = 19,
|
||||||
.pre_save = cpu_pre_save,
|
.pre_save = cpu_pre_save,
|
||||||
.post_load = cpu_post_load,
|
.post_load = cpu_post_load,
|
||||||
.fields = (VMStateField[]) {
|
.fields = (VMStateField[]) {
|
||||||
|
@ -238,7 +238,7 @@ const VMStateDescription vmstate_arm_cpu = {
|
||||||
VMSTATE_UINT32_ARRAY(env.banked_r14, ARMCPU, 6),
|
VMSTATE_UINT32_ARRAY(env.banked_r14, ARMCPU, 6),
|
||||||
VMSTATE_UINT32_ARRAY(env.usr_regs, ARMCPU, 5),
|
VMSTATE_UINT32_ARRAY(env.usr_regs, ARMCPU, 5),
|
||||||
VMSTATE_UINT32_ARRAY(env.fiq_regs, ARMCPU, 5),
|
VMSTATE_UINT32_ARRAY(env.fiq_regs, ARMCPU, 5),
|
||||||
VMSTATE_UINT64(env.elr_el[1], ARMCPU),
|
VMSTATE_UINT64_ARRAY(env.elr_el, ARMCPU, 4),
|
||||||
VMSTATE_UINT64_ARRAY(env.sp_el, ARMCPU, 4),
|
VMSTATE_UINT64_ARRAY(env.sp_el, ARMCPU, 4),
|
||||||
/* The length-check must come before the arrays to avoid
|
/* The length-check must come before the arrays to avoid
|
||||||
* incoming data possibly overflowing the array.
|
* incoming data possibly overflowing the array.
|
||||||
|
|
Loading…
Reference in a new issue