OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

RISC-V: fmax/fmin: Handle signalling NaNs correctly. 

RISC-V's fmax(sNAN,4) returns 4 but glibc expects it to return qNAN.

	* sysdeps/riscv/rvd/s_fmax.c (__fmax): Handle sNaNs correctly.
	* sysdeps/riscv/rvd/s_fmin.c (__fmin): Likewise.
	* sysdeps/riscv/rvf/s_fmaxf.c (__fmaxf): Likewise.
	* sysdeps/riscv/rvf/s_fminf.c (__fminf): Likewise.
This commit is contained in:
Andrew Waterman 2018-02-22 14:31:54 -05:00 committed by DJ Delorie
parent 8090720a87
commit fdcc625376
5 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2018-02-22 Andrew Waterman <andrew@sifive.com>
* sysdeps/riscv/rvd/s_fmax.c (__fmax): Handle sNaNs correctly.
* sysdeps/riscv/rvd/s_fmin.c (__fmin): Likewise.
* sysdeps/riscv/rvf/s_fmaxf.c (__fmaxf): Likewise.
* sysdeps/riscv/rvf/s_fminf.c (__fminf): Likewise.
2018-02-22 DJ Delorie <dj@delorie.com>
* sysdeps/riscv/tls-macros.h: Do not initialize $gp.

11
sysdeps/riscv/rvd/s_fmax.c
View File

@ -17,12 +17,19 @@
<http://www.gnu.org/licenses/>. */
#include <math.h>
#include <math_private.h>
#include <libm-alias-double.h>
double
__fmax (double x, double y)
{
asm ("fmax.d %0, %1, %2" : "=f" (x) : "f" (x), "f" (y));
return x;
double res;
if (__glibc_unlikely ((_FCLASS (x) | _FCLASS (y)) & _FCLASS_SNAN))
return x + y;
else
asm ("fmax.d %0, %1, %2" : "=f" (res) : "f" (x), "f" (y));
return res;
}
libm_alias_double (__fmax, fmax)

11
sysdeps/riscv/rvd/s_fmin.c
View File

@ -17,12 +17,19 @@
<http://www.gnu.org/licenses/>. */
#include <math.h>
#include <math_private.h>
#include <libm-alias-double.h>
double
__fmin (double x, double y)
{
asm ("fmin.d %0, %1, %2" : "=f" (x) : "f" (x), "f" (y));
return x;
double res;
if (__glibc_unlikely ((_FCLASS (x) | _FCLASS (y)) & _FCLASS_SNAN))
return x + y;
else
asm ("fmin.d %0, %1, %2" : "=f" (res) : "f" (x), "f" (y));
return res;
}
libm_alias_double (__fmin, fmin)

11
sysdeps/riscv/rvf/s_fmaxf.c
View File

@ -17,12 +17,19 @@
<http://www.gnu.org/licenses/>. */
#include <math.h>
#include <math_private.h>
#include <libm-alias-float.h>
float
__fmaxf (float x, float y)
{
asm ("fmax.s %0, %1, %2" : "=f" (x) : "f" (x), "f" (y));
return x;
float res;
if (__glibc_unlikely ((_FCLASS (x) | _FCLASS (y)) & _FCLASS_SNAN))
return x + y;
else
asm ("fmax.s %0, %1, %2" : "=f" (res) : "f" (x), "f" (y));
return res;
}
libm_alias_float (__fmax, fmax)

11
sysdeps/riscv/rvf/s_fminf.c
View File

@ -17,12 +17,19 @@
<http://www.gnu.org/licenses/>. */
#include <math.h>
#include <math_private.h>
#include <libm-alias-float.h>
float
__fminf (float x, float y)
{
asm ("fmin.s %0, %1, %2" : "=f" (x) : "f" (x), "f" (y));
return x;
float res;
if (__glibc_unlikely ((_FCLASS (x) | _FCLASS (y)) & _FCLASS_SNAN))
return x + y;
else
asm ("fmin.s %0, %1, %2" : "=f" (res) : "f" (x), "f" (y));
return res;
}
libm_alias_float (__fmin, fmin)