Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5afa7e9 authored by Maciej W. Rozycki's avatar Maciej W. Rozycki Committed by Ralf Baechle
Browse files

MIPS: math-emu: Reinstate sNaN quieting handlers 



Revert the changes made by commit fdffbafb [Lots of FPU bug fixes from
Kjeld Borch Egevang.] to `ieee754sp_nanxcpt' and `ieee754dp_nanxcpt'
sNaN quieting handlers and their callers so that sNaN processing is done
within the handlers againg.  Pass the sNaN causing an IEEE 754 invalid
operation exception down to the relevant handler.  Pass the sNaN in `fs'
where two sNaNs are supplied to a binary operation.

Set the Invalid Operation FCSR exception bits in the quieting handlers
rather than at their call sites throughout.  Make the handlers exclusive
for sNaN processing.

Signed-off-by: default avatarMaciej W. Rozycki <macro@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/9688/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 539bfb57

arch/mips/math-emu/dp_add.c

+5 −4
Original line number Diff line number Diff line
@@ -37,19 +37,20 @@ union ieee754dp ieee754dp_add(union ieee754dp x, union ieee754dp y) 
	FLUSHYDP;



	switch (CLPAIR(xc, yc)) {

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_SNAN):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_SNAN):

	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_SNAN):

	case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_SNAN):

	case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_SNAN):

	case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_SNAN):

		return ieee754dp_nanxcpt(y);



	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_SNAN):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_ZERO):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_NORM):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_DNORM):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):

		ieee754_setcx(IEEE754_INVALID_OPERATION);

		return ieee754dp_nanxcpt(ieee754dp_indef());

		return ieee754dp_nanxcpt(x);



	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):

arch/mips/math-emu/dp_div.c

+5 −4
Original line number Diff line number Diff line
@@ -39,19 +39,20 @@ union ieee754dp ieee754dp_div(union ieee754dp x, union ieee754dp y) 
	FLUSHYDP;



	switch (CLPAIR(xc, yc)) {

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_SNAN):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_SNAN):

	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_SNAN):

	case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_SNAN):

	case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_SNAN):

	case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_SNAN):

		return ieee754dp_nanxcpt(y);



	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_SNAN):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_ZERO):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_NORM):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_DNORM):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):

		ieee754_setcx(IEEE754_INVALID_OPERATION);

		return ieee754dp_nanxcpt(ieee754dp_indef());

		return ieee754dp_nanxcpt(x);



	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):

arch/mips/math-emu/dp_fsp.c

+1 −2
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ union ieee754dp ieee754dp_fsp(union ieee754sp x) 


	switch (xc) {

	case IEEE754_CLASS_SNAN:

		ieee754_setcx(IEEE754_INVALID_OPERATION);

		return ieee754dp_nanxcpt(ieee754dp_indef());

		return ieee754dp_nanxcpt(ieee754dp_nan_fsp(xs, xm));



	case IEEE754_CLASS_QNAN:

		return ieee754dp_nan_fsp(xs, xm);

arch/mips/math-emu/dp_mul.c

+5 −4
Original line number Diff line number Diff line
@@ -47,19 +47,20 @@ union ieee754dp ieee754dp_mul(union ieee754dp x, union ieee754dp y) 
	FLUSHYDP;



	switch (CLPAIR(xc, yc)) {

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_QNAN, IEEE754_CLASS_SNAN):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_SNAN):

	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_SNAN):

	case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_SNAN):

	case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_SNAN):

	case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_SNAN):

		return ieee754dp_nanxcpt(y);



	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_SNAN):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_ZERO):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_NORM):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_DNORM):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):

		ieee754_setcx(IEEE754_INVALID_OPERATION);

		return ieee754dp_nanxcpt(ieee754dp_indef());

		return ieee754dp_nanxcpt(x);



	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):

arch/mips/math-emu/dp_sqrt.c

+3 −4
Original line number Diff line number Diff line
@@ -42,14 +42,13 @@ union ieee754dp ieee754dp_sqrt(union ieee754dp x) 


	/* x == INF or NAN? */

	switch (xc) {

	case IEEE754_CLASS_SNAN:

		return ieee754dp_nanxcpt(x);



	case IEEE754_CLASS_QNAN:

		/* sqrt(Nan) = Nan */

		return x;



	case IEEE754_CLASS_SNAN:

		ieee754_setcx(IEEE754_INVALID_OPERATION);

		return ieee754dp_nanxcpt(ieee754dp_indef());



	case IEEE754_CLASS_ZERO:

		/* sqrt(0) = 0 */

		return x;