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

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

diff --git a/riscv/insns/fmin_d.h b/riscv/insns/fmin_d.h
index 02ea6810d34f64063f8e9cac94e74af152839807..2a1755e30eb6db78cc1a43cb91e3796344545a82 100644 (file)
--- a/riscv/insns/fmin_d.h
+++ b/riscv/insns/fmin_d.h
@@ -1,5 +1,6 @@
 require_extension('D');
 require_fp;
-WRITE_FRD(isNaNF64UI(FRS2) || f64_lt_quiet(FRS1,FRS2) /* && FRS1 not NaN */
-      ? FRS1 : FRS2);
+WRITE_FRD(f64_lt_quiet(f64(FRS1), f64(FRS2)) || isNaNF64UI(FRS2) ? FRS1 : FRS2);
+if ((isNaNF64UI(FRS1) && isNaNF64UI(FRS2)) || softfloat_exceptionFlags)
+  WRITE_FRD(defaultNaNF64UI);
 set_fp_exceptions;