[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 08/71] target/arm: Hoist arm_is_el2_enabled check in sve_exceptio
From: |
Richard Henderson |
Subject: |
[PATCH 08/71] target/arm: Hoist arm_is_el2_enabled check in sve_exception_el |
Date: |
Thu, 2 Jun 2022 14:47:50 -0700 |
This check is buried within arm_hcr_el2_eff(), but since we
have to have the explicit check for CPTR_EL2.TZ, we might as
well just check it once at the beginning of the block.
Once this is done, we can test HCR_EL2.{E2H,TGE} directly,
rather than going through arm_hcr_el2_eff().
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/helper.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 7319c91fc2..dc8f1e44cc 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -6193,15 +6193,12 @@ 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) {
+ if (el <= 2 && arm_is_el2_enabled(env)) {
+ /* CPTR_EL2 changes format with HCR_EL2.E2H (regardless of TGE). */
+ if (env->cp15.hcr_el2 & HCR_E2H) {
switch (FIELD_EX64(env->cp15.cptr_el[2], CPTR_EL2, ZEN)) {
case 1:
- if (el != 0 || !(hcr_el2 & HCR_TGE)) {
+ if (el != 0 || !(env->cp15.hcr_el2 & HCR_TGE)) {
break;
}
/* fall through */
@@ -6209,7 +6206,7 @@ int sve_exception_el(CPUARMState *env, int el)
case 2:
return 2;
}
- } else if (arm_is_el2_enabled(env)) {
+ } else {
if (FIELD_EX64(env->cp15.cptr_el[2], CPTR_EL2, TZ)) {
return 2;
}
--
2.34.1
- [PATCH 00/71] target/arm: Scalable Matrix Extension, Richard Henderson, 2022/06/02
- [PATCH 02/71] linux-user/aarch64: Introduce sve_vq_cached, Richard Henderson, 2022/06/02
- [PATCH 01/71] target/arm: Rename TBFLAG_A64 ZCR_LEN to VL, Richard Henderson, 2022/06/02
- [PATCH 04/71] target/arm: Remove fp checks from sve_exception_el, Richard Henderson, 2022/06/02
- [PATCH 06/71] target/arm: Use el_is_in_host for sve_zcr_len_for_el, Richard Henderson, 2022/06/02
- [PATCH 03/71] target/arm: Remove route_to_el2 check from sve_exception_el, Richard Henderson, 2022/06/02
- [PATCH 08/71] target/arm: Hoist arm_is_el2_enabled check in sve_exception_el,
Richard Henderson <=
- [PATCH 09/71] target/arm: Do not use aarch64_sve_zcr_get_valid_len in reset, Richard Henderson, 2022/06/02
- [PATCH 07/71] target/arm: Use el_is_in_host for sve_exception_el, Richard Henderson, 2022/06/02
- [PATCH 05/71] target/arm: Add el_is_in_host, Richard Henderson, 2022/06/02
- [PATCH 10/71] target/arm: Merge aarch64_sve_zcr_get_valid_len into caller, Richard Henderson, 2022/06/02
- [PATCH 12/71] target/arm: Rename sve_zcr_len_for_el to sve_vqm1_for_el, Richard Henderson, 2022/06/02
- [PATCH 11/71] target/arm: Use uint32_t instead of bitmap for sve vq's, Richard Henderson, 2022/06/02