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

Commit d2b6fcb0 authored by Aleksandar Markovic's avatar Aleksandar Markovic Committed by Greg Kroah-Hartman
Browse files

MIPS: math-emu: <MAX|MIN>.<D|S>: Fix cases of both inputs negative 



commit aabf5cf02e22ebc4e541adf835910f388b6c3e65 upstream.

Fix the value returned by <MAX|MIN>.<D|S>, if both inputs are negative
normal fp numbers. The previous logic did not take into account that
if both inputs have the same sign, there should be separate treatment
of the cases when both inputs are negative and when both inputs are
positive.

A relevant example:

MAX.S fd,fs,ft:
  If fs contains -5.0, and ft contains -7.0, fd is going to contain
  -5.0 (without this patch, it used to contain -7.0).

Fixes: a79f5f9b ("MIPS: math-emu: Add support for the MIPS R6 MAX{, A} FPU instruction")
Fixes: 4e9561b2 ("MIPS: math-emu: Add support for the MIPS R6 MIN{, A} FPU instruction")

Signed-off-by: default avatarMiodrag Dinic <miodrag.dinic@imgtec.com>
Signed-off-by: default avatarGoran Ferenc <goran.ferenc@imgtec.com>
Signed-off-by: default avatarAleksandar Markovic <aleksandar.markovic@imgtec.com>
Reviewed-by: default avatarJames 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/16882/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 694f6ea0

arch/mips/math-emu/dp_fmax.c

+24 −8
Original line number Original line Diff line number Diff line
@@ -116,17 +116,33 @@ union ieee754dp ieee754dp_fmax(union ieee754dp x, union ieee754dp y) 
	else if (xs < ys)

	else if (xs < ys)

		return x;

		return x;





	/* Compare exponent */

	/* Signs of inputs are equal, let's compare exponents */

	if (xs == 0) {

		/* Inputs are both positive */

		if (xe > ye)

		if (xe > ye)

			return x;

			return x;

		else if (xe < ye)

		else if (xe < ye)

			return y;

			return y;

	} else {

		/* Inputs are both negative */

		if (xe > ye)

			return y;

		else if (xe < ye)

			return x;

	}





	/* Compare mantissa */

	/* Signs and exponents of inputs are equal, let's compare mantissas */

	if (xs == 0) {

		/* Inputs are both positive, with equal signs and exponents */

		if (xm <= ym)

		if (xm <= ym)

			return y;

			return y;

		return x;

		return x;

	}

	}

	/* Inputs are both negative, with equal signs and exponents */

	if (xm <= ym)

		return x;

	return y;

}





union ieee754dp ieee754dp_fmaxa(union ieee754dp x, union ieee754dp y)

union ieee754dp ieee754dp_fmaxa(union ieee754dp x, union ieee754dp y)

{

{

arch/mips/math-emu/dp_fmin.c

+24 −8
Original line number Original line Diff line number Diff line
@@ -116,17 +116,33 @@ union ieee754dp ieee754dp_fmin(union ieee754dp x, union ieee754dp y) 
	else if (xs < ys)

	else if (xs < ys)

		return y;

		return y;





	/* Compare exponent */

	/* Signs of inputs are the same, let's compare exponents */

	if (xs == 0) {

		/* Inputs are both positive */

		if (xe > ye)

		if (xe > ye)

			return y;

			return y;

		else if (xe < ye)

		else if (xe < ye)

			return x;

			return x;

	} else {

		/* Inputs are both negative */

		if (xe > ye)

			return x;

		else if (xe < ye)

			return y;

	}





	/* Compare mantissa */

	/* Signs and exponents of inputs are equal, let's compare mantissas */

	if (xs == 0) {

		/* Inputs are both positive, with equal signs and exponents */

		if (xm <= ym)

		if (xm <= ym)

			return x;

			return x;

		return y;

		return y;

	}

	}

	/* Inputs are both negative, with equal signs and exponents */

	if (xm <= ym)

		return y;

	return x;

}





union ieee754dp ieee754dp_fmina(union ieee754dp x, union ieee754dp y)

union ieee754dp ieee754dp_fmina(union ieee754dp x, union ieee754dp y)

{

{

arch/mips/math-emu/sp_fmax.c

+24 −8
Original line number Original line Diff line number Diff line
@@ -116,17 +116,33 @@ union ieee754sp ieee754sp_fmax(union ieee754sp x, union ieee754sp y) 
	else if (xs < ys)

	else if (xs < ys)

		return x;

		return x;





	/* Compare exponent */

	/* Signs of inputs are equal, let's compare exponents */

	if (xs == 0) {

		/* Inputs are both positive */

		if (xe > ye)

		if (xe > ye)

			return x;

			return x;

		else if (xe < ye)

		else if (xe < ye)

			return y;

			return y;

	} else {

		/* Inputs are both negative */

		if (xe > ye)

			return y;

		else if (xe < ye)

			return x;

	}





	/* Compare mantissa */

	/* Signs and exponents of inputs are equal, let's compare mantissas */

	if (xs == 0) {

		/* Inputs are both positive, with equal signs and exponents */

		if (xm <= ym)

		if (xm <= ym)

			return y;

			return y;

		return x;

		return x;

	}

	}

	/* Inputs are both negative, with equal signs and exponents */

	if (xm <= ym)

		return x;

	return y;

}





union ieee754sp ieee754sp_fmaxa(union ieee754sp x, union ieee754sp y)

union ieee754sp ieee754sp_fmaxa(union ieee754sp x, union ieee754sp y)

{

{

arch/mips/math-emu/sp_fmin.c

+24 −8
Original line number Original line Diff line number Diff line
@@ -116,17 +116,33 @@ union ieee754sp ieee754sp_fmin(union ieee754sp x, union ieee754sp y) 
	else if (xs < ys)

	else if (xs < ys)

		return y;

		return y;





	/* Compare exponent */

	/* Signs of inputs are the same, let's compare exponents */

	if (xs == 0) {

		/* Inputs are both positive */

		if (xe > ye)

		if (xe > ye)

			return y;

			return y;

		else if (xe < ye)

		else if (xe < ye)

			return x;

			return x;

	} else {

		/* Inputs are both negative */

		if (xe > ye)

			return x;

		else if (xe < ye)

			return y;

	}





	/* Compare mantissa */

	/* Signs and exponents of inputs are equal, let's compare mantissas */

	if (xs == 0) {

		/* Inputs are both positive, with equal signs and exponents */

		if (xm <= ym)

		if (xm <= ym)

			return x;

			return x;

		return y;

		return y;

	}

	}

	/* Inputs are both negative, with equal signs and exponents */

	if (xm <= ym)

		return y;

	return x;

}





union ieee754sp ieee754sp_fmina(union ieee754sp x, union ieee754sp y)

union ieee754sp ieee754sp_fmina(union ieee754sp x, union ieee754sp y)

{

{