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

Commit 90efba36 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

MIPS: math-emu: Get rid of the useless parts of exception handling. 



All it really did was throw a printk for no obvious reason.

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

arch/mips/math-emu/Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -2,8 +2,8 @@ 
# Makefile for the Linux/MIPS kernel FPU emulation.

# Makefile for the Linux/MIPS kernel FPU emulation.

#

#





obj-y	+= cp1emu.o ieee754dp.o ieee754sp.o ieee754.o ieee754xcpt.o dp_div.o \

obj-y	+= cp1emu.o ieee754dp.o ieee754sp.o ieee754.o dp_div.o dp_mul.o \

	   dp_mul.o dp_sub.o dp_add.o dp_fsp.o dp_cmp.o dp_simple.o dp_tint.o \

	   dp_sub.o dp_add.o dp_fsp.o dp_cmp.o dp_simple.o dp_tint.o \

	   dp_fint.o dp_tlong.o dp_flong.o sp_div.o sp_mul.o sp_sub.o \

	   dp_fint.o dp_tlong.o dp_flong.o sp_div.o sp_mul.o sp_sub.o \

	   sp_add.o sp_fdp.o sp_cmp.o sp_simple.o sp_tint.o sp_fint.o \

	   sp_add.o sp_fdp.o sp_cmp.o sp_simple.o sp_tint.o sp_fint.o \

	   sp_tlong.o sp_flong.o kernel_linkage.o dsemul.o

	   sp_tlong.o sp_flong.o kernel_linkage.o dsemul.o

arch/mips/math-emu/dp_add.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ union ieee754dp ieee754dp_add(union ieee754dp x, union ieee754dp y) 
	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_DNORM):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_DNORM):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):

		ieee754_setcx(IEEE754_INVALID_OPERATION);

		ieee754_setcx(IEEE754_INVALID_OPERATION);

		return ieee754dp_nanxcpt(ieee754dp_indef(), "add", x, y);

		return ieee754dp_nanxcpt(ieee754dp_indef());





	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):
@@ -76,7 +76,7 @@ union ieee754dp ieee754dp_add(union ieee754dp x, union ieee754dp y) 
		if (xs == ys)

		if (xs == ys)

			return x;

			return x;

		ieee754_setcx(IEEE754_INVALID_OPERATION);

		ieee754_setcx(IEEE754_INVALID_OPERATION);

		return ieee754dp_xcpt(ieee754dp_indef(), "add", x, y);

		return ieee754dp_indef();





	case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_INF):

	case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_INF):

	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_INF):

	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_INF):
@@ -178,5 +178,6 @@ union ieee754dp ieee754dp_add(union ieee754dp x, union ieee754dp y) 
		}

		}





	}

	}

	DPNORMRET2(xs, xe, xm, "add", x, y);



	return ieee754dp_format(xs, xe, xm);

}
 
}

arch/mips/math-emu/dp_cmp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ int ieee754dp_cmp(union ieee754dp x, union ieee754dp y, int cmp, int sig) 
			return 1;

			return 1;

		if (cmp & (IEEE754_CLT | IEEE754_CGT)) {

		if (cmp & (IEEE754_CLT | IEEE754_CGT)) {

			if (sig && ieee754_setandtestcx(IEEE754_INVALID_OPERATION))

			if (sig && ieee754_setandtestcx(IEEE754_INVALID_OPERATION))

				return ieee754di_xcpt(0, "fcmpf", x);

				return 0;

		}

		}

		return 0;

		return 0;

	} else {

	} else {

arch/mips/math-emu/dp_div.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -52,7 +52,7 @@ union ieee754dp ieee754dp_div(union ieee754dp x, union ieee754dp y) 
	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_DNORM):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_DNORM):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):

	case CLPAIR(IEEE754_CLASS_SNAN, IEEE754_CLASS_INF):

		ieee754_setcx(IEEE754_INVALID_OPERATION);

		ieee754_setcx(IEEE754_INVALID_OPERATION);

		return ieee754dp_nanxcpt(ieee754dp_indef(), "div", x, y);

		return ieee754dp_nanxcpt(ieee754dp_indef());





	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):

	case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_QNAN):
@@ -73,7 +73,7 @@ union ieee754dp ieee754dp_div(union ieee754dp x, union ieee754dp y) 




	case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF):

	case CLPAIR(IEEE754_CLASS_INF, IEEE754_CLASS_INF):

		ieee754_setcx(IEEE754_INVALID_OPERATION);

		ieee754_setcx(IEEE754_INVALID_OPERATION);

		return ieee754dp_xcpt(ieee754dp_indef(), "div", x, y);

		return ieee754dp_indef();





	case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_INF):

	case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_INF):

	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_INF):

	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_INF):
@@ -90,12 +90,12 @@ union ieee754dp ieee754dp_div(union ieee754dp x, union ieee754dp y) 




	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO):

	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_ZERO):

		ieee754_setcx(IEEE754_INVALID_OPERATION);

		ieee754_setcx(IEEE754_INVALID_OPERATION);

		return ieee754dp_xcpt(ieee754dp_indef(), "div", x, y);

		return ieee754dp_indef();





	case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_ZERO):

	case CLPAIR(IEEE754_CLASS_NORM, IEEE754_CLASS_ZERO):

	case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_ZERO):

	case CLPAIR(IEEE754_CLASS_DNORM, IEEE754_CLASS_ZERO):

		ieee754_setcx(IEEE754_ZERO_DIVIDE);

		ieee754_setcx(IEEE754_ZERO_DIVIDE);

		return ieee754dp_xcpt(ieee754dp_inf(xs ^ ys), "div", x, y);

		return ieee754dp_inf(xs ^ ys);





	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_NORM):

	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_NORM):

	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_DNORM):

	case CLPAIR(IEEE754_CLASS_ZERO, IEEE754_CLASS_DNORM):
@@ -151,6 +151,6 @@ union ieee754dp ieee754dp_div(union ieee754dp x, union ieee754dp y) 
			re--;

			re--;

		}

		}





		DPNORMRET2(xs == ys ? 0 : 1, re, rm, "div", x, y);

		return ieee754dp_format(xs == ys ? 0 : 1, re, rm);

	}

	}

}
 
}

arch/mips/math-emu/dp_flong.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -65,5 +65,6 @@ union ieee754dp ieee754dp_flong(s64 x) 
			xe--;

			xe--;

		}

		}

	}

	}

	DPNORMRET1(xs, xe, xm, "dp_flong", x);



	return ieee754dp_format(xs, xe, xm);

}
 
}