diff options
Diffstat (limited to 'math')
| -rw-r--r-- | math/Makefile | 3 | ||||
| -rw-r--r-- | math/math.h | 116 | ||||
| -rw-r--r-- | math/mathcalls.h | 111 |
3 files changed, 195 insertions, 35 deletions
diff --git a/math/Makefile b/math/Makefile index 550e9d6c50..b8964baa88 100644 --- a/math/Makefile +++ b/math/Makefile @@ -45,7 +45,8 @@ libm-calls = e_acos e_acosh e_asin e_atan2 e_atanh e_cosh e_exp e_fmod \ s_sin s_tan s_tanh w_acos w_acosh w_asin \ w_atan2 w_atanh w_cabs w_cosh w_drem w_exp w_fmod w_gamma \ w_gamma_r w_hypot w_j0 w_j1 w_jn w_lgamma w_lgamma_r \ - w_log w_log10 w_pow w_remainder w_scalb w_sinh w_sqrt + w_log w_log10 w_pow w_remainder w_scalb w_sinh w_sqrt \ + s_signbit s_fpclassify s_fmax s_fmin s_fdim libm-routines = $(libm-support) $(libm-calls) \ $(patsubst %_rf,%f_r,$(libm-calls:=f)) \ $(long-m-$(long-double-fcts)) diff --git a/math/math.h b/math/math.h index dce06e798b..e08d210be8 100644 --- a/math/math.h +++ b/math/math.h @@ -44,20 +44,20 @@ __BEGIN_DECLS and can declare the float versions `namef' and `__namef'. */ #define __MATHCALL(function,suffix, args) \ - __MATHDECL (_Mdouble_, function,suffix, args) + __MATHDECL (_Mdouble_,function,suffix, args) #define __MATHDECL(type, function,suffix, args) \ __MATHDECL_1(type, function,suffix, args); \ - __MATHDECL_1(type, __##function,suffix, args) + __MATHDECL_1(type, __CONCAT(__,function),suffix, args) #define __MATHDECL_1(type, function,suffix, args) \ extern type __MATH_PRECNAME(function,suffix) args #define _Mdouble_ double -#define __MATH_PRECNAME(name,r) name##r +#define __MATH_PRECNAME(name,r) __CONCAT(name,r) #include <mathcalls.h> #undef _Mdouble_ #undef __MATH_PRECNAME -#ifdef __USE_MISC +#if defined __USE_MISC || defined __USE_ISOC9X /* Include the file of declarations again, this time using `float' @@ -67,11 +67,16 @@ __BEGIN_DECLS #define _Mfloat_ float #endif #define _Mdouble_ _Mfloat_ +#ifdef __STDC__ #define __MATH_PRECNAME(name,r) name##f##r +#else +#define __MATH_PRECNAME(name,r) name/**/f/**/r +#endif #include <mathcalls.h> #undef _Mdouble_ #undef __MATH_PRECNAME +#if __STDC__ - 0 || __GNUC__ - 0 /* Include the file of declarations again, this time using `long double' instead of `double' and appending l to each function name. */ @@ -79,14 +84,104 @@ __BEGIN_DECLS #define _Mlong_double_ long double #endif #define _Mdouble_ _Mlong_double_ +#ifdef __STDC__ #define __MATH_PRECNAME(name,r) name##l##r +#else +#define __MATH_PRECNAME(name,r) name/**/l/**/r +#endif #include <mathcalls.h> #undef _Mdouble_ #undef __MATH_PRECNAME -#endif /* Use misc. */ +#endif /* __STDC__ || __GNUC__ */ + +#endif /* Use misc or ISO C 9X. */ + + +/* ISO C 9X defines some generic macros which work on any data type. */ +#if __USE_ISOC9X + +/* All floating-point numbers can be put in one of these categories. */ +enum + { + FP_NAN, +#define FP_NAN FP_NAN + FP_INFINITE, +#define FP_INFINITE FP_INFINITE + FP_ZERO, +#define FP_ZERO FP_ZERO + FP_SUBNORMAL, +#define FP_SUBNORMAL FP_SUBNORMAL + FP_NORMAL +#define FP_NORMAL FP_NORMAL + }; + +/* Return number of classification appropriate for X. */ +#define fpclassify(x) \ + (sizeof (x) == sizeof (float) ? \ + __finitef (x) \ + : sizeof (x) == sizeof (double) ? \ + __finite (x) : __finitel (x)) + +/* Return nonzero value if sign of X is negative. */ +#define signbit(x) \ + (sizeof (x) == sizeof (float) ? \ + __signbitf (x) \ + : sizeof (x) == sizeof (double) ? \ + __signbit (x) : __signbitl (x)) + +/* Return nonzero value if X is not +-Inf or NaN. */ +#define isfinite(x) (fpclassify (x) >= FP_ZERO) + +/* Return nonzero value if X is neither zero, subnormal, Inf, nor NaN. */ +#define isnormal(x) (fpclassify (x) == FP_NORMAL) + +/* Return nonzero value if X is a NaN. We could use `fpclassify' but + we already have this functions `__isnan' and it is faster. */ +#define isnan(x) \ + (sizeof (x) == sizeof (float) ? \ + __isnanf (x) \ + : sizeof (x) == sizeof (double) ? \ + __isnan (x) : __isnanl (x)) +/* Conversion functions. */ + +/* Round X to nearest integral value according to current rounding + direction. */ +extern long int rinttol __P ((double __x)); +extern long long int rinttoll __P ((double __x)); + +/* Round X to nearest integral value, rounding halfway cases away from + zero. */ +extern long int roundtol __P ((double __x)); +extern long long int roundtoll __P ((double __x)); + + +/* Comparison macros. */ + +/* Return nonzero value if X is greater than Y. */ +#define isgreater(x, y) (!isunordered ((x), (y)) && (x) > (y)) + +/* Return nonzero value if X is greater than or equal to Y. */ +#define isgreaterequal(x, y) (!isunordered ((x), (y)) && (x) >= (y)) + +/* Return nonzero value if X is less than Y. */ +#define isless(x, y) (!isunordered ((x), (y)) && (x) < (y)) + +/* Return nonzero value if X is less than or equal to Y. */ +#define islessequal(x, y) (!isunordered ((x), (y)) && (x) <= (y)) + +/* Return nonzero value if either X is less than Y or Y is less than X. */ +#define islessgreater(x, y) \ + (!isunordered ((x), (y)) && ((x) < (y) || (y) < (x))) + +/* Return nonzero value if arguments are unordered. */ +#define isunordered(x, y) \ + (fpclassify (x) == FP_NAN || fpclassify (y) == FP_NAN) + +#endif /* Use ISO C 9X. */ + #ifdef __USE_MISC /* Support for various different standard error handling behaviors. */ @@ -140,6 +235,14 @@ extern int matherr __P ((struct exception *)); #define HUGE FLT_MAX #include <float.h> /* Defines FLT_MAX. */ +#else /* !SVID */ + +#ifdef __USE_XOPEN +/* X/Open wants another strange constant. */ +#define MAXFLOAT FLT_MAX +#include <float.h> +#endif + #endif /* SVID */ @@ -173,7 +276,8 @@ extern int matherr __P ((struct exception *)); /* Get machine-dependent inline versions (if there are any). */ -#if !defined __NO_MATH_INLINES && defined __OPTIMIZE__ +#if (!defined __NO_MATH_INLINES && defined __OPTIMIZE__) \ + || defined __LIBC_M81_MATH_INLINES #include <__math.h> #endif diff --git a/math/mathcalls.h b/math/mathcalls.h index ca2fe0c32a..fd8ed86e81 100644 --- a/math/mathcalls.h +++ b/math/mathcalls.h @@ -73,7 +73,7 @@ __MATHCALL (sinh,, (_Mdouble_ __x)); /* Hyperbolic tangent of X. */ __MATHCALL (tanh,, (_Mdouble_ __x)); -#if defined(__USE_MISC) || defined(__USE_XOPEN_EXTENDED) +#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC9X /* Hyperbolic arc cosine of X. */ __MATHCALL (acosh,, (_Mdouble_ __x)); /* Hyperbolic arc sine of X. */ @@ -99,7 +99,10 @@ __MATHCALL (log,, (_Mdouble_ __x)); /* Base-ten logarithm of X. */ __MATHCALL (log10,, (_Mdouble_ __x)); -#if defined(__USE_MISC) || defined(__USE_XOPEN_EXTENDED) +/* Break VALUE into integral and fractional parts. */ +__MATHCALL (modf,, (_Mdouble_ __x, _Mdouble_ *__iptr)); + +#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC9X /* Return exp(X) - 1. */ __MATHCALL (expm1,, (_Mdouble_ __x)); @@ -110,8 +113,13 @@ __MATHCALL (log1p,, (_Mdouble_ __x)); __MATHCALL (logb,, (_Mdouble_ __x)); #endif -/* Break VALUE into integral and fractional parts. */ -__MATHCALL (modf,, (_Mdouble_ __x, _Mdouble_ *__iptr)); +#ifdef __USE_ISOC9X +/* Compute base-2 exponential of X. */ +__MATHCALL (exp2,, (_Mdouble_ __x)); + +/* Compute base-2 logarithm of X. */ +__MATHCALL (log2,, (_Mdouble_ __x)); +#endif /* Power functions. */ @@ -122,7 +130,12 @@ __MATHCALL (pow,, (_Mdouble_ __x, _Mdouble_ __y)); /* Return the square root of X. */ __MATHCALL (sqrt,, (_Mdouble_ __x)); -#if defined(__USE_MISC) || defined(__USE_XOPEN_EXTENDED) +#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC9X +/* Return `sqrt(X*X + Y*Y)'. */ +__MATHCALL (hypot,, (_Mdouble_ __x, _Mdouble_ __y)); +#endif + +#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED /* Return the cube root of X. */ __MATHCALL (cbrt,, (_Mdouble_ __x)); #endif @@ -144,13 +157,12 @@ __MATHCALL (fmod,, (_Mdouble_ __x, _Mdouble_ __y)); #ifdef __USE_MISC - /* Return 0 if VALUE is finite or NaN, +1 if it is +Infinity, -1 if it is -Infinity. */ -__MATHDECL (int, isinf,, (_Mdouble_ __value)); +__MATHDECL (int,isinf,, (_Mdouble_ __value)); /* Return nonzero if VALUE is finite and not NaN. */ -__MATHDECL (int, finite,, (_Mdouble_ __value)); +__MATHDECL (int,finite,, (_Mdouble_ __value)); /* Deal with an infinite or NaN result. If ERROR is ERANGE, result is +Inf; @@ -160,9 +172,6 @@ __MATHDECL (int, finite,, (_Mdouble_ __value)); and may return an infinity or NaN, or may do something else. */ __MATHCALL (infnan,, (int __error)); -/* Return X with its signed changed to Y's. */ -__MATHCALL (copysign,, (_Mdouble_ __x, _Mdouble_ __y)); - /* Return X times (2 to the Nth power). */ __MATHCALL (scalbn,, (_Mdouble_ __x, int __n)); @@ -182,36 +191,45 @@ __MATHCALL (cabs,, (struct __MATH_PRECNAME(__cabs_complex,))); __MATHCALL (significand,, (_Mdouble_ __x)); #endif /* Use misc. */ +#if defined __USE_MISC || defined __USE_ISOC9X +/* Return X with its signed changed to Y's. */ +__MATHCALL (copysign,, (_Mdouble_ __x, _Mdouble_ __y)); +#endif + +#ifdef __USE_ISOC9X +/* Return representation of NaN for double type. */ +__MATHCALL (nan,, (__const char *__tagb)); +#endif -#if defined(__USE_MISC) || defined(__USE_XOPEN) +#if defined __USE_MISC || defined __USE_XOPEN /* Return nonzero if VALUE is not a number. */ -__MATHDECL (int, isnan,, (_Mdouble_ __value)); +__MATHDECL (int,isnan,, (_Mdouble_ __value)); /* Return the binary exponent of X, which must be nonzero. */ -__MATHDECL (int, ilogb,, (_Mdouble_ __x)); +__MATHDECL (int,ilogb,, (_Mdouble_ __x)); -/* Return `sqrt(X*X + Y*Y)'. */ -__MATHCALL (hypot,, (_Mdouble_ __x, _Mdouble_ __y)); +/* Bessel functions. */ +__MATHCALL (j0,, (_Mdouble_)); +__MATHCALL (j1,, (_Mdouble_)); +__MATHCALL (jn,, (int, _Mdouble_)); +__MATHCALL (y0,, (_Mdouble_)); +__MATHCALL (y1,, (_Mdouble_)); +__MATHCALL (yn,, (int, _Mdouble_)); +#endif +#if defined __USE_MISC || defined __USE_XOPEN || defined __USE_ISOC9X /* Error, gamma, and Bessel functions. */ __MATHCALL (erf,, (_Mdouble_)); __MATHCALL (erfc,, (_Mdouble_)); __MATHCALL (gamma,, (_Mdouble_)); -__MATHCALL (j0,, (_Mdouble_)); -__MATHCALL (j1,, (_Mdouble_)); -__MATHCALL (jn,, (int, _Mdouble_)); __MATHCALL (lgamma,, (_Mdouble_)); -__MATHCALL (y0,, (_Mdouble_)); -__MATHCALL (y1,, (_Mdouble_)); -__MATHCALL (yn,, (int, _Mdouble_)); /* This variable is used by `gamma' and `lgamma'. */ extern int signgam; #ifdef __USE_MISC - /* Reentrant versions of gamma and lgamma. Those functions use the global variable `signgam'. The reentrant versions instead take a pointer and store the value through it. */ @@ -219,16 +237,14 @@ __MATHCALL (gamma,_r, (_Mdouble_, int *)); __MATHCALL (lgamma,_r, (_Mdouble_, int *)); #endif +#endif /* Use misc or X/Open. */ -#if defined(__USE_MISC) || defined(__USE_XOPEN_EXTENDED) +#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC9X /* Return the integer nearest X in the direction of the prevailing rounding mode. */ __MATHCALL (rint,, (_Mdouble_ __x)); -/* Return X times (2 to the Nth power). */ -__MATHCALL (scalb,, (_Mdouble_ __x, _Mdouble_ __n)); - /* Return X + epsilon if X < Y, X - epsilon if X > Y. */ __MATHCALL (nextafter,, (_Mdouble_ __x, _Mdouble_ __y)); @@ -236,4 +252,43 @@ __MATHCALL (nextafter,, (_Mdouble_ __x, _Mdouble_ __y)); __MATHCALL (remainder,, (_Mdouble_ __x, _Mdouble_ __y)); #endif -#endif /* Use misc. */ +#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED +/* Return X times (2 to the Nth power). */ +__MATHCALL (scalb,, (_Mdouble_ __x, _Mdouble_ __n)); +#endif + +#ifdef __USE_ISOC9X +/* Round X to integral valuein floating-point format using current + rounding direction, but do not raise inexact exception. */ +__MATHCALL (nearbyint,, (_Mdouble_ __x)); + +/* Round X to nearest integral value, rounding halfway cases away from + zero. */ +__MATHCALL (round,, (_Mdouble_ __x)); + +/* Round X to the integral value in floating-point format nearest but + not larger in magnitude. */ +__MATHCALL (trunc,, (_Mdouble_ __x)); + +/* Compute remainder of X and Y and put in *QUO a value with sign of x/y + and magnitude congruent `mod 2^n' to the magnitude of the integral + quotient x/y, with n >= 3. */ +__MATHCALL (remquo,, (_Mdouble_ __x, _Mdouble_ __y, int *__quo)); + + +/* Return positive difference between X and Y. */ +__MATHCALL (fdim,, (_Mdouble_ __x, _Mdouble_ __y)); + +/* Return minimum numeric value from X and Y. */ +__MATHCALL (fmax,, (_Mdouble_ __x, _Mdouble_ __y)); + +/* Return maximum numeric value from X and Y. */ +__MATHCALL (fmin,, (_Mdouble_ __x, _Mdouble_ __y)); + + +/* Classify given number. */ +__MATHDECL_1 (int, __fpclassify,, (_Mdouble_ __value)); + +/* Test for negative number. */ +__MATHDECL_1 (int, __signbit,, (_Mdouble_ __value)); +#endif /* Use ISO C 9X. */ |