diff options
| author | Richard Henderson | 2019-03-01 21:04:52 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-03-05 16:55:07 +0100 |
| commit | 64e40755cd41fbe8cd266cf387e42ddc57a449ef (patch) | |
| tree | c888f0e401a21a9f77d868be3ea2d6e4979a0854 /target/arm/helper.c | |
| parent | target/arm: Fix PC test for LDM (exception return) (diff) | |
| download | qemu-64e40755cd41fbe8cd266cf387e42ddc57a449ef.tar.gz qemu-64e40755cd41fbe8cd266cf387e42ddc57a449ef.tar.xz qemu-64e40755cd41fbe8cd266cf387e42ddc57a449ef.zip | |
target/arm: Split out arm_sctlr
Minimize the number of places that will need updating when
the virtual host extensions are added.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20190301200501.16533-2-richard.henderson@linaro.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/arm/helper.c')
| -rw-r--r-- | target/arm/helper.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/target/arm/helper.c b/target/arm/helper.c index 1fa282a7fc..49ff79a146 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -12854,12 +12854,8 @@ void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc, flags = FIELD_DP32(flags, TBFLAG_A64, ZCR_LEN, zcr_len); } - if (current_el == 0) { - /* FIXME: ARMv8.1-VHE S2 translation regime. */ - sctlr = env->cp15.sctlr_el[1]; - } else { - sctlr = env->cp15.sctlr_el[current_el]; - } + sctlr = arm_sctlr(env, current_el); + if (cpu_isar_feature(aa64_pauth, cpu)) { /* * In order to save space in flags, we record only whether |