diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2022-06-08 19:38:56 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2022-06-08 19:38:56 +0100 |
| commit | aa4451b60e6a2b1bc4e9a8f6bbf90b266e2a4390 (patch) | |
| tree | 56347d167152562fe4a9d521b32a423e03a357a9 /target/arm/helper.c | |
| parent | c6225bebc2498e9dd85bdd4de1840925650c7a9f (diff) | |
| download | focaccia-qemu-aa4451b60e6a2b1bc4e9a8f6bbf90b266e2a4390.tar.gz focaccia-qemu-aa4451b60e6a2b1bc4e9a8f6bbf90b266e2a4390.zip | |
target/arm: Use el_is_in_host for sve_exception_el
The ARM pseudocode function CheckNormalSVEEnabled uses this predicate now, and I think it's a bit clearer. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20220607203306.657998-8-richard.henderson@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 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/target/arm/helper.c b/target/arm/helper.c index 6b17c0f507..40b60b1eea 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -6170,9 +6170,7 @@ static const ARMCPRegInfo minimal_ras_reginfo[] = { int sve_exception_el(CPUARMState *env, int el) { #ifndef CONFIG_USER_ONLY - uint64_t hcr_el2 = arm_hcr_el2_eff(env); - - if (el <= 1 && (hcr_el2 & (HCR_E2H | HCR_TGE)) != (HCR_E2H | HCR_TGE)) { + if (el <= 1 && !el_is_in_host(env, el)) { switch (FIELD_EX64(env->cp15.cpacr_el1, CPACR_EL1, ZEN)) { case 1: if (el != 0) { @@ -6189,6 +6187,7 @@ int sve_exception_el(CPUARMState *env, int el) * CPTR_EL2 changes format with HCR_EL2.E2H (regardless of TGE). */ if (el <= 2) { + uint64_t hcr_el2 = arm_hcr_el2_eff(env); if (hcr_el2 & HCR_E2H) { switch (FIELD_EX64(env->cp15.cptr_el[2], CPTR_EL2, ZEN)) { case 1: |