[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 07/71] target/arm: Use el_is_in_host for sve_exception_el
From: |
Richard Henderson |
Subject: |
[PATCH v2 07/71] target/arm: Use el_is_in_host for sve_exception_el |
Date: |
Tue, 7 Jun 2022 13:32:02 -0700 |
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>
---
target/arm/helper.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 135c3e790c..7319c91fc2 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -6180,9 +6180,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) {
@@ -6199,6 +6197,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:
--
2.34.1
- [PATCH v2 00/71] target/arm: Scalable Matrix Extension, Richard Henderson, 2022/06/07
- [PATCH v2 01/71] target/arm: Rename TBFLAG_A64 ZCR_LEN to VL, Richard Henderson, 2022/06/07
- [PATCH v2 02/71] linux-user/aarch64: Introduce sve_vq, Richard Henderson, 2022/06/07
- [PATCH v2 05/71] target/arm: Add el_is_in_host, Richard Henderson, 2022/06/07
- [PATCH v2 03/71] target/arm: Remove route_to_el2 check from sve_exception_el, Richard Henderson, 2022/06/07
- [PATCH v2 09/71] target/arm: Do not use aarch64_sve_zcr_get_valid_len in reset, Richard Henderson, 2022/06/07
- [PATCH v2 06/71] target/arm: Use el_is_in_host for sve_zcr_len_for_el, Richard Henderson, 2022/06/07
- [PATCH v2 04/71] target/arm: Remove fp checks from sve_exception_el, Richard Henderson, 2022/06/07
- [PATCH v2 07/71] target/arm: Use el_is_in_host for sve_exception_el,
Richard Henderson <=
- [PATCH v2 08/71] target/arm: Hoist arm_is_el2_enabled check in sve_exception_el, Richard Henderson, 2022/06/07
- [PATCH v2 11/71] target/arm: Use uint32_t instead of bitmap for sve vq's, Richard Henderson, 2022/06/07
- [PATCH v2 10/71] target/arm: Merge aarch64_sve_zcr_get_valid_len into caller, Richard Henderson, 2022/06/07
- [PATCH v2 13/71] target/arm: Split out load/store primitives to sve_ldst_internal.h, Richard Henderson, 2022/06/07
- [PATCH v2 17/71] target/arm: Move expand_pred_h to vec_internal.h, Richard Henderson, 2022/06/07
- [PATCH v2 18/71] target/arm: Export bfdotadd from vec_helper.c, Richard Henderson, 2022/06/07
- [PATCH v2 19/71] target/arm: Add isar_feature_aa64_sme, Richard Henderson, 2022/06/07
- [PATCH v2 15/71] target/arm: Move expand_pred_b to vec_internal.h, Richard Henderson, 2022/06/07
- [PATCH v2 26/71] target/arm: Add SMCR_ELx, Richard Henderson, 2022/06/07
- [PATCH v2 12/71] target/arm: Rename sve_zcr_len_for_el to sve_vqm1_for_el, Richard Henderson, 2022/06/07