From 9ff062a5db6fb8ab55399b05582b47bac2a7fae2 Mon Sep 17 00:00:00 2001
From: James Clarke <jrtc27@jrtc27.com>
Date: Thu, 2 Jan 2020 01:12:51 +0000
Subject: [PATCH] Fix FMIN/FMAX ISA test failures

FMIN(sNaN, x), where x is not NaN, should behave like FMIN(qNaN, x) and
yield x rather than the canonical NaN. The only difference is that the
invalid operation flag should still be set despite not yielding NaN. The
same applies to FMAX.
---
 src_Core/RISCY_OOO/procs/lib/Fpu.bsv | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src_Core/RISCY_OOO/procs/lib/Fpu.bsv b/src_Core/RISCY_OOO/procs/lib/Fpu.bsv
index 4e70596..b413daa 100644
--- a/src_Core/RISCY_OOO/procs/lib/Fpu.bsv
+++ b/src_Core/RISCY_OOO/procs/lib/Fpu.bsv
@@ -186,8 +186,8 @@ function Tuple2#(Bit#(64), FpuException) fmin_s(Bit#(64) in1, Bit#(64) in2);
     // as the fmin and fmax are quiet comparison
     if (isSNaN(in1_f) || isSNaN(in2_f)) begin
         e.invalid_op = True;
-        return tuple2(fv_nanbox (zeroExtend(pack(nan_f))), e);
-    end else if (isNaN(in1_f) && isNaN(in2_f)) begin
+    end
+    if (isNaN(in1_f) && isNaN(in2_f)) begin
         return tuple2(fv_nanbox (zeroExtend(pack(nan_f))), e);
     end else if (isNaN(in2_f)) begin
         return tuple2(in1_f_packed, e);
@@ -216,8 +216,8 @@ function Tuple2#(Bit#(64), FpuException) fmin_d(Bit#(64) in1, Bit#(64) in2);
     // as the fmin and fmax are quiet comparison
     if (isSNaN(in1_f) || isSNaN(in2_f)) begin
         e.invalid_op = True;
-        return tuple2(pack(nan_f), e);
-    end else if (isNaN(in1_f) && isNaN(in2_f)) begin
+    end
+    if (isNaN(in1_f) && isNaN(in2_f)) begin
         return tuple2(zeroExtend(pack(nan_f)), e);
     end else if (isNaN(in2_f)) begin
         return tuple2(in1, e);
@@ -254,8 +254,8 @@ function Tuple2#(Bit#(64), FpuException) fmax_s(Bit#(64) in1, Bit#(64) in2);
     // as the fmin and fmax are quiet comparison
     if (isSNaN(in1_f) || isSNaN(in2_f)) begin
         e.invalid_op = True;
-        return tuple2(fv_nanbox (zeroExtend(pack(nan_f))), e);
-    end else if (isNaN(in1_f) && isNaN(in2_f)) begin
+    end
+    if (isNaN(in1_f) && isNaN(in2_f)) begin
         return tuple2(fv_nanbox (zeroExtend(pack(nan_f))), e);
     end else if (isNaN(in2_f)) begin
         return tuple2(in1_f_packed, e);
@@ -284,8 +284,8 @@ function Tuple2#(Bit#(64), FpuException) fmax_d(Bit#(64) in1, Bit#(64) in2);
     // as the fmin and fmax are quiet comparison
     if (isSNaN(in1_f) || isSNaN(in2_f)) begin
         e.invalid_op = True;
-        return tuple2(pack(nan_f), e);
-    end else if (isNaN(in1_f) && isNaN(in2_f)) begin
+    end
+    if (isNaN(in1_f) && isNaN(in2_f)) begin
         return tuple2(zeroExtend(pack(nan_f)), e);
     end else if (isNaN(in2_f)) begin
         return tuple2(in1, e);