target/xtensa: Set Float3NaNPropRule explicitly

Set the Float3NaNPropRule explicitly for xtensa, and remove the
ifdef from pickNaNMulAdd().

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20241202131347.498124-24-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2024-12-11 15:30:58 +00:00
parent 3a45371291
commit 8e6915645e
2 changed files with 2 additions and 8 deletions

View File

@ -505,15 +505,7 @@ static int pickNaNMulAdd(FloatClass a_cls, FloatClass b_cls, FloatClass c_cls,
} }
if (rule == float_3nan_prop_none) { if (rule == float_3nan_prop_none) {
#if defined(TARGET_XTENSA)
if (status->use_first_nan) {
rule = float_3nan_prop_abc;
} else {
rule = float_3nan_prop_cba;
}
#else
rule = float_3nan_prop_abc; rule = float_3nan_prop_abc;
#endif
} }
assert(rule != float_3nan_prop_none); assert(rule != float_3nan_prop_none);

View File

@ -62,6 +62,8 @@ void xtensa_use_first_nan(CPUXtensaState *env, bool use_first)
set_use_first_nan(use_first, &env->fp_status); set_use_first_nan(use_first, &env->fp_status);
set_float_2nan_prop_rule(use_first ? float_2nan_prop_ab : float_2nan_prop_ba, set_float_2nan_prop_rule(use_first ? float_2nan_prop_ab : float_2nan_prop_ba,
&env->fp_status); &env->fp_status);
set_float_3nan_prop_rule(use_first ? float_3nan_prop_abc : float_3nan_prop_cba,
&env->fp_status);
} }
void HELPER(wur_fpu2k_fcr)(CPUXtensaState *env, uint32_t v) void HELPER(wur_fpu2k_fcr)(CPUXtensaState *env, uint32_t v)