diff options
| author | Richard Henderson | 2022-06-08 20:38:56 +0200 |
|---|---|---|
| committer | Peter Maydell | 2022-06-08 20:38:56 +0200 |
| commit | c6225bebc2498e9dd85bdd4de1840925650c7a9f (patch) | |
| tree | a1eddd022c612431bbbcbef525202658308a3eeb /target/arm/helper.c | |
| parent | target/arm: Add el_is_in_host (diff) | |
| download | qemu-c6225bebc2498e9dd85bdd4de1840925650c7a9f.tar.gz qemu-c6225bebc2498e9dd85bdd4de1840925650c7a9f.tar.xz qemu-c6225bebc2498e9dd85bdd4de1840925650c7a9f.zip | |
target/arm: Use el_is_in_host for sve_zcr_len_for_el
The ARM pseudocode function NVL uses this predicate now,
and I think it's a bit clearer. Simplify the pseudocode
condition by noting that IsInHost is always false for EL1.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220607203306.657998-7-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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/target/arm/helper.c b/target/arm/helper.c index 322508170e..6b17c0f507 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -6238,8 +6238,7 @@ uint32_t sve_zcr_len_for_el(CPUARMState *env, int el) ARMCPU *cpu = env_archcpu(env); uint32_t zcr_len = cpu->sve_max_vq - 1; - if (el <= 1 && - (arm_hcr_el2_eff(env) & (HCR_E2H | HCR_TGE)) != (HCR_E2H | HCR_TGE)) { + if (el <= 1 && !el_is_in_host(env, el)) { zcr_len = MIN(zcr_len, 0xf & (uint32_t)env->vfp.zcr_el[1]); } if (el <= 2 && arm_feature(env, ARM_FEATURE_EL2)) { |