target-arm: A64: Register VBAR_EL3

Reviewed-by: Peter Crosthwaite <[email protected]>
Signed-off-by: Edgar E. Iglesias <[email protected]>
Message-id: 1400980132[email protected]
Signed-off-by: Peter Maydell <[email protected]>

diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index 3ccbd951438fb297671d7213b775d4d2f86dbcbc..8d04385261219d9b1f5a02198a441b90785a009a 100644 (file)
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -198,7 +198,7 @@ typedef struct CPUARMState {
         uint32_t c9_pmuserenr; /* perf monitor user enable */
         uint32_t c9_pminten; /* perf monitor interrupt enables */
         uint64_t mair_el1;
-        uint64_t vbar_el[3]; /* vector base address register */
+        uint64_t vbar_el[4]; /* vector base address register */
         uint32_t c13_fcse; /* FCSE PID.  */
         uint64_t contextidr_el1; /* Context ID.  */
         uint64_t tpidr_el0; /* User RW Thread register.  */

diff --git a/target-arm/helper.c b/target-arm/helper.c
index c769ef25a5608ee2fde5cb81aed4edf82fe297f0..6a01c6a82a74d5d98d89008d57de10a024bd4d9d 100644 (file)
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -2138,6 +2138,11 @@ static const ARMCPRegInfo v8_el3_cp_reginfo[] = {
       .type = ARM_CP_NO_MIGRATE,
       .opc0 = 3, .opc1 = 6, .crn = 4, .crm = 0, .opc2 = 0,
       .access = PL3_RW, .fieldoffset = offsetof(CPUARMState, banked_spsr[7]) },
+    { .name = "VBAR_EL3", .state = ARM_CP_STATE_AA64,
+      .opc0 = 3, .opc1 = 6, .crn = 12, .crm = 0, .opc2 = 0,
+      .access = PL3_RW, .writefn = vbar_write,
+      .fieldoffset = offsetof(CPUARMState, cp15.vbar_el[3]),
+      .resetvalue = 0 },
     REGINFO_SENTINEL
 };