diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2020-02-07 14:04:23 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-02-07 14:04:23 +0000 |
| commit | fba37aedecb82506c62a1f9e81d066b4fd04e443 (patch) | |
| tree | 846bd0ef3a924876e6e0d60e537f9dee703cd652 /target/arm/translate.h | |
| parent | 2859d7b590760283a7b5aef40b723e9dfd7c98ba (diff) | |
| download | qemu-fba37aedecb82506c62a1f9e81d066b4fd04e443.zip qemu-fba37aedecb82506c62a1f9e81d066b4fd04e443.tar.gz qemu-fba37aedecb82506c62a1f9e81d066b4fd04e443.tar.bz2 | |
target/arm: Rename ARMMMUIdx_S1SE[01] to ARMMMUIdx_SE10_[01]
This is part of a reorganization to the set of mmu_idx.
This emphasizes that they apply to the Secure EL1&0 regime.
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20200206105448.4726-13-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/arm/translate.h')
| -rw-r--r-- | target/arm/translate.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/arm/translate.h b/target/arm/translate.h index b837b7f..a32b6b1 100644 --- a/target/arm/translate.h +++ b/target/arm/translate.h @@ -126,7 +126,7 @@ static inline int default_exception_el(DisasContext *s) * exceptions can only be routed to ELs above 1, so we target the higher of * 1 or the current EL. */ - return (s->mmu_idx == ARMMMUIdx_S1SE0 && s->secure_routed_to_el3) + return (s->mmu_idx == ARMMMUIdx_SE10_0 && s->secure_routed_to_el3) ? 3 : MAX(1, s->current_el); } |