diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2024-11-05 10:09:54 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2024-11-05 10:09:54 +0000 |
| commit | 841f9d74751f8615dbc6215504db7abbc0ebff5e (patch) | |
| tree | 6dec1516611b5cf9060f811b23bd408e77727d25 | |
| parent | 2915876e035088d516d88394028903064072543e (diff) | |
| download | qemu-841f9d74751f8615dbc6215504db7abbc0ebff5e.zip qemu-841f9d74751f8615dbc6215504db7abbc0ebff5e.tar.gz qemu-841f9d74751f8615dbc6215504db7abbc0ebff5e.tar.bz2 | |
target/s390x: Explicitly set 2-NaN propagation rule
Set the 2-NaN propagation rule explicitly in env->fpu_status.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20241025141254.2141506-8-peter.maydell@linaro.org
| -rw-r--r-- | fpu/softfloat-specialize.c.inc | 5 | ||||
| -rw-r--r-- | target/s390x/cpu.c | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fpu/softfloat-specialize.c.inc b/fpu/softfloat-specialize.c.inc index 4e51cf8..a0c740e 100644 --- a/fpu/softfloat-specialize.c.inc +++ b/fpu/softfloat-specialize.c.inc @@ -403,10 +403,9 @@ static int pickNaN(FloatClass a_cls, FloatClass b_cls, #if defined(TARGET_AVR) || defined(TARGET_HEXAGON) \ || defined(TARGET_RISCV) || defined(TARGET_SH4) \ || defined(TARGET_TRICORE) || defined(TARGET_ARM) || defined(TARGET_MIPS) \ - || defined(TARGET_LOONGARCH64) || defined(TARGET_HPPA) + || defined(TARGET_LOONGARCH64) || defined(TARGET_HPPA) \ + || defined(TARGET_S390X) g_assert_not_reached(); -#elif defined(TARGET_S390X) - rule = float_2nan_prop_s_ab; #elif defined(TARGET_PPC) || defined(TARGET_M68K) /* * PowerPC propagation rules: diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 4e41a3d..514c70f 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -205,6 +205,7 @@ static void s390_cpu_reset_hold(Object *obj, ResetType type) /* tininess for underflow is detected before rounding */ set_float_detect_tininess(float_tininess_before_rounding, &env->fpu_status); + set_float_2nan_prop_rule(float_2nan_prop_s_ab, &env->fpu_status); /* fall through */ case RESET_TYPE_S390_CPU_NORMAL: env->psw.mask &= ~PSW_MASK_RI; |