X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=include%2Fmath.h;h=c4da4116c595f757d9264b591b9f5adf0b38c57c;hp=f320b8e9409536d09699b33603099e90d7a5af52;hb=8c741783fc96d559cfe79301c924c217b2905c0c;hpb=b69f695acedd4ce2798ef9ea28d834ceccc789bd diff --git a/include/math.h b/include/math.h index f320b8e9..c4da4116 100644 --- a/include/math.h +++ b/include/math.h @@ -5,6 +5,8 @@ extern "C" { #endif +#include + #define __NEED_float_t #define __NEED_double_t #define __NEED___uint16_t @@ -25,11 +27,11 @@ extern "C" { #define HUGE_VALL ((long double)INFINITY) #define MATH_ERRNO 1 -#define MATH_EXCEPT 2 +#define MATH_ERREXCEPT 2 #define math_errhandling 2 -#define FP_ILOGBNAN (((unsigned)-1)>>1) -#define FP_ILOGB0 (~FP_ILOGBNAN) +#define FP_ILOGBNAN (-1-(int)(((unsigned)-1)>>1)) +#define FP_ILOGB0 FP_ILOGBNAN #define FP_NAN 0 #define FP_INFINITE 1 @@ -41,8 +43,11 @@ int __fpclassify(double); int __fpclassifyf(float); int __fpclassifyl(long double); -#define __FLOAT_BITS(f) (((union { float __f; __uint32_t __i; }){ (f) }).__i) -#define __DOUBLE_BITS(f) (((union { double __f; __uint64_t __i; }){ (f) }).__i) +union __float_repr { float __f; __uint32_t __i; }; +union __double_repr { double __f; __uint64_t __i; }; + +#define __FLOAT_BITS(f) (((union __float_repr){ (float)(f) }).__i) +#define __DOUBLE_BITS(f) (((union __double_repr){ (double)(f) }).__i) #define fpclassify(x) ( \ sizeof(x) == sizeof(float) ? __fpclassifyf(x) : \ @@ -74,30 +79,42 @@ int __signbitf(float); int __signbitl(long double); #define signbit(x) ( \ - sizeof(x) == sizeof(float) ? !!(__FLOAT_BITS(x) & 0x80000000) : \ - sizeof(x) == sizeof(double) ? !!(__DOUBLE_BITS(x) & (__uint64_t)1<<63) : \ + sizeof(x) == sizeof(float) ? (int)(__FLOAT_BITS(x)>>31) : \ + sizeof(x) == sizeof(double) ? (int)(__DOUBLE_BITS(x)>>63) : \ __signbitl(x) ) #define isunordered(x,y) (isnan((x)) ? ((void)(y),1) : isnan((y))) -#if __STDC_VERSION__ >= 199901L -inline -#endif -static int __isrel(long double __x, long double __y, int __rel) -{ - if (isunordered(__x, __y)) return 0; - if (__rel==-2) return __x < __y; - if (__rel==2) return __x > __y; - if (__rel==-1) return __x <= __y; - if (__rel==1) return __x >= __y; - return __x != __y; -} - -#define isless(x,y) __isrel((x), (y), -2) -#define islessequal(x,y) __isrel((x), (y), -1) -#define islessgreater(x,y) __isrel((x), (y), 0) -#define isgreaterequal(x,y) __isrel((x), (y), 1) -#define isgreater(x,y) __isrel((x), (y), 2) +#define __ISREL_DEF(rel, op, type) \ +static __inline int __is##rel(type __x, type __y) \ +{ return !isunordered(__x,__y) && __x op __y; } + +__ISREL_DEF(lessf, <, float) +__ISREL_DEF(less, <, double) +__ISREL_DEF(lessl, <, long double) +__ISREL_DEF(lessequalf, <=, float) +__ISREL_DEF(lessequal, <=, double) +__ISREL_DEF(lessequall, <=, long double) +__ISREL_DEF(lessgreaterf, !=, float) +__ISREL_DEF(lessgreater, !=, double) +__ISREL_DEF(lessgreaterl, !=, long double) +__ISREL_DEF(greaterf, >, float) +__ISREL_DEF(greater, >, double) +__ISREL_DEF(greaterl, >, long double) +__ISREL_DEF(greaterequalf, >=, float) +__ISREL_DEF(greaterequal, >=, double) +__ISREL_DEF(greaterequall, >=, long double) + +#define __tg_pred_2(x, y, p) ( \ + sizeof((x)+(y)) == sizeof(float) ? p##f(x, y) : \ + sizeof((x)+(y)) == sizeof(double) ? p(x, y) : \ + p##l(x, y) ) + +#define isless(x, y) __tg_pred_2(x, y, __isless) +#define islessequal(x, y) __tg_pred_2(x, y, __islessequal) +#define islessgreater(x, y) __tg_pred_2(x, y, __islessgreater) +#define isgreater(x, y) __tg_pred_2(x, y, __isgreater) +#define isgreaterequal(x, y) __tg_pred_2(x, y, __isgreaterequal) double acos(double); float acosf(float); @@ -196,8 +213,8 @@ float fmodf(float, float); long double fmodl(long double, long double); double frexp(double, int *); -float frexpf(float value, int *); -long double frexpl(long double value, int *); +float frexpf(float, int *); +long double frexpl(long double, int *); double hypot(double, double); float hypotf(float, float); @@ -327,8 +344,13 @@ double trunc(double); float truncf(float); long double truncl(long double); -#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) + +#if defined(_XOPEN_SOURCE) || defined(_BSD_SOURCE) +#undef MAXFLOAT #define MAXFLOAT 3.40282347e+38F +#endif + +#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) #define M_E 2.7182818284590452354 /* e */ #define M_LOG2E 1.4426950408889634074 /* log_2 e */ #define M_LOG10E 0.43429448190325182765 /* log_10 e */ @@ -345,43 +367,50 @@ long double truncl(long double); extern int signgam; -double gamma(double); -float gammaf(float); -long double gammal(long double); +double j0(double); +double j1(double); +double jn(int, double); + +double y0(double); +double y1(double); +double yn(int, double); +#endif + +#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) +#define HUGE 3.40282347e+38F + +double scalb(double, double); +float scalbf(float, float); + +double significand(double); +float significandf(float); double lgamma_r(double, int*); float lgammaf_r(float, int*); -long double lgammal_r(long double, int*); -double j0(double); float j0f(float); -long double j0l(long double); - -double j1(double); float j1f(float); -long double j1l(long double); - -double jn(int, double); float jnf(int, float); -long double jnl(int, long double); -double y0(double); float y0f(float); -long double y0l(long double); - -double y1(double); float y1f(float); -long double y1l(long double); - -double yn(int, double); float ynf(int, float); -long double ynl(int, long double); #endif #ifdef _GNU_SOURCE -double scalb(double, double); -float scalbf(float, float); -long double scalbl(long double, long double); +long double lgammal_r(long double, int*); + +void sincos(double, double*, double*); +void sincosf(float, float*, float*); +void sincosl(long double, long double*, long double*); + +double exp10(double); +float exp10f(float); +long double exp10l(long double); + +double pow10(double); +float pow10f(float); +long double pow10l(long double); #endif #ifdef __cplusplus