diff options
| author | Andrew Waterman <andrew@sifive.com> | 2018-02-22 14:31:54 -0500 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2018-02-22 14:31:54 -0500 |
| commit | fdcc625376505eacb1125a6aeba57501407a30ec (patch) | |
| tree | 1989bd343846d9a14b1921ca9bcbe6930892ba6a /sysdeps/riscv/rvf | |
| parent | 8090720a87e42fddc31396f6126112d4b8014d8e (diff) | |
| download | glibc-fdcc625376505eacb1125a6aeba57501407a30ec.tar glibc-fdcc625376505eacb1125a6aeba57501407a30ec.tar.gz glibc-fdcc625376505eacb1125a6aeba57501407a30ec.tar.bz2 glibc-fdcc625376505eacb1125a6aeba57501407a30ec.zip | |
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.
Diffstat (limited to 'sysdeps/riscv/rvf')
| -rw-r--r-- | sysdeps/riscv/rvf/s_fmaxf.c | 11 | ||||
| -rw-r--r-- | sysdeps/riscv/rvf/s_fminf.c | 11 |
2 files changed, 18 insertions, 4 deletions
diff --git a/sysdeps/riscv/rvf/s_fmaxf.c b/sysdeps/riscv/rvf/s_fmaxf.c index 3293f2f41c..63f7e3d664 100644 --- a/sysdeps/riscv/rvf/s_fmaxf.c +++ b/sysdeps/riscv/rvf/s_fmaxf.c @@ -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) diff --git a/sysdeps/riscv/rvf/s_fminf.c b/sysdeps/riscv/rvf/s_fminf.c index e4411f04b2..82cca4e37d 100644 --- a/sysdeps/riscv/rvf/s_fminf.c +++ b/sysdeps/riscv/rvf/s_fminf.c @@ -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) |