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

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

diff --git a/riscv/insns/fmax_d.h b/riscv/insns/fmax_d.h
index f0bea9bb2dbf679729f359a7af99fd9ff0b5a11c..56c9c7a4e54a85c65e094d3146b8b490857aabbe 100644 (file)
--- a/riscv/insns/fmax_d.h
+++ b/riscv/insns/fmax_d.h
@@ -1,4 +1,6 @@
 require_extension('D');
 require_fp;
-WRITE_FRD(isNaNF64UI(FRS2) || f64_le_quiet(f64(FRS2), f64(FRS1)) ? FRS1 : FRS2);
+WRITE_FRD(f64_le_quiet(f64(FRS2), f64(FRS1)) || isNaNF64UI(FRS2) ? FRS1 : FRS2);
+if ((isNaNF64UI(FRS1) && isNaNF64UI(FRS2)) || softfloat_exceptionFlags)
+  WRITE_FRD(defaultNaNF64UI);
 set_fp_exceptions;