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
commit49866dcb59a28325c99c08745ed8e7c81828ed06 (patch)
tree3380e544d790198668bdd9137a461f492ee2f986
parentb07039a03e0261105e2de45eb077ede18b3e49b5 (diff)
downloadqemu-49866dcb59a28325c99c08745ed8e7c81828ed06.zip
qemu-49866dcb59a28325c99c08745ed8e7c81828ed06.tar.gz
qemu-49866dcb59a28325c99c08745ed8e7c81828ed06.tar.bz2
target/sparc: Set Float3NaNPropRule explicitly
Set the Float3NaNPropRule explicitly for SPARC, 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-22-peter.maydell@linaro.org
-rw-r--r--fpu/softfloat-specialize.c.inc2
-rw-r--r--target/sparc/cpu.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/fpu/softfloat-specialize.c.inc b/fpu/softfloat-specialize.c.inc
index 8a36280..c4d8d08 100644
--- a/fpu/softfloat-specialize.c.inc
+++ b/fpu/softfloat-specialize.c.inc
@@ -511,8 +511,6 @@ static int pickNaNMulAdd(FloatClass a_cls, FloatClass b_cls, FloatClass c_cls,
} else {
rule = float_3nan_prop_s_cab;
}
-#elif defined(TARGET_SPARC)
- rule = float_3nan_prop_s_cba;
#elif defined(TARGET_XTENSA)
if (status->use_first_nan) {
rule = float_3nan_prop_abc;
diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c
index 61f2d3f..0f2997a 100644
--- a/target/sparc/cpu.c
+++ b/target/sparc/cpu.c
@@ -814,6 +814,8 @@ static void sparc_cpu_realizefn(DeviceState *dev, Error **errp)
* the CPU state struct so it won't get zeroed on reset.
*/
set_float_2nan_prop_rule(float_2nan_prop_s_ba, &env->fp_status);
+ /* For fused-multiply add, prefer SNaN over QNaN, then C->B->A */
+ set_float_3nan_prop_rule(float_3nan_prop_s_cba, &env->fp_status);
/* For inf * 0 + NaN, return the input NaN */
set_float_infzeronan_rule(float_infzeronan_dnan_never, &env->fp_status);