aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2024-12-11 15:30:58 +0000
committerPeter Maydell <peter.maydell@linaro.org>2024-12-11 15:30:58 +0000
commit8e6915645e356a0bc82afd06b4fc5d5c286c9342 (patch)
tree1122dea823cecfa765f791655aa8a062e7a81a38
parent3a45371291af21b9671ac081fae6bec9270c9af7 (diff)
downloadqemu-8e6915645e356a0bc82afd06b4fc5d5c286c9342.zip
qemu-8e6915645e356a0bc82afd06b4fc5d5c286c9342.tar.gz
qemu-8e6915645e356a0bc82afd06b4fc5d5c286c9342.tar.bz2
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
-rw-r--r--fpu/softfloat-specialize.c.inc8
-rw-r--r--target/xtensa/fpu_helper.c2
2 files changed, 2 insertions, 8 deletions
diff --git a/fpu/softfloat-specialize.c.inc b/fpu/softfloat-specialize.c.inc
index 28db409..67428da 100644
--- a/fpu/softfloat-specialize.c.inc
+++ b/fpu/softfloat-specialize.c.inc
@@ -505,15 +505,7 @@ static int pickNaNMulAdd(FloatClass a_cls, FloatClass b_cls, FloatClass c_cls,
}
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;
-#endif
}
assert(rule != float_3nan_prop_none);
diff --git a/target/xtensa/fpu_helper.c b/target/xtensa/fpu_helper.c
index f2d212d..4b1b021 100644
--- a/target/xtensa/fpu_helper.c
+++ b/target/xtensa/fpu_helper.c
@@ -62,6 +62,8 @@ void xtensa_use_first_nan(CPUXtensaState *env, bool use_first)
set_use_first_nan(use_first, &env->fp_status);
set_float_2nan_prop_rule(use_first ? float_2nan_prop_ab : float_2nan_prop_ba,
&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)