From: Richard Henderson Date: Sat, 1 Feb 2025 16:40:10 +0000 (+0000) Subject: target/arm: Simplify DO_VFP_cmp in vfp_helper.c X-Git-Tag: v10.0.0-rc0~55^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d75f68047624e5337963690a9a96906fcca3aefe;p=thirdparty%2Fqemu.git target/arm: Simplify DO_VFP_cmp in vfp_helper.c Pass ARMFPStatusFlavour index instead of fp_status[FOO]. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-id: 20250129013857.135256-17-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- diff --git a/target/arm/vfp_helper.c b/target/arm/vfp_helper.c index 4d1b697a66..5d424477a2 100644 --- a/target/arm/vfp_helper.c +++ b/target/arm/vfp_helper.c @@ -489,16 +489,16 @@ static void softfloat_to_vfp_compare(CPUARMState *env, FloatRelation cmp) void VFP_HELPER(cmp, P)(ARGTYPE a, ARGTYPE b, CPUARMState *env) \ { \ softfloat_to_vfp_compare(env, \ - FLOATTYPE ## _compare_quiet(a, b, &env->vfp.FPST)); \ + FLOATTYPE ## _compare_quiet(a, b, &env->vfp.fp_status[FPST])); \ } \ void VFP_HELPER(cmpe, P)(ARGTYPE a, ARGTYPE b, CPUARMState *env) \ { \ softfloat_to_vfp_compare(env, \ - FLOATTYPE ## _compare(a, b, &env->vfp.FPST)); \ + FLOATTYPE ## _compare(a, b, &env->vfp.fp_status[FPST])); \ } -DO_VFP_cmp(h, float16, dh_ctype_f16, fp_status[FPST_A32_F16]) -DO_VFP_cmp(s, float32, float32, fp_status[FPST_A32]) -DO_VFP_cmp(d, float64, float64, fp_status[FPST_A32]) +DO_VFP_cmp(h, float16, dh_ctype_f16, FPST_A32_F16) +DO_VFP_cmp(s, float32, float32, FPST_A32) +DO_VFP_cmp(d, float64, float64, FPST_A32) #undef DO_VFP_cmp /* Integer to float and float to integer conversions */