For FMIN(sNaN, x) and FMIN(qNaN, qNaN), return canonical NaN

[riscv-isa-sim.git] / riscv / insns / fmax_s.h

diff --git a/riscv/insns/fmax_s.h b/riscv/insns/fmax_s.h
index 215a6d14565410fd347a2350fc7624a156f6470b..bf90356b6748c68b22dfb1f5eb4f2b2e3a64f464 100644 (file)
--- a/riscv/insns/fmax_s.h
+++ b/riscv/insns/fmax_s.h
@@ -1,5 +1,6 @@
 require_extension('F');
 require_fp;
-WRITE_FRD(isNaNF32UI(FRS2) || f32_le_quiet(FRS2,FRS1) /* && FRS1 not NaN */
-      ? FRS1 : FRS2);
+WRITE_FRD(f32_le_quiet(f32(FRS2), f32(FRS1)) || isNaNF32UI(FRS2) ? FRS1 : FRS2);
+if ((isNaNF32UI(FRS1) && isNaNF32UI(FRS2)) || softfloat_exceptionFlags)
+  WRITE_FRD(defaultNaNF32UI);
 set_fp_exceptions;