85422c2acb
nextafter and nexttoward fail to set errno on overflow and underflow. This patch makes them do so in cases that should include all the cases where such errno setting is required by glibc's goals for when to set errno (but not all cases of underflow where the result is nonzero and so glibc's goals do not require errno setting). Tested for x86_64, x86, mips64 and powerpc. [BZ #6799] * math/s_nextafter.c: Include <errno.h>. (__nextafter): Set errno on overflow and underflow. * math/s_nexttowardf.c: Include <errno.h>. (__nexttowardf): Set errno on overflow and underflow. * sysdeps/i386/fpu/s_nextafterl.c: Include <errno.h>. (__nextafterl): Set errno on overflow and underflow. * sysdeps/i386/fpu/s_nexttoward.c: Include <errno.h>. (__nexttoward): Set errno on overflow and underflow. * sysdeps/i386/fpu/s_nexttowardf.c: Include <errno.h>. (__nexttowardf): Set errno on overflow and underflow. * sysdeps/ieee754/flt-32/s_nextafterf.c: Include <errno.h>. (__nextafterf): Set errno on overflow and underflow. * sysdeps/ieee754/ldbl-128/s_nextafterl.c: Include <errno.h>. (__nextafterl): Set errno on overflow and underflow. * sysdeps/ieee754/ldbl-128/s_nexttoward.c: Include <errno.h>. (__nexttoward): Set errno on overflow and underflow. * sysdeps/ieee754/ldbl-128/s_nexttowardf.c: Include <errno.h>. (__nexttowardf): Set errno on overflow and underflow. * sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c: Include <errno.h>. (__nextafterl): Set errno on overflow and underflow. * sysdeps/ieee754/ldbl-128ibm/s_nexttoward.c: Include <errno.h>. (__nexttoward): Set errno on overflow and underflow. * sysdeps/ieee754/ldbl-128ibm/s_nexttowardf.c: Include <errno.h>. (__nexttowardf): Set errno on overflow and underflow. * sysdeps/ieee754/ldbl-96/s_nexttoward.c: Include <errno.h>. (__nexttoward): Set errno on overflow and underflow. * sysdeps/ieee754/ldbl-96/s_nexttowardf.c: Include <errno.h>. (__nexttowardf): Set errno on overflow and underflow. * sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c: Include <errno.h>. (__nldbl_nexttowardf): Set errno on overflow and underflow. * sysdeps/m68k/m680x0/fpu/s_nextafterl.c: Include <errno.h>. (__nextafterl): Set errno on overflow and underflow. * math/libm-test.inc (nextafter_test_data): Do not allow errno setting to be missing on overflow. Add more tests. (nexttoward_test_data): Likewise.
82 lines
2.2 KiB
C
82 lines
2.2 KiB
C
/* Single precision version of nexttoward.c.
|
|
Conversion to IEEE single float by Jakub Jelinek, jj@ultra.linux.cz. */
|
|
/*
|
|
* ====================================================
|
|
* Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
|
|
*
|
|
* Developed at SunPro, a Sun Microsystems, Inc. business.
|
|
* Permission to use, copy, modify, and distribute this
|
|
* software is freely granted, provided that this notice
|
|
* is preserved.
|
|
* ====================================================
|
|
*/
|
|
|
|
/* IEEE functions
|
|
* __nexttowardfd(x,y)
|
|
* return the next machine floating-point number of x in the
|
|
* direction toward y.
|
|
* This is for machines which use different binary type for double and
|
|
* long double conditionally, y is long double equal to double.
|
|
* Special cases:
|
|
*/
|
|
|
|
#include <errno.h>
|
|
#include <math.h>
|
|
#include <math_private.h>
|
|
#include <math_ldbl_opt.h>
|
|
#include <float.h>
|
|
|
|
float __nldbl_nexttowardf(float x, double y);
|
|
|
|
float __nldbl_nexttowardf(float x, double y)
|
|
{
|
|
int32_t hx,hy,ix,iy;
|
|
u_int32_t ly;
|
|
|
|
GET_FLOAT_WORD(hx,x);
|
|
EXTRACT_WORDS(hy,ly,y);
|
|
ix = hx&0x7fffffff; /* |x| */
|
|
iy = hy&0x7fffffff; /* |y| */
|
|
|
|
if((ix>0x7f800000) || /* x is nan */
|
|
((iy>=0x7ff00000)&&((iy-0x7ff00000)|ly)!=0)) /* y is nan */
|
|
return x+y;
|
|
if((double) x==y) return y; /* x=y, return y */
|
|
if(ix==0) { /* x == 0 */
|
|
float u;
|
|
SET_FLOAT_WORD(x,(u_int32_t)(hy&0x80000000)|1);/* return +-minsub*/
|
|
u = math_opt_barrier (x);
|
|
u = u * u;
|
|
math_force_eval (u); /* raise underflow flag */
|
|
return x;
|
|
}
|
|
if(hx>=0) { /* x > 0 */
|
|
if(x > y) /* x -= ulp */
|
|
hx -= 1;
|
|
else /* x < y, x += ulp */
|
|
hx += 1;
|
|
} else { /* x < 0 */
|
|
if(x < y) /* x -= ulp */
|
|
hx -= 1;
|
|
else /* x > y, x += ulp */
|
|
hx += 1;
|
|
}
|
|
hy = hx&0x7f800000;
|
|
if(hy>=0x7f800000) {
|
|
float u = x+x; /* overflow */
|
|
math_force_eval (u);
|
|
__set_errno (ERANGE);
|
|
}
|
|
if(hy<0x00800000) {
|
|
float u = x*x; /* underflow */
|
|
math_force_eval (u); /* raise underflow flag */
|
|
__set_errno (ERANGE);
|
|
}
|
|
SET_FLOAT_WORD(x,hx);
|
|
return x;
|
|
}
|
|
|
|
#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
|
|
compat_symbol (libm, __nldbl_nexttowardf, nexttowardf, GLIBC_2_1);
|
|
#endif
|