diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/generic/e_scalb.c | 16 | ||||
| -rw-r--r-- | sysdeps/generic/e_scalbf.c | 14 | ||||
| -rw-r--r-- | sysdeps/generic/e_scalbl.c | 12 |
4 files changed, 38 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 5c3212c3db..47e5e83954 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2001-02-19 Ulrich Drepper <drepper@redhat.com> + * sysdeps/generic/e_scalb.c: Set invalid exception for invalid + parameters. + * sysdeps/generic/e_scalbf.c: New file. + * sysdeps/generic/e_scalbl.c: New file. + * sysdeps/ia64/fpu/Makefile (libm-sysdep-routines): Add libm_error, libm_frexp4, libm_frexp4f, libm_frexp4l, and all the functions also in libc. diff --git a/sysdeps/generic/e_scalb.c b/sysdeps/generic/e_scalb.c index d9a326b2b2..2e4094390a 100644 --- a/sysdeps/generic/e_scalb.c +++ b/sysdeps/generic/e_scalb.c @@ -5,7 +5,7 @@ * * Developed at SunPro, a Sun Microsystems, Inc. business. * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice + * software is freely granted, provided that this notice * is preserved. * ==================================================== */ @@ -16,10 +16,11 @@ static char rcsid[] = "$NetBSD: e_scalb.c,v 1.6 1995/05/10 20:46:09 jtc Exp $"; /* * __ieee754_scalb(x, fn) is provide for - * passing various standard test suite. One + * passing various standard test suite. One * should use scalbn() instead. */ +#include <fenv.h> #include "math.h" #include "math_private.h" @@ -48,10 +49,17 @@ static char rcsid[] = "$NetBSD: e_scalb.c,v 1.6 1995/05/10 20:46:09 jtc Exp $"; else if (x == 0) return x; else if (!__finite (x)) - return __nan (""); + { + feraiseexcept (FE_INVALID); + return __nan (""); + } else return x/(-fn); } - if (__rint(fn)!=fn) return __nan (""); + if (__rint(fn)!=fn) + { + feraiseexcept (FE_INVALID); + return __nan (""); + } if ( fn > 65000.0) return __scalbn(x, 65000); if (-fn > 65000.0) return __scalbn(x,-65000); return __scalbn(x,(int)fn); diff --git a/sysdeps/generic/e_scalbf.c b/sysdeps/generic/e_scalbf.c index f51057e7b4..9d769f4ce1 100644 --- a/sysdeps/generic/e_scalbf.c +++ b/sysdeps/generic/e_scalbf.c @@ -8,7 +8,7 @@ * * Developed at SunPro, a Sun Microsystems, Inc. business. * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice + * software is freely granted, provided that this notice * is preserved. * ==================================================== */ @@ -17,6 +17,7 @@ static char rcsid[] = "$NetBSD: e_scalbf.c,v 1.3 1995/05/10 20:46:12 jtc Exp $"; #endif +#include <fenv.h> #include "math.h" #include "math_private.h" @@ -45,10 +46,17 @@ static char rcsid[] = "$NetBSD: e_scalbf.c,v 1.3 1995/05/10 20:46:12 jtc Exp $"; else if (x == 0) return x; else if (!__finitef (x)) - return __nanf (""); + { + feraiseexcept (FE_INVALID); + return __nanf (""); + } else return x/(-fn); } - if (__rintf(fn)!=fn) return __nanf (""); + if (__rintf(fn)!=fn) + { + feraiseexcept (FE_INVALID); + return __nanf (""); + } if ( fn > (float)65000.0) return __scalbnf(x, 65000); if (-fn > (float)65000.0) return __scalbnf(x,-65000); return __scalbnf(x,(int)fn); diff --git a/sysdeps/generic/e_scalbl.c b/sysdeps/generic/e_scalbl.c index dccc876c85..fb2914dc5a 100644 --- a/sysdeps/generic/e_scalbl.c +++ b/sysdeps/generic/e_scalbl.c @@ -24,6 +24,7 @@ static char rcsid[] = "$NetBSD: $"; * should use scalbnl() instead. */ +#include <fenv.h> #include "math.h" #include "math_private.h" @@ -52,10 +53,17 @@ static char rcsid[] = "$NetBSD: $"; else if (x == 0) return x; else if (!__finitel (x)) - return __nanl (""); + { + feraiseexcept (FE_INVALID); + return __nanl (""); + } else return x/(-fn); } - if (__rintl(fn)!=fn) return __nanl (""); + if (__rintl(fn)!=fn) + { + feraiseexcept (FE_INVALID); + return __nanl (""); + } if ( fn > 65000.0) return __scalbnl(x, 65000); if (-fn > 65000.0) return __scalbnl(x,-65000); return __scalbnl(x,(int)fn); |