MIPS: math-emu: <MAXA|MINA>.<D|S>: Fix cases of input values with opposite signs

Fix the value returned by <MAXA|MINA>.<D|S>, if the inputs are normal
fp numbers of the same absolute value, but opposite signs.

A relevant example:

MAXA.S fd,fs,ft:
  If fs contains -3.0, and ft contains +3.0, fd is going to contain
  +3.0 (without this patch, it used to contain -3.0).

Fixes: a79f5f9ba508 ("MIPS: math-emu: Add support for the MIPS R6 MAX{, A} FPU instruction")
Fixes: 4e9561b20e2f ("MIPS: math-emu: Add support for the MIPS R6 MIN{, A} FPU instruction")
Signed-off-by: Miodrag Dinic <miodrag.dinic@imgtec.com>
Signed-off-by: Goran Ferenc <goran.ferenc@imgtec.com>
Signed-off-by: Aleksandar Markovic <aleksandar.markovic@imgtec.com>
Reviewed-by: James Hogan <james.hogan@imgtec.com>
Cc: Bo Hu <bohu@google.com>
Cc: Douglas Leung <douglas.leung@imgtec.com>
Cc: Jin Qian <jinqian@google.com>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Petar Jovanovic <petar.jovanovic@imgtec.com>
Cc: Raghu Gandham <raghu.gandham@imgtec.com>
Cc: <stable@vger.kernel.org> # 4.3+
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/16883/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/math-emu/dp_fmax.c b/arch/mips/math-emu/dp_fmax.c
index 0b53c786110161203b85e5abedd6cc39937fc529..81d12bfa6d5eb28c512d5b203913d4a08c98781f 100644 (file)
--- a/arch/mips/math-emu/dp_fmax.c
+++ b/arch/mips/math-emu/dp_fmax.c
@@ -243,7 +243,11 @@ union ieee754dp ieee754dp_fmaxa(union ieee754dp x, union ieee754dp y)
                return y;
 
        /* Compare mantissa */
-       if (xm <= ym)
+       if (xm < ym)
                return y;
-       return x;
+       else if (xm > ym)
+               return x;
+       else if (xs == 0)
+               return x;
+       return y;
 }

diff --git a/arch/mips/math-emu/dp_fmin.c b/arch/mips/math-emu/dp_fmin.c
index 099e6bd553532490fff63d76513a36794376ee9a..4574f04b44cede3387f04624252326b3759cc4ab 100644 (file)
--- a/arch/mips/math-emu/dp_fmin.c
+++ b/arch/mips/math-emu/dp_fmin.c
@@ -243,7 +243,11 @@ union ieee754dp ieee754dp_fmina(union ieee754dp x, union ieee754dp y)
                return x;
 
        /* Compare mantissa */
-       if (xm <= ym)
+       if (xm < ym)
+               return x;
+       else if (xm > ym)
+               return y;
+       else if (xs == 1)
                return x;
        return y;
 }

diff --git a/arch/mips/math-emu/sp_fmax.c b/arch/mips/math-emu/sp_fmax.c
index 7efa7729bd851852882f5a9d57bb615532bf4829..fb41497621017ae5361fe81a308b5a7a6cb80fc4 100644 (file)
--- a/arch/mips/math-emu/sp_fmax.c
+++ b/arch/mips/math-emu/sp_fmax.c
@@ -243,7 +243,11 @@ union ieee754sp ieee754sp_fmaxa(union ieee754sp x, union ieee754sp y)
                return y;
 
        /* Compare mantissa */
-       if (xm <= ym)
+       if (xm < ym)
                return y;
-       return x;
+       else if (xm > ym)
+               return x;
+       else if (xs == 0)
+               return x;
+       return y;
 }

diff --git a/arch/mips/math-emu/sp_fmin.c b/arch/mips/math-emu/sp_fmin.c
index e2c554359f7b8d8d2849bef4e6be52dfe9dea656..7915b9430f68895ad9b57156e4442c1ea6b42c30 100644 (file)
--- a/arch/mips/math-emu/sp_fmin.c
+++ b/arch/mips/math-emu/sp_fmin.c
@@ -243,7 +243,11 @@ union ieee754sp ieee754sp_fmina(union ieee754sp x, union ieee754sp y)
                return x;
 
        /* Compare mantissa */
-       if (xm <= ym)
+       if (xm < ym)
+               return x;
+       else if (xm > ym)
+               return y;
+       else if (xs == 1)
                return x;
        return y;
 }