mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 09:43:56 -06:00
target-arm: make c13 cp regs banked (FCSEIDR, ...)
When EL3 is running in AArch32 (or ARMv7 with Security Extensions) FCSEIDR, CONTEXTIDR, TPIDRURW, TPIDRURO and TPIDRPRW have a secure and a non-secure instance. Signed-off-by: Fabian Aggeler <aggelerf@ethz.ch> Signed-off-by: Greg Bellows <greg.bellows@linaro.org> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 1416242878-876-25-git-send-email-greg.bellows@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
fb6c91ba2b
commit
54bf36ed35
6 changed files with 80 additions and 22 deletions
|
@ -307,11 +307,37 @@ typedef struct CPUARMState {
|
|||
uint64_t vbar_el[4];
|
||||
};
|
||||
uint32_t mvbar; /* (monitor) vector base address register */
|
||||
uint32_t c13_fcse; /* FCSE PID. */
|
||||
uint64_t contextidr_el1; /* Context ID. */
|
||||
uint64_t tpidr_el0; /* User RW Thread register. */
|
||||
uint64_t tpidrro_el0; /* User RO Thread register. */
|
||||
uint64_t tpidr_el1; /* Privileged Thread register. */
|
||||
struct { /* FCSE PID. */
|
||||
uint32_t fcseidr_ns;
|
||||
uint32_t fcseidr_s;
|
||||
};
|
||||
union { /* Context ID. */
|
||||
struct {
|
||||
uint64_t _unused_contextidr_0;
|
||||
uint64_t contextidr_ns;
|
||||
uint64_t _unused_contextidr_1;
|
||||
uint64_t contextidr_s;
|
||||
};
|
||||
uint64_t contextidr_el[4];
|
||||
};
|
||||
union { /* User RW Thread register. */
|
||||
struct {
|
||||
uint64_t tpidrurw_ns;
|
||||
uint64_t tpidrprw_ns;
|
||||
uint64_t htpidr;
|
||||
uint64_t _tpidr_el3;
|
||||
};
|
||||
uint64_t tpidr_el[4];
|
||||
};
|
||||
/* The secure banks of these registers don't map anywhere */
|
||||
uint64_t tpidrurw_s;
|
||||
uint64_t tpidrprw_s;
|
||||
uint64_t tpidruro_s;
|
||||
|
||||
union { /* User RO Thread register. */
|
||||
uint64_t tpidruro_ns;
|
||||
uint64_t tpidrro_el[1];
|
||||
};
|
||||
uint64_t c14_cntfrq; /* Counter Frequency register */
|
||||
uint64_t c14_cntkctl; /* Timer Control register */
|
||||
ARMGenericTimer c14_timer[NUM_GTIMERS];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue