Skip to content

Commit 9354f4d

Browse files
aleksandar-markovicgregkh
authored andcommitted
MIPS: math-emu: MINA.<D|S>: Fix some cases of infinity and zero inputs
commit 304bfe473e70523e591fb1c9223289d355e0bdcb upstream. Fix following special cases for MINA>.<D|S>: - if one of the inputs is zero, and the other is subnormal, normal, or infinity, the value of the former should be returned (that is, a zero). - if one of the inputs is infinity, and the other input is normal, or subnormal, the value of the latter should be returned. The previous implementation's logic for such cases was incorrect - it appears as if it implements MAXA, and not MINA instruction. A relevant example: MINA.S fd,fs,ft: If fs contains 100.0, and ft contains 0.0, fd is going to contain 0.0 (without this patch, it used to contain 100.0). Fixes: a79f5f9 ("MIPS: math-emu: Add support for the MIPS R6 MAX{, A} FPU instruction") Fixes: 4e9561b ("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: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/16885/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent f4d77fc commit 9354f4d

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

arch/mips/math-emu/dp_fmin.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,14 +210,14 @@ union ieee754dp ieee754dp_fmina(union ieee754dp x, union ieee754dp y)
210210
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM):
211211
case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_ZERO):
212212
case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_ZERO):
213-
return x;
213+
return y;
214214

215215
case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_INF):
216216
case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_INF):
217217
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_INF):
218218
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_NORM):
219219
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_DNORM):
220-
return y;
220+
return x;
221221

222222
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO):
223223
return ieee754dp_zero(xs | ys);

arch/mips/math-emu/sp_fmin.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,14 +210,14 @@ union ieee754sp ieee754sp_fmina(union ieee754sp x, union ieee754sp y)
210210
case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_DNORM):
211211
case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_ZERO):
212212
case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_ZERO):
213-
return x;
213+
return y;
214214

215215
case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_INF):
216216
case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_INF):
217217
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_INF):
218218
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_NORM):
219219
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_DNORM):
220-
return y;
220+
return x;
221221

222222
case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO):
223223
return ieee754sp_zero(xs | ys);

0 commit comments

Comments
 (0)