From: Richard Henderson <richard.henderson@linaro.org>
Date: Fri, 4 Feb 2022 17:04:43 +0000 (+0000)
Subject: target/arm: Use CPTR_TFP with CPTR_EL3 in fp_exception_el
X-Git-Tag: v7.0.0-rc0~60^2~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7b66ada6e88aa9a9f420f1116569b2df47fa1ab;p=thirdparty%2Fqemu.git

target/arm: Use CPTR_TFP with CPTR_EL3 in fp_exception_el

Use the named bit rather than a bare extract32.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Zenghui Yu <yuzenghui@huawei.com>
Message-id: 20220127063428.30212-5-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/target/arm/helper.c b/target/arm/helper.c
index 83bbb446e70..b5f80988c90 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -13037,7 +13037,7 @@ int fp_exception_el(CPUARMState *env, int cur_el)
     }
 
     /* CPTR_EL3 : present in v8 */
-    if (extract32(env->cp15.cptr_el[3], 10, 1)) {
+    if (env->cp15.cptr_el[3] & CPTR_TFP) {
         /* Trap all FP ops to EL3 */
         return 3;
     }