Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 56991: [INCLUDE/CRT] - revert 56989. Our headers are a lost cause. Just add the functions that I need.
by jgardou＠svn.reactos.org 30 Jul '12

30 Jul '12

Author: jgardou Date: Mon Jul 30 00:36:00 2012 New Revision: 56991 URL: http://svn.reactos.org/svn/reactos?rev=56991&view=rev Log: [INCLUDE/CRT] - revert 56989. Our headers are a lost cause. Just add the functions that I need. Modified: trunk/reactos/include/crt/math.h Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=569… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Mon Jul 30 00:36:00 2012 @@ -1,1053 +1,301 @@ /** * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the mingw-w64 runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. */ -#ifndef _MATH_H_ -#define _MATH_H_ - -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif - -#include <crtdefs.h> - -struct _exception; +#ifndef _INC_MATH +#define _INC_MATH + +#include "crtdefs.h" + +struct exception; #pragma pack(push,_CRT_PACKING) - -#define _DOMAIN 1 /* domain error in argument */ -#define _SING 2 /* singularity */ -#define _OVERFLOW 3 /* range overflow */ -#define _UNDERFLOW 4 /* range underflow */ -#define _TLOSS 5 /* total loss of precision */ -#define _PLOSS 6 /* partial loss of precision */ - -#ifndef __STRICT_ANSI__ -#ifndef NO_OLDNAMES - -#define DOMAIN _DOMAIN -#define SING _SING -#define OVERFLOW _OVERFLOW -#define UNDERFLOW _UNDERFLOW -#define TLOSS _TLOSS -#define PLOSS _PLOSS - -#endif -#endif - -#ifndef __STRICT_ANSI__ -#define M_E 2.7182818284590452354 -#define M_LOG2E 1.4426950408889634074 -#define M_LOG10E 0.43429448190325182765 -#define M_LN2 0.69314718055994530942 -#define M_LN10 2.30258509299404568402 -#define M_PI 3.14159265358979323846 -#define M_PI_2 1.57079632679489661923 -#define M_PI_4 0.78539816339744830962 -#define M_1_PI 0.31830988618379067154 -#define M_2_PI 0.63661977236758134308 -#define M_2_SQRTPI 1.12837916709551257390 -#define M_SQRT2 1.41421356237309504880 -#define M_SQRT1_2 0.70710678118654752440 -#endif - -#ifndef __STRICT_ANSI__ -/* See also float.h */ -#ifndef __MINGW_FPCLASS_DEFINED -#define __MINGW_FPCLASS_DEFINED 1 -/* IEEE 754 classication */ -#define _FPCLASS_SNAN 0x0001 /* Signaling "Not a Number" */ -#define _FPCLASS_QNAN 0x0002 /* Quiet "Not a Number" */ -#define _FPCLASS_NINF 0x0004 /* Negative Infinity */ -#define _FPCLASS_NN 0x0008 /* Negative Normal */ -#define _FPCLASS_ND 0x0010 /* Negative Denormal */ -#define _FPCLASS_NZ 0x0020 /* Negative Zero */ -#define _FPCLASS_PZ 0x0040 /* Positive Zero */ -#define _FPCLASS_PD 0x0080 /* Positive Denormal */ -#define _FPCLASS_PN 0x0100 /* Positive Normal */ -#define _FPCLASS_PINF 0x0200 /* Positive Infinity */ -#endif -#endif - -#ifndef RC_INVOKED #ifdef __cplusplus extern "C" { -#endif - -#ifndef __MINGW_SOFTMATH -#define __MINGW_SOFTMATH - -/* IEEE float/double type shapes. */ - - typedef union __mingw_dbl_type_t { - double x; - unsigned long long val; - __C89_NAMELESS struct { - unsigned int low, high; - } lh; - } __mingw_dbl_type_t; - - typedef union __mingw_flt_type_t { - float x; - unsigned int val; - } __mingw_flt_type_t; - - typedef union __mingw_ldbl_type_t - { - long double x; - __C89_NAMELESS struct { - unsigned int low, high; - int sign_exponent : 16; - int res1 : 16; - int res0 : 32; - } lh; - } __mingw_ldbl_type_t; - -#endif - -#ifndef _HUGE - extern double * __MINGW_IMP_SYMBOL(_HUGE); -#define _HUGE (* __MINGW_IMP_SYMBOL(_HUGE)) -#endif - -#if __MINGW_GNUC_PREREQ(3, 3) -#define HUGE_VAL __builtin_huge_val() -#else -#define HUGE_VAL _HUGE #endif #ifndef _EXCEPTION_DEFINED #define _EXCEPTION_DEFINED struct _exception { int type; - const char *name; + char *name; double arg1; double arg2; double retval; }; - - void __mingw_raise_matherr (int typ, const char *name, double a1, double a2, - double rslt); - void __mingw_setusermatherr (int (__cdecl *)(struct _exception *)); - _CRTIMP void __setusermatherr(int (__cdecl *)(struct _exception *)); - #define __setusermatherr __mingw_setusermatherr -#endif - - double __cdecl sin(double _X); - double __cdecl cos(double _X); - double __cdecl tan(double _X); - double __cdecl sinh(double _X); - double __cdecl cosh(double _X); - double __cdecl tanh(double _X); - double __cdecl asin(double _X); - double __cdecl acos(double _X); - double __cdecl atan(double _X); - double __cdecl atan2(double _Y,double _X); - double __cdecl exp(double _X); - double __cdecl log(double _X); - double __cdecl log10(double _X); - double __cdecl pow(double _X,double _Y); - double __cdecl sqrt(double _X); - double __cdecl ceil(double _X); - double __cdecl floor(double _X); - -/* 7.12.7.2 The fabs functions: Double in C89 */ - extern float __cdecl fabsf (float x); - extern long double __cdecl fabsl (long double); - extern double __cdecl fabs (double _X); - -#ifndef __CRT__NO_INLINE -#if !defined (__ia64__) - __CRT_INLINE float __cdecl fabsf (float x) - { -#ifdef __x86_64__ - return __builtin_fabsf (x); -#else - float res = 0.0F; - __asm__ __volatile__ ("fabs;" : "=t" (res) : "0" (x)); - return res; -#endif - } - - __CRT_INLINE long double __cdecl fabsl (long double x) - { - long double res = 0.0l; - __asm__ __volatile__ ("fabs;" : "=t" (res) : "0" (x)); - return res; - } - - __CRT_INLINE double __cdecl fabs (double x) - { -#ifdef __x86_64__ - return __builtin_fabs (x); -#else - double res = 0.0; - __asm__ __volatile__ ("fabs;" : "=t" (res) : "0" (x)); - return res; -#endif - } -#endif -#endif - - double __cdecl ldexp(double _X,int _Y); - double __cdecl frexp(double _X,int *_Y); - double __cdecl modf(double _X,double *_Y); - double __cdecl fmod(double _X,double _Y); - - void __cdecl sincos (double __x, double *p_sin, double *p_cos); - void __cdecl sincosl (long double __x, long double *p_sin, long double *p_cos); - void __cdecl sincosf (float __x, float *p_sin, float *p_cos); - -#ifndef _CRT_ABS_DEFINED -#define _CRT_ABS_DEFINED - int __cdecl abs(int _X); - long __cdecl labs(long _X); -#endif -#ifndef _CRT_ATOF_DEFINED -#define _CRT_ATOF_DEFINED - double __cdecl atof(const char *_String); - double __cdecl _atof_l(const char *_String,_locale_t _Locale); -#endif - -#define EDOM 33 -#define ERANGE 34 - -#ifndef __STRICT_ANSI__ +#endif #ifndef _COMPLEX_DEFINED #define _COMPLEX_DEFINED struct _complex { - double x; - double y; + double x,y; }; #endif - _CRTIMP double __cdecl _cabs(struct _complex _ComplexA); - double __cdecl _hypot(double _X,double _Y); - _CRTIMP double __cdecl _j0(double _X); - _CRTIMP double __cdecl _j1(double _X); - _CRTIMP double __cdecl _jn(int _X,double _Y); - _CRTIMP double __cdecl _y0(double _X); - _CRTIMP double __cdecl _y1(double _X); - _CRTIMP double __cdecl _yn(int _X,double _Y); +#define _DOMAIN 1 +#define _SING 2 +#define _OVERFLOW 3 +#define _UNDERFLOW 4 +#define _TLOSS 5 +#define _PLOSS 6 +#define EDOM 33 +#define ERANGE 34 + + _CRTIMP extern double _HUGE; + +#define HUGE_VAL _HUGE +#define _matherrl _matherr + +#ifndef _CRT_ABS_DEFINED +#define _CRT_ABS_DEFINED + int __cdecl abs(int x); + long __cdecl labs(long x); +#endif + double __cdecl acos(double x); + double __cdecl asin(double x); + double __cdecl atan(double x); + double __cdecl atan2(double y, double x); + double __cdecl cos(double x); + double __cdecl cosh(double x); + double __cdecl exp(double x); + double __cdecl fabs(double x); + double __cdecl fmod(double x, double y); + double __cdecl log(double x); + double __cdecl log10(double x); + double __cdecl pow(double x, double y); + double __cdecl sin(double x); + double __cdecl sinh(double x); + double __cdecl sqrt(double x); + double __cdecl tan(double x); + double __cdecl tanh(double x); #ifndef _CRT_MATHERR_DEFINED #define _CRT_MATHERR_DEFINED - _CRTIMP int __cdecl _matherr (struct _exception *); -#endif - -/* These are also declared in Mingw float.h; needed here as well to work - around GCC build issues. */ -/* BEGIN FLOAT.H COPY */ -/* - * IEEE recommended functions - */ + int __cdecl _matherr(struct _exception *except); +#endif + +#ifndef _CRT_ATOF_DEFINED +#define _CRT_ATOF_DEFINED + _CRTIMP double __cdecl atof(const char *str); + _CRTIMP double __cdecl _atof_l(const char *str ,_locale_t locale); +#endif #ifndef _SIGN_DEFINED #define _SIGN_DEFINED - _CRTIMP double __cdecl _chgsign (double _X); - _CRTIMP double __cdecl _copysign (double _Number,double _Sign); - _CRTIMP double __cdecl _logb (double); - _CRTIMP double __cdecl _nextafter (double, double); - _CRTIMP double __cdecl _scalb (double, long); - _CRTIMP int __cdecl _finite (double); - _CRTIMP int __cdecl _fpclass (double); - _CRTIMP int __cdecl _isnan (double); -#endif - -/* END FLOAT.H COPY */ - -#if !defined(NO_OLDNAMES) - -_CRTIMP double __cdecl j0 (double); -_CRTIMP double __cdecl j1 (double); -_CRTIMP double __cdecl jn (int, double); -_CRTIMP double __cdecl y0 (double); -_CRTIMP double __cdecl y1 (double); -_CRTIMP double __cdecl yn (int, double); - -_CRTIMP double __cdecl chgsign (double); -/* - * scalb() is a GCC built-in. - * Exclude this _scalb() stub; the semantics are incompatible - * with the built-in implementation. - * -_CRTIMP double __cdecl scalb (double, long); - * - */ - _CRTIMP int __cdecl finite (double); - _CRTIMP int __cdecl fpclass (double); - -#define FP_SNAN _FPCLASS_SNAN -#define FP_QNAN _FPCLASS_QNAN -#define FP_NINF _FPCLASS_NINF -#define FP_PINF _FPCLASS_PINF -#define FP_NDENORM _FPCLASS_ND -#define FP_PDENORM _FPCLASS_PD -#define FP_NZERO _FPCLASS_NZ -#define FP_PZERO _FPCLASS_PZ -#define FP_NNORM _FPCLASS_NN -#define FP_PNORM _FPCLASS_PN - -#endif /* !defined (_NO_OLDNAMES) && !define (NO_OLDNAMES) */ - -#if(defined(_X86_) && !defined(__x86_64)) - _CRTIMP int __cdecl _set_SSE2_enable(int _Flag); -#endif - -#endif + _CRTIMP double __cdecl _copysign(double x,double sgn); + _CRTIMP double __cdecl _chgsign(double x); +#endif + _CRTIMP double __cdecl _cabs(struct _complex a); + _CRTIMP double __cdecl ceil(double x); + _CRTIMP double __cdecl floor(double x); + _CRTIMP double __cdecl frexp(double x, int *y); + _CRTIMP double __cdecl _hypot(double x, double y); + _CRTIMP double __cdecl _j0(double x); + _CRTIMP double __cdecl _j1(double x); + _CRTIMP double __cdecl _jn(int x, double y); + _CRTIMP double __cdecl ldexp(double x, int y); + _CRTIMP double __cdecl modf(double x, double *y); + _CRTIMP double __cdecl _y0(double x); + _CRTIMP double __cdecl _y1(double x); + _CRTIMP double __cdecl _yn(int x, double y); + _CRTIMP float __cdecl _hypotf(float x, float y); + +#if defined(__i386__) || defined(_M_IX86) + _CRTIMP int __cdecl _set_SSE2_enable(int flag); +#endif + +#if defined(__x86_64) || defined(_M_AMD64) + _CRTIMP float __cdecl _copysignf(float x, float sgn); + _CRTIMP float __cdecl _chgsignf(float x); + _CRTIMP float __cdecl _logbf(float x); + _CRTIMP float __cdecl _nextafterf(float x,float y); + _CRTIMP int __cdecl _finitef(float x); + _CRTIMP int __cdecl _isnanf(float x); + _CRTIMP int __cdecl _fpclassf(float x); +#endif + +#if defined(__ia64__) || defined (_M_IA64) + _CRTIMP float __cdecl fabsf(float x); + _CRTIMP float __cdecl ldexpf(float x, int y); + _CRTIMP long double __cdecl tanl(long double x); +#else + __CRT_INLINE float __cdecl fabsf(float x) { return ((float)fabs((double)x)); } + __CRT_INLINE float __cdecl ldexpf(float x, int expn) { return (float)ldexp (x, expn); } + __CRT_INLINE long double tanl(long double x) { return (tan((double)x)); } +#endif + +#if (_WIN32_WINNT >= 0x600) && \ + (defined(__x86_64) || defined(_M_AMD64) || \ + defined (__ia64__) || defined (_M_IA64)) + _CRTIMP float __cdecl acosf(float x); + _CRTIMP float __cdecl asinf(float x); + _CRTIMP float __cdecl atanf(float x); + _CRTIMP float __cdecl atan2f(float x, float y); + _CRTIMP float __cdecl ceilf(float x); + _CRTIMP float __cdecl cosf(float x); + _CRTIMP float __cdecl coshf(float x); + _CRTIMP float __cdecl expf(float x); + _CRTIMP float __cdecl floorf(float x); + _CRTIMP float __cdecl fmodf(float x, float y); + _CRTIMP float __cdecl logf(float x); + _CRTIMP float __cdecl log10f(float x); + _CRTIMP float __cdecl modff(float x, float *y); + _CRTIMP float __cdecl powf(float b, float e); + _CRTIMP float __cdecl sinf(float x); + _CRTIMP float __cdecl sinhf(float x); + _CRTIMP float __cdecl sqrtf(float x); + _CRTIMP float __cdecl tanf(float x); + _CRTIMP float __cdecl tanhf(float x); +#else + __CRT_INLINE float acosf(float x) { return ((float)acos((double)x)); } + __CRT_INLINE float asinf(float x) { return ((float)asin((double)x)); } + __CRT_INLINE float atanf(float x) { return ((float)atan((double)x)); } + __CRT_INLINE float atan2f(float x,float y) { return ((float)atan2((double)x,(double)y)); } + __CRT_INLINE float ceilf(float x) { return ((float)ceil((double)x)); } + __CRT_INLINE float cosf(float x) { return ((float)cos((double)x)); } + __CRT_INLINE float coshf(float x) { return ((float)cosh((double)x)); } + __CRT_INLINE float expf(float x) { return ((float)exp((double)x)); } + __CRT_INLINE float floorf(float x) { return ((float)floor((double)x)); } + __CRT_INLINE float fmodf(float x,float y) { return ((float)fmod((double)x,(double)y)); } + __CRT_INLINE float logf(float x) { return ((float)log((double)x)); } + __CRT_INLINE float log10f(float x) { return ((float)log10((double)x)); } + __CRT_INLINE float modff(float x,float *y) { + double _Di,_Df = modf((double)x,&_Di); + *y = (float)_Di; + return ((float)_Df); + } + __CRT_INLINE float powf(float x,float y) { return ((float)pow((double)x,(double)y)); } + __CRT_INLINE float sinf(float x) { return ((float)sin((double)x)); } + __CRT_INLINE float sinhf(float x) { return ((float)sinh((double)x)); } + __CRT_INLINE float sqrtf(float x) { return ((float)sqrt((double)x)); } + __CRT_INLINE float tanf(float x) { return ((float)tan((double)x)); } + __CRT_INLINE float tanhf(float x) { return ((float)tanh((double)x)); } +#endif + + __CRT_INLINE long double acosl(long double x) { return (acos((double)x)); } + __CRT_INLINE long double asinl(long double x) { return (asin((double)x)); } + __CRT_INLINE long double atanl(long double x) { return (atan((double)x)); } + __CRT_INLINE long double atan2l(long double y, long double x) { return (atan2((double)y, (double)x)); } + __CRT_INLINE long double ceill(long double x) { return (ceil((double)x)); } + __CRT_INLINE long double cosl(long double x) { return (cos((double)x)); } + __CRT_INLINE long double coshl(long double x) { return (cosh((double)x)); } + __CRT_INLINE long double expl(long double x) { return (exp((double)x)); } + __CRT_INLINE long double floorl(long double x) { return (floor((double)x)); } + __CRT_INLINE long double fmodl(long double x, long double y) { return (fmod((double)x, (double)y)); } + __CRT_INLINE long double frexpl(long double x, int *y) { return (frexp((double)x, y)); } + __CRT_INLINE long double logl(long double x) { return (log((double)x)); } + __CRT_INLINE long double log10l(long double x) { return (log10((double)x)); } + __CRT_INLINE long double powl(long double x, long double y) { return (pow((double)x, (double)y)); } + __CRT_INLINE long double sinl(long double x) { return (sin((double)x)); } + __CRT_INLINE long double sinhl(long double x) { return (sinh((double)x)); } + __CRT_INLINE long double sqrtl(long double x) { return (sqrt((double)x)); } + __CRT_INLINE long double tanhl(long double x) {return (tanh((double)x)); } + __CRT_INLINE long double __cdecl fabsl(long double x) { return fabs((double)x); } + __CRT_INLINE long double _chgsignl(long double _Number) { return _chgsign((double)(_Number)); } + __CRT_INLINE long double _copysignl(long double _Number, long double _Sign) { return _copysign((double)(_Number),(double)(_Sign)); } + __CRT_INLINE long double _hypotl(long double x,long double y) { return _hypot((double)(x),(double)(y)); } + __CRT_INLINE float frexpf(float x, int *y) { return ((float)frexp((double)x,y)); } + __CRT_INLINE long double ldexpl(long double x, int y) { return ldexp((double)x, y); } + __CRT_INLINE long double modfl(long double x,long double *y) { + double _Di,_Df = modf((double)x,&_Di); + *y = (long double)_Di; + return (_Df); + } + +#ifndef NO_OLDNAMES +#define DOMAIN _DOMAIN +#define SING _SING +#define OVERFLOW _OVERFLOW +#define UNDERFLOW _UNDERFLOW +#define TLOSS _TLOSS +#define PLOSS _PLOSS +#define matherr _matherr +#define HUGE _HUGE + // _CRTIMP double __cdecl cabs(struct _complex x); + #define cabs _cabs + _CRTIMP double __cdecl hypot(double x,double y); + _CRTIMP double __cdecl j0(double x); + _CRTIMP double __cdecl j1(double x); + _CRTIMP double __cdecl jn(int x,double y); + _CRTIMP double __cdecl y0(double x); + _CRTIMP double __cdecl y1(double x); + _CRTIMP double __cdecl yn(int x,double y); + __CRT_INLINE float __cdecl hypotf(float x, float y) { return (float) hypot (x, y); } +#endif + +#ifdef __cplusplus +} +extern "C++" { + template<class _Ty> inline _Ty _Pow_int(_Ty x,int y) { + unsigned int _N; + if(y >= 0) _N = (unsigned int)y; + else _N = (unsigned int)(-y); + for(_Ty _Z = _Ty(1);;x *= x) { + if((_N & 1)!=0) _Z *= x; + if((_N >>= 1)==0) return (y < 0 ? _Ty(1) / _Z : _Z); + } + } +} +#endif + +#pragma pack(pop) + +#endif /* !_INC_MATH */ + +#if defined(_USE_MATH_DEFINES) && !defined(_MATH_DEFINES_DEFINED) +#define _MATH_DEFINES_DEFINED + +#define M_E 2.71828182845904523536 +#define M_LOG2E 1.44269504088896340736 +#define M_LOG10E 0.434294481903251827651 +#define M_LN2 0.693147180559945309417 +#define M_LN10 2.30258509299404568402 +#define M_PI 3.14159265358979323846 +#define M_PI_2 1.57079632679489661923 +#define M_PI_4 0.785398163397448309616 +#define M_1_PI 0.318309886183790671538 +#define M_2_PI 0.636619772367581343076 +#define M_2_SQRTPI 1.12837916709551257390 +#define M_SQRT2 1.41421356237309504880 +#define M_SQRT1_2 0.707106781186547524401 + +#endif /* _USE_MATH_DEFINES */ #ifndef __NO_ISOCEXT #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \ - || !defined __STRICT_ANSI__ || defined __cplusplus - -#if __MINGW_GNUC_PREREQ(3, 3) -#define HUGE_VALF __builtin_huge_valf() -#define HUGE_VALL __builtin_huge_vall() -#define INFINITY __builtin_inf() -#define NAN __builtin_nan("") -#else -extern const float __INFF; -#define HUGE_VALF __INFF -extern const long double __INFL; -#define HUGE_VALL __INFL -#define INFINITY HUGE_VALF -extern const double __QNAN; -#define NAN __QNAN -#endif /* __MINGW_GNUC_PREREQ(3, 3) */ - -/* Use the compiler's builtin define for FLT_EVAL_METHOD to - set float_t and double_t. */ -#if defined(__FLT_EVAL_METHOD__) -# if ( __FLT_EVAL_METHOD__== 0) -typedef float float_t; -typedef double double_t; -# elif (__FLT_EVAL_METHOD__ == 1) -typedef double float_t; -typedef double double_t; -# elif (__FLT_EVAL_METHOD__ == 2) -typedef long double float_t; -typedef long double double_t; -#endif -#else /* ix87 FPU default */ -typedef long double float_t; -typedef long double double_t; -#endif - -/* 7.12.3.1 */ -/* - Return values for fpclassify. - These are based on Intel x87 fpu condition codes - in the high byte of status word and differ from - the return values for MS IEEE 754 extension _fpclass() -*/ -#define FP_NAN 0x0100 -#define FP_NORMAL 0x0400 -#define FP_INFINITE (FP_NAN | FP_NORMAL) -#define FP_ZERO 0x4000 -#define FP_SUBNORMAL (FP_NORMAL | FP_ZERO) -/* 0x0200 is signbit mask */ - -/* - We can't inline float or double, because we want to ensure truncation - to semantic type before classification. - (A normal long double value might become subnormal when - converted to double, and zero when converted to float.) -*/ - - extern int __cdecl __fpclassifyl (long double); - extern int __cdecl __fpclassifyf (float); - extern int __cdecl __fpclassify (double); - -#ifndef __CRT__NO_INLINE - __CRT_INLINE int __cdecl __fpclassifyl (long double x) { - unsigned short sw; - __asm__ __volatile__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)); - return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); - } - __CRT_INLINE int __cdecl __fpclassify (double x) { -#ifdef __x86_64__ - __mingw_dbl_type_t hlp; - unsigned int l, h; - - hlp.x = x; - h = hlp.lh.high; - l = hlp.lh.low | (h & 0xfffff); - h &= 0x7ff00000; - if ((h | l) == 0) - return FP_ZERO; - if (!h) - return FP_SUBNORMAL; - if (h == 0x7ff00000) - return (l ? FP_NAN : FP_INFINITE); - return FP_NORMAL; -#else - unsigned short sw; - __asm__ __volatile__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)); - return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); -#endif - } - __CRT_INLINE int __cdecl __fpclassifyf (float x) { -#ifdef __x86_64__ - __mingw_flt_type_t hlp; - - hlp.x = x; - hlp.val &= 0x7fffffff; - if (hlp.val == 0) - return FP_ZERO; - if (hlp.val < 0x800000) - return FP_SUBNORMAL; - if (hlp.val >= 0x7f800000) - return (hlp.val > 0x7f800000 ? FP_NAN : FP_INFINITE); - return FP_NORMAL; -#else - unsigned short sw; - __asm__ __volatile__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)); - return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); -#endif - } -#endif - -#define fpclassify(x) (sizeof (x) == sizeof (float) ? __fpclassifyf (x) \ - : sizeof (x) == sizeof (double) ? __fpclassify (x) \ - : __fpclassifyl (x)) - -/* 7.12.3.2 */ -#define isfinite(x) ((fpclassify(x) & FP_NAN) == 0) - -/* 7.12.3.3 */ -#define isinf(x) (fpclassify(x) == FP_INFINITE) - -/* 7.12.3.4 */ -/* We don't need to worry about truncation here: - A NaN stays a NaN. */ - - extern int __cdecl __isnan (double); - extern int __cdecl __isnanf (float); - extern int __cdecl __isnanl (long double); - -#ifndef __CRT__NO_INLINE - __CRT_INLINE int __cdecl __isnan (double _x) - { -#ifdef __x86_64__ - __mingw_dbl_type_t hlp; - int l, h; - - hlp.x = _x; - l = hlp.lh.low; - h = hlp.lh.high & 0x7fffffff; - h |= (unsigned int) (l | -l) >> 31; - h = 0x7ff00000 - h; - return (int) ((unsigned int) h) >> 31; -#else - unsigned short sw; - __asm__ __volatile__ ("fxam;" - "fstsw %%ax": "=a" (sw) : "t" (_x)); - return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) - == FP_NAN; -#endif - } - - __CRT_INLINE int __cdecl __isnanf (float _x) - { -#ifdef __x86_64__ - __mingw_flt_type_t hlp; - int i; - - hlp.x = _x; - i = hlp.val & 0x7fffffff; - i = 0x7f800000 - i; - return (int) (((unsigned int) i) >> 31); -#else - unsigned short sw; - __asm__ __volatile__ ("fxam;" - "fstsw %%ax": "=a" (sw) : "t" (_x)); - return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) - == FP_NAN; -#endif - } - - __CRT_INLINE int __cdecl __isnanl (long double _x) - { - unsigned short sw; - __asm__ __volatile__ ("fxam;" - "fstsw %%ax": "=a" (sw) : "t" (_x)); - return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) - == FP_NAN; - } -#endif - -#define isnan(x) (sizeof (x) == sizeof (float) ? __isnanf (x) \ - : sizeof (x) == sizeof (double) ? __isnan (x) \ - : __isnanl (x)) - -/* 7.12.3.5 */ -#define isnormal(x) (fpclassify(x) == FP_NORMAL) - -/* 7.12.3.6 The signbit macro */ - extern int __cdecl __signbit (double); - extern int __cdecl __signbitf (float); - extern int __cdecl __signbitl (long double); -#ifndef __CRT__NO_INLINE - __CRT_INLINE int __cdecl __signbit (double x) { -#ifdef __x86_64__ - __mingw_dbl_type_t hlp; - - hlp.x = x; - return ((hlp.lh.high & 0x80000000) != 0); -#else - unsigned short stw; - __asm__ __volatile__ ( "fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); - return stw & 0x0200; -#endif - } - - __CRT_INLINE int __cdecl __signbitf (float x) { -#ifdef __x86_64__ - __mingw_flt_type_t hlp; - hlp.x = x; - return ((hlp.val & 0x80000000) != 0); -#else - unsigned short stw; - __asm__ __volatile__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); - return stw & 0x0200; -#endif - } - - __CRT_INLINE int __cdecl __signbitl (long double x) { - unsigned short stw; - __asm__ __volatile__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); - return stw & 0x0200; - } -#endif - -#define signbit(x) (sizeof (x) == sizeof (float) ? __signbitf (x) \ - : sizeof (x) == sizeof (double) ? __signbit (x) \ - : __signbitl (x)) - -/* 7.12.4 Trigonometric functions: Double in C89 */ - extern float __cdecl sinf(float _X); - extern long double __cdecl sinl(long double); - - extern float __cdecl cosf(float _X); - extern long double __cdecl cosl(long double); - - extern float __cdecl tanf(float _X); - extern long double __cdecl tanl(long double); - extern float __cdecl asinf(float _X); - extern long double __cdecl asinl(long double); - - extern float __cdecl acosf (float); - extern long double __cdecl acosl (long double); - - extern float __cdecl atanf (float); - extern long double __cdecl atanl (long double); - - extern float __cdecl atan2f (float, float); - extern long double __cdecl atan2l (long double, long double); - -/* 7.12.5 Hyperbolic functions: Double in C89 */ - extern float __cdecl sinhf(float _X); -#ifndef __CRT__NO_INLINE - __CRT_INLINE float sinhf(float _X) { return ((float)sinh((double)_X)); } -#endif - extern long double __cdecl sinhl(long double); - - extern float __cdecl coshf(float _X); -#ifndef __CRT__NO_INLINE - __CRT_INLINE float coshf(float _X) { return ((float)cosh((double)_X)); } -#endif - extern long double __cdecl coshl(long double); - - extern float __cdecl tanhf(float _X); -#ifndef __CRT__NO_INLINE - __CRT_INLINE float tanhf(float _X) { return ((float)tanh((double)_X)); } -#endif - extern long double __cdecl tanhl(long double); - -/* Inverse hyperbolic trig functions */ -/* 7.12.5.1 */ + || !defined __STRICT_ANSI__ || defined __GLIBCPP__ + + /* Inverse hyperbolic trig functions */ + /* 7.12.5.1 */ extern double __cdecl acosh (double); extern float __cdecl acoshf (float); extern long double __cdecl acoshl (long double); -/* 7.12.5.2 */ + /* 7.12.5.2 */ extern double __cdecl asinh (double); extern float __cdecl asinhf (float); extern long double __cdecl asinhl (long double); -/* 7.12.5.3 */ + /* 7.12.5.3 */ extern double __cdecl atanh (double); extern float __cdecl atanhf (float); extern long double __cdecl atanhl (long double); - -/* Exponentials and logarithms */ -/* 7.12.6.1 Double in C89 */ - extern float __cdecl expf(float _X); -#ifndef __CRT__NO_INLINE - __CRT_INLINE float expf(float _X) { return ((float)exp((double)_X)); } -#endif - extern long double __cdecl expl(long double); - -/* 7.12.6.2 */ + + /* 7.12.6.2 */ extern double __cdecl exp2(double); extern float __cdecl exp2f(float); extern long double __cdecl exp2l(long double); - -/* 7.12.6.3 The expm1 functions */ -/* TODO: These could be inlined */ - extern double __cdecl expm1(double); - extern float __cdecl expm1f(float); - extern long double __cdecl expm1l(long double); - -/* 7.12.6.4 Double in C89 */ - extern float frexpf(float _X,int *_Y); -#ifndef __CRT__NO_INLINE - __CRT_INLINE float frexpf(float _X,int *_Y) { return ((float)frexp((double)_X,_Y)); } -#endif - extern long double __cdecl frexpl(long double,int *); - -/* 7.12.6.5 */ -#define FP_ILOGB0 ((int)0x80000000) -#define FP_ILOGBNAN ((int)0x80000000) - extern int __cdecl ilogb (double); - extern int __cdecl ilogbf (float); - extern int __cdecl ilogbl (long double); - -/* 7.12.6.6 Double in C89 */ - extern float __cdecl ldexpf(float _X,int _Y); -#ifndef __CRT__NO_INLINE - __CRT_INLINE float __cdecl ldexpf (float x, int expn) { return (float) ldexp ((double)x, expn); } -#endif - extern long double __cdecl ldexpl (long double, int); - -/* 7.12.6.7 Double in C89 */ - extern float __cdecl logf (float); - extern long double __cdecl logl(long double); - -/* 7.12.6.8 Double in C89 */ - extern float __cdecl log10f (float); - extern long double __cdecl log10l(long double); - -/* 7.12.6.9 */ - extern double __cdecl log1p(double); - extern float __cdecl log1pf(float); - extern long double __cdecl log1pl(long double); - -/* 7.12.6.10 */ + + /* 7.12.6.10 */ extern double __cdecl log2 (double); extern float __cdecl log2f (float); extern long double __cdecl log2l (long double); - -/* 7.12.6.11 */ - extern double __cdecl logb (double); - extern float __cdecl logbf (float); - extern long double __cdecl logbl (long double); - -/* Inline versions. GCC-4.0+ can do a better fast-math optimization - with __builtins. */ -#ifndef __CRT__NO_INLINE -#if !(__MINGW_GNUC_PREREQ (4, 0) && defined (__FAST_MATH__)) - __CRT_INLINE double __cdecl logb (double x) - { -#ifdef __x86_64__ - __mingw_dbl_type_t hlp; - int lx, hx; - - hlp.x = x; - lx = hlp.lh.low; - hx = hlp.lh.high & 0x7fffffff; /* high |x| */ - if ((hx | lx) == 0) - return -1.0 / fabs (x); - if (hx >= 0x7ff00000) - return x * x; - if ((hx >>= 20) == 0) /* IEEE 754 logb */ - return -1022.0; - return (double) (hx - 1023); -#else - double res = 0.0; - __asm__ __volatile__ ("fxtract\n\t" - "fstp %%st" : "=t" (res) : "0" (x)); - return res; -#endif - } - - __CRT_INLINE float __cdecl logbf (float x) - { -#ifdef __x86_64__ - int v; - __mingw_flt_type_t hlp; - - hlp.x = x; - v = hlp.val & 0x7fffffff; /* high |x| */ - if (!v) - return (float)-1.0 / fabsf (x); - if (v >= 0x7f800000) - return x * x; - if ((v >>= 23) == 0) /* IEEE 754 logb */ - return -126.0; - return (float) (v - 127); -#else - float res = 0.0F; - __asm__ __volatile__ ("fxtract\n\t" - "fstp %%st" : "=t" (res) : "0" (x)); - return res; -#endif - } - - __CRT_INLINE long double __cdecl logbl (long double x) - { - long double res = 0.0l; - __asm__ __volatile__ ("fxtract\n\t" - "fstp %%st" : "=t" (res) : "0" (x)); - return res; - } -#endif /* !defined __FAST_MATH__ || !__MINGW_GNUC_PREREQ (4, 0) */ -#endif /* __CRT__NO_INLINE */ - -/* 7.12.6.12 Double in C89 */ - extern float __cdecl modff (float, float*); - extern long double __cdecl modfl (long double, long double*); - -/* 7.12.6.13 */ - extern double __cdecl scalbn (double, int); - extern float __cdecl scalbnf (float, int); - extern long double __cdecl scalbnl (long double, int); - - extern double __cdecl scalbln (double, long); - extern float __cdecl scalblnf (float, long); - extern long double __cdecl scalblnl (long double, long); - -/* 7.12.7.1 */ -/* Implementations adapted from Cephes versions */ - extern double __cdecl cbrt (double); - extern float __cdecl cbrtf (float); - extern long double __cdecl cbrtl (long double); - -/* 7.12.7.3 */ - extern double __cdecl hypot (double, double); - extern float __cdecl hypotf (float x, float y); -#ifndef __CRT__NO_INLINE - __CRT_INLINE float __cdecl hypotf (float x, float y) { return (float) hypot ((double)x, (double)y);} -#endif - extern long double __cdecl hypotl (long double, long double); - -/* 7.12.7.4 The pow functions. Double in C89 */ - extern float __cdecl powf(float _X,float _Y); -#ifndef __CRT__NO_INLINE - __CRT_INLINE float powf(float _X,float _Y) { return ((float)pow((double)_X,(double)_Y)); } -#endif - extern long double __cdecl powl (long double, long double); - -/* 7.12.7.5 The sqrt functions. Double in C89. */ - extern float __cdecl sqrtf (float); - extern long double sqrtl(long double); - -/* 7.12.8.1 The erf functions */ - extern double __cdecl erf (double); - extern float __cdecl erff (float); - extern long double __cdecl erfl (long double); - -/* 7.12.8.2 The erfc functions */ - extern double __cdecl erfc (double); - extern float __cdecl erfcf (float); - extern long double __cdecl erfcl (long double); - -/* 7.12.8.3 The lgamma functions */ - extern double __cdecl lgamma (double); - extern float __cdecl lgammaf (float); - extern long double __cdecl lgammal (long double); - -/* 7.12.8.4 The tgamma functions */ - extern double __cdecl tgamma (double); - extern float __cdecl tgammaf (float); - extern long double __cdecl tgammal (long double); - -/* 7.12.9.1 Double in C89 */ - extern float __cdecl ceilf (float); - extern long double __cdecl ceill (long double); - -/* 7.12.9.2 Double in C89 */ - extern float __cdecl floorf (float); - extern long double __cdecl floorl (long double); - -/* 7.12.9.3 */ - extern double __cdecl nearbyint ( double); - extern float __cdecl nearbyintf (float); - extern long double __cdecl nearbyintl (long double); - -/* 7.12.9.4 */ -/* round, using fpu control word settings */ -extern double __cdecl rint (double); -extern float __cdecl rintf (float); -extern long double __cdecl rintl (long double); - -/* 7.12.9.5 */ -extern long __cdecl lrint (double); -extern long __cdecl lrintf (float); -extern long __cdecl lrintl (long double); - -__MINGW_EXTENSION long long __cdecl llrint (double); -__MINGW_EXTENSION long long __cdecl llrintf (float); -__MINGW_EXTENSION long long __cdecl llrintl (long double); - -/* Inline versions of above. - GCC 4.0+ can do a better fast-math job with __builtins. */ - -#ifndef __CRT__NO_INLINE -#if !(__MINGW_GNUC_PREREQ (4, 0) && defined __FAST_MATH__ ) - __CRT_INLINE double __cdecl rint (double x) - { - double retval = 0.0; - __asm__ __volatile__ ("frndint;": "=t" (retval) : "0" (x)); - return retval; - } - - __CRT_INLINE float __cdecl rintf (float x) - { - float retval = 0.0; - __asm__ __volatile__ ("frndint;" : "=t" (retval) : "0" (x) ); - return retval; - } - - __CRT_INLINE long double __cdecl rintl (long double x) - { - long double retval = 0.0l; - __asm__ __volatile__ ("frndint;" : "=t" (retval) : "0" (x) ); - return retval; - } - - __CRT_INLINE long __cdecl lrint (double x) - { - long retval = 0; - __asm__ __volatile__ \ - ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __CRT_INLINE long __cdecl lrintf (float x) - { - long retval = 0; - __asm__ __volatile__ \ - ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __CRT_INLINE long __cdecl lrintl (long double x) - { - long retval = 0; - __asm__ __volatile__ \ - ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrint (double x) - { - __MINGW_EXTENSION long long retval = 0ll; - __asm__ __volatile__ \ - ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrintf (float x) - { - __MINGW_EXTENSION long long retval = 0ll; - __asm__ __volatile__ \ - ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrintl (long double x) - { - __MINGW_EXTENSION long long retval = 0ll; - __asm__ __volatile__ \ - ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } -#endif /* !__FAST_MATH__ || !__MINGW_GNUC_PREREQ (4,0) */ -#endif /* !__CRT__NO_INLINE */ - -/* 7.12.9.6 */ -/* round away from zero, regardless of fpu control word settings */ - extern double __cdecl round (double); - extern float __cdecl roundf (float); - extern long double __cdecl roundl (long double); - -/* 7.12.9.7 */ - extern long __cdecl lround (double); - extern long __cdecl lroundf (float); - extern long __cdecl lroundl (long double); - __MINGW_EXTENSION long long __cdecl llround (double); - __MINGW_EXTENSION long long __cdecl llroundf (float); - __MINGW_EXTENSION long long __cdecl llroundl (long double); -/* 7.12.9.8 */ -/* round towards zero, regardless of fpu control word settings */ + /* 7.12.9.8 */ + /* round towards zero, regardless of fpu control word settings */ extern double __cdecl trunc (double); extern float __cdecl truncf (float); extern long double __cdecl truncl (long double); -/* 7.12.10.1 Double in C89 */ - extern float __cdecl fmodf (float, float); - extern long double __cdecl fmodl (long double, long double); - -/* 7.12.10.2 */ - extern double __cdecl remainder (double, double); - extern float __cdecl remainderf (float, float); - extern long double __cdecl remainderl (long double, long double); - -/* 7.12.10.3 */ - extern double __cdecl remquo(double, double, int *); - extern float __cdecl remquof(float, float, int *); - extern long double __cdecl remquol(long double, long double, int *); - -/* 7.12.11.1 */ - extern double __cdecl copysign (double, double); /* in libmoldname.a */ - extern float __cdecl copysignf (float, float); - extern long double __cdecl copysignl (long double, long double); - -#ifndef __CRT__NO_INLINE -#if !defined (__ia64__) - __CRT_INLINE double __cdecl copysign (double x, double y) - { - __mingw_dbl_type_t hx, hy; - hx.x = x; hy.x = y; - hx.lh.high = (hx.lh.high & 0x7fffffff) | (hy.lh.high & 0x80000000); - return hx.x; - } - __CRT_INLINE float __cdecl copysignf (float x, float y) - { - __mingw_flt_type_t hx, hy; - hx.x = x; hy.x = y; - hx.val = (hx.val & 0x7fffffff) | (hy.val & 0x80000000); - return hx.x; - } -#endif -#endif - -/* 7.12.11.2 Return a NaN */ - extern double __cdecl nan(const char *tagp); - extern float __cdecl nanf(const char *tagp); - extern long double __cdecl nanl(const char *tagp); - -#ifndef __STRICT_ANSI__ -#define _nan() nan("") -#define _nanf() nanf("") -#define _nanl() nanl("") -#endif - -/* 7.12.11.3 */ - extern double __cdecl nextafter (double, double); /* in libmoldname.a */ - extern float __cdecl nextafterf (float, float); - extern long double __cdecl nextafterl (long double, long double); - -/* 7.12.11.4 The nexttoward functions */ - extern double __cdecl nexttoward (double, long double); - extern float __cdecl nexttowardf (float, long double); - extern long double __cdecl nexttowardl (long double, long double); - -/* 7.12.12.1 */ -/* x > y ? (x - y) : 0.0 */ - extern double __cdecl fdim (double x, double y); - extern float __cdecl fdimf (float x, float y); - extern long double __cdecl fdiml (long double x, long double y); - -/* fmax and fmin. - NaN arguments are treated as missing data: if one argument is a NaN - and the other numeric, then these functions choose the numeric - value. */ - -/* 7.12.12.2 */ - extern double __cdecl fmax (double, double); - extern float __cdecl fmaxf (float, float); - extern long double __cdecl fmaxl (long double, long double); - -/* 7.12.12.3 */ - extern double __cdecl fmin (double, double); - extern float __cdecl fminf (float, float); - extern long double __cdecl fminl (long double, long double); - -/* 7.12.13.1 */ -/* return x * y + z as a ternary op */ - extern double __cdecl fma (double, double, double); - extern float __cdecl fmaf (float, float, float); - extern long double __cdecl fmal (long double, long double, long double); - -/* 7.12.14 */ -/* - * With these functions, comparisons involving quiet NaNs set the FP - * condition code to "unordered". The IEEE floating-point spec - * dictates that the result of floating-point comparisons should be - * false whenever a NaN is involved, with the exception of the != op, - * which always returns true: yes, (NaN != NaN) is true). - */ - -#if __GNUC__ >= 3 - -#define isgreater(x, y) __builtin_isgreater(x, y) -#define isgreaterequal(x, y) __builtin_isgreaterequal(x, y) -#define isless(x, y) __builtin_isless(x, y) -#define islessequal(x, y) __builtin_islessequal(x, y) -#define islessgreater(x, y) __builtin_islessgreater(x, y) -#define isunordered(x, y) __builtin_isunordered(x, y) - -#else -/* helper */ -#ifndef __CRT__NO_INLINE - __CRT_INLINE int __cdecl - __fp_unordered_compare (long double x, long double y){ - unsigned short retval; - __asm__ __volatile__ ("fucom %%st(1);" - "fnstsw;": "=a" (retval) : "t" (x), "u" (y)); - return retval; - } -#endif - -#define isgreater(x, y) ((__fp_unordered_compare(x, y) & 0x4500) == 0) -#define isless(x, y) ((__fp_unordered_compare (y, x) & 0x4500) == 0) -#define isgreaterequal(x, y) ((__fp_unordered_compare (x, y) & FP_INFINITE) == 0) -#define islessequal(x, y) ((__fp_unordered_compare(y, x) & FP_INFINITE) == 0) -#define islessgreater(x, y) ((__fp_unordered_compare(x, y) & FP_SUBNORMAL) == 0) -#define isunordered(x, y) ((__fp_unordered_compare(x, y) & 0x4500) == 0x4500) - -#endif - #endif /* __STDC_VERSION__ >= 199901L */ #endif /* __NO_ISOCEXT */ - -#if defined(_X86_) && !defined(__x86_64) - _CRTIMP float __cdecl _hypotf(float _X,float _Y); -#endif - -#if !defined(__ia64__) - _CRTIMP float __cdecl _copysignf (float _Number,float _Sign); - _CRTIMP float __cdecl _chgsignf (float _X); - _CRTIMP float __cdecl _logbf(float _X); - _CRTIMP float __cdecl _nextafterf(float _X,float _Y); - _CRTIMP int __cdecl _finitef(float _X); - _CRTIMP int __cdecl _isnanf(float _X); - _CRTIMP int __cdecl _fpclassf(float _X); -#endif - -#ifdef _SIGN_DEFINED - extern long double __cdecl _chgsignl (long double); -#define _copysignl copysignl -#endif /* _SIGN_DEFINED */ - -#define _hypotl hypotl - -#ifndef NO_OLDNAMES -#define matherr _matherr -#define HUGE _HUGE -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* Not RC_INVOKED */ - -#pragma pack(pop) - -#endif /* End _MATH_H_ */ -

1 0

[jgardou] 56990: [CMAKE] - Add macro to add flags to a specific language.
by jgardou＠svn.reactos.org 30 Jul '12

30 Jul '12

Author: jgardou Date: Mon Jul 30 00:00:51 2012 New Revision: 56990 URL: http://svn.reactos.org/svn/reactos?rev=56990&view=rev Log: [CMAKE] - Add macro to add flags to a specific language. Modified: trunk/reactos/cmake/compilerflags.cmake Modified: trunk/reactos/cmake/compilerflags.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/compilerflags.cmake?… ============================================================================== --- trunk/reactos/cmake/compilerflags.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/compilerflags.cmake [iso-8859-1] Mon Jul 30 00:00:51 2012 @@ -36,6 +36,7 @@ # add_target_compile_flags(mymodule "-pedantic -O5") # add_target_compile_definitions(mymodule WIN32 _WIN32 INLINE=inline) # add_target_include_directories(mymodule include ../include) +# add_compile_flags_language("-std=gnu99" "C") function(add_compile_flags _flags) if(${ARGC} GREATER 1) message(STATUS "Excess arguments to add_compile_flags! Args ${ARGN}") @@ -44,6 +45,14 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_flags}" PARENT_SCOPE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_flags}" PARENT_SCOPE) set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} ${_flags}" PARENT_SCOPE) +endfunction() + +function(add_compile_flags_language _flags _lang) + if(NOT ${ARGC} EQUAL 2) + message(STATUS "Wrong arguments to add_compile_flags_language! Args ${ARGN}") + endif() + # Adds the compiler flag to both CMAKE_C_FLAGS and CMAKE_CXX_FLAGS + set(CMAKE_${_lang}_FLAGS "${CMAKE_${_lang}_FLAGS} ${_flags}" PARENT_SCOPE) endfunction() function(add_target_compile_flags _module _flags)

1 0

[jgardou] 56989: [INCLUDE/CRT] - Partial update of math.h Someone used to mingw-w64 headers system should look into this, I NEED those C99 functions!
by jgardou＠svn.reactos.org 29 Jul '12

29 Jul '12

Author: jgardou Date: Sun Jul 29 23:59:33 2012 New Revision: 56989 URL: http://svn.reactos.org/svn/reactos?rev=56989&view=rev Log: [INCLUDE/CRT] - Partial update of math.h Someone used to mingw-w64 headers system should look into this, I NEED those C99 functions! Modified: trunk/reactos/include/crt/math.h Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=569… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Sun Jul 29 23:59:33 2012 @@ -1,262 +1,1053 @@ /** * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ -#ifndef _INC_MATH -#define _INC_MATH - -#include "crtdefs.h" - -struct exception; +#ifndef _MATH_H_ +#define _MATH_H_ + +#if __GNUC__ >= 3 +#pragma GCC system_header +#endif + +#include <crtdefs.h> + +struct _exception; #pragma pack(push,_CRT_PACKING) + +#define _DOMAIN 1 /* domain error in argument */ +#define _SING 2 /* singularity */ +#define _OVERFLOW 3 /* range overflow */ +#define _UNDERFLOW 4 /* range underflow */ +#define _TLOSS 5 /* total loss of precision */ +#define _PLOSS 6 /* partial loss of precision */ + +#ifndef __STRICT_ANSI__ +#ifndef NO_OLDNAMES + +#define DOMAIN _DOMAIN +#define SING _SING +#define OVERFLOW _OVERFLOW +#define UNDERFLOW _UNDERFLOW +#define TLOSS _TLOSS +#define PLOSS _PLOSS + +#endif +#endif + +#ifndef __STRICT_ANSI__ +#define M_E 2.7182818284590452354 +#define M_LOG2E 1.4426950408889634074 +#define M_LOG10E 0.43429448190325182765 +#define M_LN2 0.69314718055994530942 +#define M_LN10 2.30258509299404568402 +#define M_PI 3.14159265358979323846 +#define M_PI_2 1.57079632679489661923 +#define M_PI_4 0.78539816339744830962 +#define M_1_PI 0.31830988618379067154 +#define M_2_PI 0.63661977236758134308 +#define M_2_SQRTPI 1.12837916709551257390 +#define M_SQRT2 1.41421356237309504880 +#define M_SQRT1_2 0.70710678118654752440 +#endif + +#ifndef __STRICT_ANSI__ +/* See also float.h */ +#ifndef __MINGW_FPCLASS_DEFINED +#define __MINGW_FPCLASS_DEFINED 1 +/* IEEE 754 classication */ +#define _FPCLASS_SNAN 0x0001 /* Signaling "Not a Number" */ +#define _FPCLASS_QNAN 0x0002 /* Quiet "Not a Number" */ +#define _FPCLASS_NINF 0x0004 /* Negative Infinity */ +#define _FPCLASS_NN 0x0008 /* Negative Normal */ +#define _FPCLASS_ND 0x0010 /* Negative Denormal */ +#define _FPCLASS_NZ 0x0020 /* Negative Zero */ +#define _FPCLASS_PZ 0x0040 /* Positive Zero */ +#define _FPCLASS_PD 0x0080 /* Positive Denormal */ +#define _FPCLASS_PN 0x0100 /* Positive Normal */ +#define _FPCLASS_PINF 0x0200 /* Positive Infinity */ +#endif +#endif + +#ifndef RC_INVOKED #ifdef __cplusplus extern "C" { +#endif + +#ifndef __MINGW_SOFTMATH +#define __MINGW_SOFTMATH + +/* IEEE float/double type shapes. */ + + typedef union __mingw_dbl_type_t { + double x; + unsigned long long val; + __C89_NAMELESS struct { + unsigned int low, high; + } lh; + } __mingw_dbl_type_t; + + typedef union __mingw_flt_type_t { + float x; + unsigned int val; + } __mingw_flt_type_t; + + typedef union __mingw_ldbl_type_t + { + long double x; + __C89_NAMELESS struct { + unsigned int low, high; + int sign_exponent : 16; + int res1 : 16; + int res0 : 32; + } lh; + } __mingw_ldbl_type_t; + +#endif + +#ifndef _HUGE + extern double * __MINGW_IMP_SYMBOL(_HUGE); +#define _HUGE (* __MINGW_IMP_SYMBOL(_HUGE)) +#endif + +#if __MINGW_GNUC_PREREQ(3, 3) +#define HUGE_VAL __builtin_huge_val() +#else +#define HUGE_VAL _HUGE #endif #ifndef _EXCEPTION_DEFINED #define _EXCEPTION_DEFINED struct _exception { int type; - char *name; + const char *name; double arg1; double arg2; double retval; }; -#endif + + void __mingw_raise_matherr (int typ, const char *name, double a1, double a2, + double rslt); + void __mingw_setusermatherr (int (__cdecl *)(struct _exception *)); + _CRTIMP void __setusermatherr(int (__cdecl *)(struct _exception *)); + #define __setusermatherr __mingw_setusermatherr +#endif + + double __cdecl sin(double _X); + double __cdecl cos(double _X); + double __cdecl tan(double _X); + double __cdecl sinh(double _X); + double __cdecl cosh(double _X); + double __cdecl tanh(double _X); + double __cdecl asin(double _X); + double __cdecl acos(double _X); + double __cdecl atan(double _X); + double __cdecl atan2(double _Y,double _X); + double __cdecl exp(double _X); + double __cdecl log(double _X); + double __cdecl log10(double _X); + double __cdecl pow(double _X,double _Y); + double __cdecl sqrt(double _X); + double __cdecl ceil(double _X); + double __cdecl floor(double _X); + +/* 7.12.7.2 The fabs functions: Double in C89 */ + extern float __cdecl fabsf (float x); + extern long double __cdecl fabsl (long double); + extern double __cdecl fabs (double _X); + +#ifndef __CRT__NO_INLINE +#if !defined (__ia64__) + __CRT_INLINE float __cdecl fabsf (float x) + { +#ifdef __x86_64__ + return __builtin_fabsf (x); +#else + float res = 0.0F; + __asm__ __volatile__ ("fabs;" : "=t" (res) : "0" (x)); + return res; +#endif + } + + __CRT_INLINE long double __cdecl fabsl (long double x) + { + long double res = 0.0l; + __asm__ __volatile__ ("fabs;" : "=t" (res) : "0" (x)); + return res; + } + + __CRT_INLINE double __cdecl fabs (double x) + { +#ifdef __x86_64__ + return __builtin_fabs (x); +#else + double res = 0.0; + __asm__ __volatile__ ("fabs;" : "=t" (res) : "0" (x)); + return res; +#endif + } +#endif +#endif + + double __cdecl ldexp(double _X,int _Y); + double __cdecl frexp(double _X,int *_Y); + double __cdecl modf(double _X,double *_Y); + double __cdecl fmod(double _X,double _Y); + + void __cdecl sincos (double __x, double *p_sin, double *p_cos); + void __cdecl sincosl (long double __x, long double *p_sin, long double *p_cos); + void __cdecl sincosf (float __x, float *p_sin, float *p_cos); + +#ifndef _CRT_ABS_DEFINED +#define _CRT_ABS_DEFINED + int __cdecl abs(int _X); + long __cdecl labs(long _X); +#endif +#ifndef _CRT_ATOF_DEFINED +#define _CRT_ATOF_DEFINED + double __cdecl atof(const char *_String); + double __cdecl _atof_l(const char *_String,_locale_t _Locale); +#endif + +#define EDOM 33 +#define ERANGE 34 + +#ifndef __STRICT_ANSI__ #ifndef _COMPLEX_DEFINED #define _COMPLEX_DEFINED struct _complex { - double x,y; + double x; + double y; }; #endif -#define _DOMAIN 1 -#define _SING 2 -#define _OVERFLOW 3 -#define _UNDERFLOW 4 -#define _TLOSS 5 -#define _PLOSS 6 -#define EDOM 33 -#define ERANGE 34 - - _CRTIMP extern double _HUGE; - -#define HUGE_VAL _HUGE -#define _matherrl _matherr - -#ifndef _CRT_ABS_DEFINED -#define _CRT_ABS_DEFINED - int __cdecl abs(int x); - long __cdecl labs(long x); -#endif - double __cdecl acos(double x); - double __cdecl asin(double x); - double __cdecl atan(double x); - double __cdecl atan2(double y, double x); - double __cdecl cos(double x); - double __cdecl cosh(double x); - double __cdecl exp(double x); - double __cdecl fabs(double x); - double __cdecl fmod(double x, double y); - double __cdecl log(double x); - double __cdecl log10(double x); - double __cdecl pow(double x, double y); - double __cdecl sin(double x); - double __cdecl sinh(double x); - double __cdecl sqrt(double x); - double __cdecl tan(double x); - double __cdecl tanh(double x); + _CRTIMP double __cdecl _cabs(struct _complex _ComplexA); + double __cdecl _hypot(double _X,double _Y); + _CRTIMP double __cdecl _j0(double _X); + _CRTIMP double __cdecl _j1(double _X); + _CRTIMP double __cdecl _jn(int _X,double _Y); + _CRTIMP double __cdecl _y0(double _X); + _CRTIMP double __cdecl _y1(double _X); + _CRTIMP double __cdecl _yn(int _X,double _Y); #ifndef _CRT_MATHERR_DEFINED #define _CRT_MATHERR_DEFINED - int __cdecl _matherr(struct _exception *except); -#endif - -#ifndef _CRT_ATOF_DEFINED -#define _CRT_ATOF_DEFINED - _CRTIMP double __cdecl atof(const char *str); - _CRTIMP double __cdecl _atof_l(const char *str ,_locale_t locale); -#endif + _CRTIMP int __cdecl _matherr (struct _exception *); +#endif + +/* These are also declared in Mingw float.h; needed here as well to work + around GCC build issues. */ +/* BEGIN FLOAT.H COPY */ +/* + * IEEE recommended functions + */ #ifndef _SIGN_DEFINED #define _SIGN_DEFINED - _CRTIMP double __cdecl _copysign(double x,double sgn); - _CRTIMP double __cdecl _chgsign(double x); -#endif - _CRTIMP double __cdecl _cabs(struct _complex a); - _CRTIMP double __cdecl ceil(double x); - _CRTIMP double __cdecl floor(double x); - _CRTIMP double __cdecl frexp(double x, int *y); - _CRTIMP double __cdecl _hypot(double x, double y); - _CRTIMP double __cdecl _j0(double x); - _CRTIMP double __cdecl _j1(double x); - _CRTIMP double __cdecl _jn(int x, double y); - _CRTIMP double __cdecl ldexp(double x, int y); - _CRTIMP double __cdecl modf(double x, double *y); - _CRTIMP double __cdecl _y0(double x); - _CRTIMP double __cdecl _y1(double x); - _CRTIMP double __cdecl _yn(int x, double y); - _CRTIMP float __cdecl _hypotf(float x, float y); - -#if defined(__i386__) || defined(_M_IX86) - _CRTIMP int __cdecl _set_SSE2_enable(int flag); -#endif - -#if defined(__x86_64) || defined(_M_AMD64) - _CRTIMP float __cdecl _copysignf(float x, float sgn); - _CRTIMP float __cdecl _chgsignf(float x); - _CRTIMP float __cdecl _logbf(float x); - _CRTIMP float __cdecl _nextafterf(float x,float y); - _CRTIMP int __cdecl _finitef(float x); - _CRTIMP int __cdecl _isnanf(float x); - _CRTIMP int __cdecl _fpclassf(float x); -#endif - -#if defined(__ia64__) || defined (_M_IA64) - _CRTIMP float __cdecl fabsf(float x); - _CRTIMP float __cdecl ldexpf(float x, int y); - _CRTIMP long double __cdecl tanl(long double x); -#else - __CRT_INLINE float __cdecl fabsf(float x) { return ((float)fabs((double)x)); } - __CRT_INLINE float __cdecl ldexpf(float x, int expn) { return (float)ldexp (x, expn); } - __CRT_INLINE long double tanl(long double x) { return (tan((double)x)); } -#endif - -#if (_WIN32_WINNT >= 0x600) && \ - (defined(__x86_64) || defined(_M_AMD64) || \ - defined (__ia64__) || defined (_M_IA64)) - _CRTIMP float __cdecl acosf(float x); - _CRTIMP float __cdecl asinf(float x); - _CRTIMP float __cdecl atanf(float x); - _CRTIMP float __cdecl atan2f(float x, float y); - _CRTIMP float __cdecl ceilf(float x); - _CRTIMP float __cdecl cosf(float x); - _CRTIMP float __cdecl coshf(float x); - _CRTIMP float __cdecl expf(float x); - _CRTIMP float __cdecl floorf(float x); - _CRTIMP float __cdecl fmodf(float x, float y); - _CRTIMP float __cdecl logf(float x); - _CRTIMP float __cdecl log10f(float x); - _CRTIMP float __cdecl modff(float x, float *y); - _CRTIMP float __cdecl powf(float b, float e); - _CRTIMP float __cdecl sinf(float x); - _CRTIMP float __cdecl sinhf(float x); - _CRTIMP float __cdecl sqrtf(float x); - _CRTIMP float __cdecl tanf(float x); - _CRTIMP float __cdecl tanhf(float x); -#else - __CRT_INLINE float acosf(float x) { return ((float)acos((double)x)); } - __CRT_INLINE float asinf(float x) { return ((float)asin((double)x)); } - __CRT_INLINE float atanf(float x) { return ((float)atan((double)x)); } - __CRT_INLINE float atan2f(float x,float y) { return ((float)atan2((double)x,(double)y)); } - __CRT_INLINE float ceilf(float x) { return ((float)ceil((double)x)); } - __CRT_INLINE float cosf(float x) { return ((float)cos((double)x)); } - __CRT_INLINE float coshf(float x) { return ((float)cosh((double)x)); } - __CRT_INLINE float expf(float x) { return ((float)exp((double)x)); } - __CRT_INLINE float floorf(float x) { return ((float)floor((double)x)); } - __CRT_INLINE float fmodf(float x,float y) { return ((float)fmod((double)x,(double)y)); } - __CRT_INLINE float logf(float x) { return ((float)log((double)x)); } - __CRT_INLINE float log10f(float x) { return ((float)log10((double)x)); } - __CRT_INLINE float modff(float x,float *y) { - double _Di,_Df = modf((double)x,&_Di); - *y = (float)_Di; - return ((float)_Df); - } - __CRT_INLINE float powf(float x,float y) { return ((float)pow((double)x,(double)y)); } - __CRT_INLINE float sinf(float x) { return ((float)sin((double)x)); } - __CRT_INLINE float sinhf(float x) { return ((float)sinh((double)x)); } - __CRT_INLINE float sqrtf(float x) { return ((float)sqrt((double)x)); } - __CRT_INLINE float tanf(float x) { return ((float)tan((double)x)); } - __CRT_INLINE float tanhf(float x) { return ((float)tanh((double)x)); } -#endif - - __CRT_INLINE long double acosl(long double x) { return (acos((double)x)); } - __CRT_INLINE long double asinl(long double x) { return (asin((double)x)); } - __CRT_INLINE long double atanl(long double x) { return (atan((double)x)); } - __CRT_INLINE long double atan2l(long double y, long double x) { return (atan2((double)y, (double)x)); } - __CRT_INLINE long double ceill(long double x) { return (ceil((double)x)); } - __CRT_INLINE long double cosl(long double x) { return (cos((double)x)); } - __CRT_INLINE long double coshl(long double x) { return (cosh((double)x)); } - __CRT_INLINE long double expl(long double x) { return (exp((double)x)); } - __CRT_INLINE long double floorl(long double x) { return (floor((double)x)); } - __CRT_INLINE long double fmodl(long double x, long double y) { return (fmod((double)x, (double)y)); } - __CRT_INLINE long double frexpl(long double x, int *y) { return (frexp((double)x, y)); } - __CRT_INLINE long double logl(long double x) { return (log((double)x)); } - __CRT_INLINE long double log10l(long double x) { return (log10((double)x)); } - __CRT_INLINE long double powl(long double x, long double y) { return (pow((double)x, (double)y)); } - __CRT_INLINE long double sinl(long double x) { return (sin((double)x)); } - __CRT_INLINE long double sinhl(long double x) { return (sinh((double)x)); } - __CRT_INLINE long double sqrtl(long double x) { return (sqrt((double)x)); } - __CRT_INLINE long double tanhl(long double x) {return (tanh((double)x)); } - __CRT_INLINE long double __cdecl fabsl(long double x) { return fabs((double)x); } - __CRT_INLINE long double _chgsignl(long double _Number) { return _chgsign((double)(_Number)); } - __CRT_INLINE long double _copysignl(long double _Number, long double _Sign) { return _copysign((double)(_Number),(double)(_Sign)); } - __CRT_INLINE long double _hypotl(long double x,long double y) { return _hypot((double)(x),(double)(y)); } - __CRT_INLINE float frexpf(float x, int *y) { return ((float)frexp((double)x,y)); } - __CRT_INLINE long double ldexpl(long double x, int y) { return ldexp((double)x, y); } - __CRT_INLINE long double modfl(long double x,long double *y) { - double _Di,_Df = modf((double)x,&_Di); - *y = (long double)_Di; - return (_Df); - } + _CRTIMP double __cdecl _chgsign (double _X); + _CRTIMP double __cdecl _copysign (double _Number,double _Sign); + _CRTIMP double __cdecl _logb (double); + _CRTIMP double __cdecl _nextafter (double, double); + _CRTIMP double __cdecl _scalb (double, long); + _CRTIMP int __cdecl _finite (double); + _CRTIMP int __cdecl _fpclass (double); + _CRTIMP int __cdecl _isnan (double); +#endif + +/* END FLOAT.H COPY */ + +#if !defined(NO_OLDNAMES) + +_CRTIMP double __cdecl j0 (double); +_CRTIMP double __cdecl j1 (double); +_CRTIMP double __cdecl jn (int, double); +_CRTIMP double __cdecl y0 (double); +_CRTIMP double __cdecl y1 (double); +_CRTIMP double __cdecl yn (int, double); + +_CRTIMP double __cdecl chgsign (double); +/* + * scalb() is a GCC built-in. + * Exclude this _scalb() stub; the semantics are incompatible + * with the built-in implementation. + * +_CRTIMP double __cdecl scalb (double, long); + * + */ + _CRTIMP int __cdecl finite (double); + _CRTIMP int __cdecl fpclass (double); + +#define FP_SNAN _FPCLASS_SNAN +#define FP_QNAN _FPCLASS_QNAN +#define FP_NINF _FPCLASS_NINF +#define FP_PINF _FPCLASS_PINF +#define FP_NDENORM _FPCLASS_ND +#define FP_PDENORM _FPCLASS_PD +#define FP_NZERO _FPCLASS_NZ +#define FP_PZERO _FPCLASS_PZ +#define FP_NNORM _FPCLASS_NN +#define FP_PNORM _FPCLASS_PN + +#endif /* !defined (_NO_OLDNAMES) && !define (NO_OLDNAMES) */ + +#if(defined(_X86_) && !defined(__x86_64)) + _CRTIMP int __cdecl _set_SSE2_enable(int _Flag); +#endif + +#endif + +#ifndef __NO_ISOCEXT +#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \ + || !defined __STRICT_ANSI__ || defined __cplusplus + +#if __MINGW_GNUC_PREREQ(3, 3) +#define HUGE_VALF __builtin_huge_valf() +#define HUGE_VALL __builtin_huge_vall() +#define INFINITY __builtin_inf() +#define NAN __builtin_nan("") +#else +extern const float __INFF; +#define HUGE_VALF __INFF +extern const long double __INFL; +#define HUGE_VALL __INFL +#define INFINITY HUGE_VALF +extern const double __QNAN; +#define NAN __QNAN +#endif /* __MINGW_GNUC_PREREQ(3, 3) */ + +/* Use the compiler's builtin define for FLT_EVAL_METHOD to + set float_t and double_t. */ +#if defined(__FLT_EVAL_METHOD__) +# if ( __FLT_EVAL_METHOD__== 0) +typedef float float_t; +typedef double double_t; +# elif (__FLT_EVAL_METHOD__ == 1) +typedef double float_t; +typedef double double_t; +# elif (__FLT_EVAL_METHOD__ == 2) +typedef long double float_t; +typedef long double double_t; +#endif +#else /* ix87 FPU default */ +typedef long double float_t; +typedef long double double_t; +#endif + +/* 7.12.3.1 */ +/* + Return values for fpclassify. + These are based on Intel x87 fpu condition codes + in the high byte of status word and differ from + the return values for MS IEEE 754 extension _fpclass() +*/ +#define FP_NAN 0x0100 +#define FP_NORMAL 0x0400 +#define FP_INFINITE (FP_NAN | FP_NORMAL) +#define FP_ZERO 0x4000 +#define FP_SUBNORMAL (FP_NORMAL | FP_ZERO) +/* 0x0200 is signbit mask */ + +/* + We can't inline float or double, because we want to ensure truncation + to semantic type before classification. + (A normal long double value might become subnormal when + converted to double, and zero when converted to float.) +*/ + + extern int __cdecl __fpclassifyl (long double); + extern int __cdecl __fpclassifyf (float); + extern int __cdecl __fpclassify (double); + +#ifndef __CRT__NO_INLINE + __CRT_INLINE int __cdecl __fpclassifyl (long double x) { + unsigned short sw; + __asm__ __volatile__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)); + return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); + } + __CRT_INLINE int __cdecl __fpclassify (double x) { +#ifdef __x86_64__ + __mingw_dbl_type_t hlp; + unsigned int l, h; + + hlp.x = x; + h = hlp.lh.high; + l = hlp.lh.low | (h & 0xfffff); + h &= 0x7ff00000; + if ((h | l) == 0) + return FP_ZERO; + if (!h) + return FP_SUBNORMAL; + if (h == 0x7ff00000) + return (l ? FP_NAN : FP_INFINITE); + return FP_NORMAL; +#else + unsigned short sw; + __asm__ __volatile__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)); + return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); +#endif + } + __CRT_INLINE int __cdecl __fpclassifyf (float x) { +#ifdef __x86_64__ + __mingw_flt_type_t hlp; + + hlp.x = x; + hlp.val &= 0x7fffffff; + if (hlp.val == 0) + return FP_ZERO; + if (hlp.val < 0x800000) + return FP_SUBNORMAL; + if (hlp.val >= 0x7f800000) + return (hlp.val > 0x7f800000 ? FP_NAN : FP_INFINITE); + return FP_NORMAL; +#else + unsigned short sw; + __asm__ __volatile__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)); + return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); +#endif + } +#endif + +#define fpclassify(x) (sizeof (x) == sizeof (float) ? __fpclassifyf (x) \ + : sizeof (x) == sizeof (double) ? __fpclassify (x) \ + : __fpclassifyl (x)) + +/* 7.12.3.2 */ +#define isfinite(x) ((fpclassify(x) & FP_NAN) == 0) + +/* 7.12.3.3 */ +#define isinf(x) (fpclassify(x) == FP_INFINITE) + +/* 7.12.3.4 */ +/* We don't need to worry about truncation here: + A NaN stays a NaN. */ + + extern int __cdecl __isnan (double); + extern int __cdecl __isnanf (float); + extern int __cdecl __isnanl (long double); + +#ifndef __CRT__NO_INLINE + __CRT_INLINE int __cdecl __isnan (double _x) + { +#ifdef __x86_64__ + __mingw_dbl_type_t hlp; + int l, h; + + hlp.x = _x; + l = hlp.lh.low; + h = hlp.lh.high & 0x7fffffff; + h |= (unsigned int) (l | -l) >> 31; + h = 0x7ff00000 - h; + return (int) ((unsigned int) h) >> 31; +#else + unsigned short sw; + __asm__ __volatile__ ("fxam;" + "fstsw %%ax": "=a" (sw) : "t" (_x)); + return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) + == FP_NAN; +#endif + } + + __CRT_INLINE int __cdecl __isnanf (float _x) + { +#ifdef __x86_64__ + __mingw_flt_type_t hlp; + int i; + + hlp.x = _x; + i = hlp.val & 0x7fffffff; + i = 0x7f800000 - i; + return (int) (((unsigned int) i) >> 31); +#else + unsigned short sw; + __asm__ __volatile__ ("fxam;" + "fstsw %%ax": "=a" (sw) : "t" (_x)); + return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) + == FP_NAN; +#endif + } + + __CRT_INLINE int __cdecl __isnanl (long double _x) + { + unsigned short sw; + __asm__ __volatile__ ("fxam;" + "fstsw %%ax": "=a" (sw) : "t" (_x)); + return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) + == FP_NAN; + } +#endif + +#define isnan(x) (sizeof (x) == sizeof (float) ? __isnanf (x) \ + : sizeof (x) == sizeof (double) ? __isnan (x) \ + : __isnanl (x)) + +/* 7.12.3.5 */ +#define isnormal(x) (fpclassify(x) == FP_NORMAL) + +/* 7.12.3.6 The signbit macro */ + extern int __cdecl __signbit (double); + extern int __cdecl __signbitf (float); + extern int __cdecl __signbitl (long double); +#ifndef __CRT__NO_INLINE + __CRT_INLINE int __cdecl __signbit (double x) { +#ifdef __x86_64__ + __mingw_dbl_type_t hlp; + + hlp.x = x; + return ((hlp.lh.high & 0x80000000) != 0); +#else + unsigned short stw; + __asm__ __volatile__ ( "fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); + return stw & 0x0200; +#endif + } + + __CRT_INLINE int __cdecl __signbitf (float x) { +#ifdef __x86_64__ + __mingw_flt_type_t hlp; + hlp.x = x; + return ((hlp.val & 0x80000000) != 0); +#else + unsigned short stw; + __asm__ __volatile__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); + return stw & 0x0200; +#endif + } + + __CRT_INLINE int __cdecl __signbitl (long double x) { + unsigned short stw; + __asm__ __volatile__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); + return stw & 0x0200; + } +#endif + +#define signbit(x) (sizeof (x) == sizeof (float) ? __signbitf (x) \ + : sizeof (x) == sizeof (double) ? __signbit (x) \ + : __signbitl (x)) + +/* 7.12.4 Trigonometric functions: Double in C89 */ + extern float __cdecl sinf(float _X); + extern long double __cdecl sinl(long double); + + extern float __cdecl cosf(float _X); + extern long double __cdecl cosl(long double); + + extern float __cdecl tanf(float _X); + extern long double __cdecl tanl(long double); + extern float __cdecl asinf(float _X); + extern long double __cdecl asinl(long double); + + extern float __cdecl acosf (float); + extern long double __cdecl acosl (long double); + + extern float __cdecl atanf (float); + extern long double __cdecl atanl (long double); + + extern float __cdecl atan2f (float, float); + extern long double __cdecl atan2l (long double, long double); + +/* 7.12.5 Hyperbolic functions: Double in C89 */ + extern float __cdecl sinhf(float _X); +#ifndef __CRT__NO_INLINE + __CRT_INLINE float sinhf(float _X) { return ((float)sinh((double)_X)); } +#endif + extern long double __cdecl sinhl(long double); + + extern float __cdecl coshf(float _X); +#ifndef __CRT__NO_INLINE + __CRT_INLINE float coshf(float _X) { return ((float)cosh((double)_X)); } +#endif + extern long double __cdecl coshl(long double); + + extern float __cdecl tanhf(float _X); +#ifndef __CRT__NO_INLINE + __CRT_INLINE float tanhf(float _X) { return ((float)tanh((double)_X)); } +#endif + extern long double __cdecl tanhl(long double); + +/* Inverse hyperbolic trig functions */ +/* 7.12.5.1 */ + extern double __cdecl acosh (double); + extern float __cdecl acoshf (float); + extern long double __cdecl acoshl (long double); + +/* 7.12.5.2 */ + extern double __cdecl asinh (double); + extern float __cdecl asinhf (float); + extern long double __cdecl asinhl (long double); + +/* 7.12.5.3 */ + extern double __cdecl atanh (double); + extern float __cdecl atanhf (float); + extern long double __cdecl atanhl (long double); + +/* Exponentials and logarithms */ +/* 7.12.6.1 Double in C89 */ + extern float __cdecl expf(float _X); +#ifndef __CRT__NO_INLINE + __CRT_INLINE float expf(float _X) { return ((float)exp((double)_X)); } +#endif + extern long double __cdecl expl(long double); + +/* 7.12.6.2 */ + extern double __cdecl exp2(double); + extern float __cdecl exp2f(float); + extern long double __cdecl exp2l(long double); + +/* 7.12.6.3 The expm1 functions */ +/* TODO: These could be inlined */ + extern double __cdecl expm1(double); + extern float __cdecl expm1f(float); + extern long double __cdecl expm1l(long double); + +/* 7.12.6.4 Double in C89 */ + extern float frexpf(float _X,int *_Y); +#ifndef __CRT__NO_INLINE + __CRT_INLINE float frexpf(float _X,int *_Y) { return ((float)frexp((double)_X,_Y)); } +#endif + extern long double __cdecl frexpl(long double,int *); + +/* 7.12.6.5 */ +#define FP_ILOGB0 ((int)0x80000000) +#define FP_ILOGBNAN ((int)0x80000000) + extern int __cdecl ilogb (double); + extern int __cdecl ilogbf (float); + extern int __cdecl ilogbl (long double); + +/* 7.12.6.6 Double in C89 */ + extern float __cdecl ldexpf(float _X,int _Y); +#ifndef __CRT__NO_INLINE + __CRT_INLINE float __cdecl ldexpf (float x, int expn) { return (float) ldexp ((double)x, expn); } +#endif + extern long double __cdecl ldexpl (long double, int); + +/* 7.12.6.7 Double in C89 */ + extern float __cdecl logf (float); + extern long double __cdecl logl(long double); + +/* 7.12.6.8 Double in C89 */ + extern float __cdecl log10f (float); + extern long double __cdecl log10l(long double); + +/* 7.12.6.9 */ + extern double __cdecl log1p(double); + extern float __cdecl log1pf(float); + extern long double __cdecl log1pl(long double); + +/* 7.12.6.10 */ + extern double __cdecl log2 (double); + extern float __cdecl log2f (float); + extern long double __cdecl log2l (long double); + +/* 7.12.6.11 */ + extern double __cdecl logb (double); + extern float __cdecl logbf (float); + extern long double __cdecl logbl (long double); + +/* Inline versions. GCC-4.0+ can do a better fast-math optimization + with __builtins. */ +#ifndef __CRT__NO_INLINE +#if !(__MINGW_GNUC_PREREQ (4, 0) && defined (__FAST_MATH__)) + __CRT_INLINE double __cdecl logb (double x) + { +#ifdef __x86_64__ + __mingw_dbl_type_t hlp; + int lx, hx; + + hlp.x = x; + lx = hlp.lh.low; + hx = hlp.lh.high & 0x7fffffff; /* high |x| */ + if ((hx | lx) == 0) + return -1.0 / fabs (x); + if (hx >= 0x7ff00000) + return x * x; + if ((hx >>= 20) == 0) /* IEEE 754 logb */ + return -1022.0; + return (double) (hx - 1023); +#else + double res = 0.0; + __asm__ __volatile__ ("fxtract\n\t" + "fstp %%st" : "=t" (res) : "0" (x)); + return res; +#endif + } + + __CRT_INLINE float __cdecl logbf (float x) + { +#ifdef __x86_64__ + int v; + __mingw_flt_type_t hlp; + + hlp.x = x; + v = hlp.val & 0x7fffffff; /* high |x| */ + if (!v) + return (float)-1.0 / fabsf (x); + if (v >= 0x7f800000) + return x * x; + if ((v >>= 23) == 0) /* IEEE 754 logb */ + return -126.0; + return (float) (v - 127); +#else + float res = 0.0F; + __asm__ __volatile__ ("fxtract\n\t" + "fstp %%st" : "=t" (res) : "0" (x)); + return res; +#endif + } + + __CRT_INLINE long double __cdecl logbl (long double x) + { + long double res = 0.0l; + __asm__ __volatile__ ("fxtract\n\t" + "fstp %%st" : "=t" (res) : "0" (x)); + return res; + } +#endif /* !defined __FAST_MATH__ || !__MINGW_GNUC_PREREQ (4, 0) */ +#endif /* __CRT__NO_INLINE */ + +/* 7.12.6.12 Double in C89 */ + extern float __cdecl modff (float, float*); + extern long double __cdecl modfl (long double, long double*); + +/* 7.12.6.13 */ + extern double __cdecl scalbn (double, int); + extern float __cdecl scalbnf (float, int); + extern long double __cdecl scalbnl (long double, int); + + extern double __cdecl scalbln (double, long); + extern float __cdecl scalblnf (float, long); + extern long double __cdecl scalblnl (long double, long); + +/* 7.12.7.1 */ +/* Implementations adapted from Cephes versions */ + extern double __cdecl cbrt (double); + extern float __cdecl cbrtf (float); + extern long double __cdecl cbrtl (long double); + +/* 7.12.7.3 */ + extern double __cdecl hypot (double, double); + extern float __cdecl hypotf (float x, float y); +#ifndef __CRT__NO_INLINE + __CRT_INLINE float __cdecl hypotf (float x, float y) { return (float) hypot ((double)x, (double)y);} +#endif + extern long double __cdecl hypotl (long double, long double); + +/* 7.12.7.4 The pow functions. Double in C89 */ + extern float __cdecl powf(float _X,float _Y); +#ifndef __CRT__NO_INLINE + __CRT_INLINE float powf(float _X,float _Y) { return ((float)pow((double)_X,(double)_Y)); } +#endif + extern long double __cdecl powl (long double, long double); + +/* 7.12.7.5 The sqrt functions. Double in C89. */ + extern float __cdecl sqrtf (float); + extern long double sqrtl(long double); + +/* 7.12.8.1 The erf functions */ + extern double __cdecl erf (double); + extern float __cdecl erff (float); + extern long double __cdecl erfl (long double); + +/* 7.12.8.2 The erfc functions */ + extern double __cdecl erfc (double); + extern float __cdecl erfcf (float); + extern long double __cdecl erfcl (long double); + +/* 7.12.8.3 The lgamma functions */ + extern double __cdecl lgamma (double); + extern float __cdecl lgammaf (float); + extern long double __cdecl lgammal (long double); + +/* 7.12.8.4 The tgamma functions */ + extern double __cdecl tgamma (double); + extern float __cdecl tgammaf (float); + extern long double __cdecl tgammal (long double); + +/* 7.12.9.1 Double in C89 */ + extern float __cdecl ceilf (float); + extern long double __cdecl ceill (long double); + +/* 7.12.9.2 Double in C89 */ + extern float __cdecl floorf (float); + extern long double __cdecl floorl (long double); + +/* 7.12.9.3 */ + extern double __cdecl nearbyint ( double); + extern float __cdecl nearbyintf (float); + extern long double __cdecl nearbyintl (long double); + +/* 7.12.9.4 */ +/* round, using fpu control word settings */ +extern double __cdecl rint (double); +extern float __cdecl rintf (float); +extern long double __cdecl rintl (long double); + +/* 7.12.9.5 */ +extern long __cdecl lrint (double); +extern long __cdecl lrintf (float); +extern long __cdecl lrintl (long double); + +__MINGW_EXTENSION long long __cdecl llrint (double); +__MINGW_EXTENSION long long __cdecl llrintf (float); +__MINGW_EXTENSION long long __cdecl llrintl (long double); + +/* Inline versions of above. + GCC 4.0+ can do a better fast-math job with __builtins. */ + +#ifndef __CRT__NO_INLINE +#if !(__MINGW_GNUC_PREREQ (4, 0) && defined __FAST_MATH__ ) + __CRT_INLINE double __cdecl rint (double x) + { + double retval = 0.0; + __asm__ __volatile__ ("frndint;": "=t" (retval) : "0" (x)); + return retval; + } + + __CRT_INLINE float __cdecl rintf (float x) + { + float retval = 0.0; + __asm__ __volatile__ ("frndint;" : "=t" (retval) : "0" (x) ); + return retval; + } + + __CRT_INLINE long double __cdecl rintl (long double x) + { + long double retval = 0.0l; + __asm__ __volatile__ ("frndint;" : "=t" (retval) : "0" (x) ); + return retval; + } + + __CRT_INLINE long __cdecl lrint (double x) + { + long retval = 0; + __asm__ __volatile__ \ + ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \ + return retval; + } + + __CRT_INLINE long __cdecl lrintf (float x) + { + long retval = 0; + __asm__ __volatile__ \ + ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \ + return retval; + } + + __CRT_INLINE long __cdecl lrintl (long double x) + { + long retval = 0; + __asm__ __volatile__ \ + ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \ + return retval; + } + + __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrint (double x) + { + __MINGW_EXTENSION long long retval = 0ll; + __asm__ __volatile__ \ + ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \ + return retval; + } + + __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrintf (float x) + { + __MINGW_EXTENSION long long retval = 0ll; + __asm__ __volatile__ \ + ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \ + return retval; + } + + __MINGW_EXTENSION __CRT_INLINE long long __cdecl llrintl (long double x) + { + __MINGW_EXTENSION long long retval = 0ll; + __asm__ __volatile__ \ + ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \ + return retval; + } +#endif /* !__FAST_MATH__ || !__MINGW_GNUC_PREREQ (4,0) */ +#endif /* !__CRT__NO_INLINE */ + +/* 7.12.9.6 */ +/* round away from zero, regardless of fpu control word settings */ + extern double __cdecl round (double); + extern float __cdecl roundf (float); + extern long double __cdecl roundl (long double); + +/* 7.12.9.7 */ + extern long __cdecl lround (double); + extern long __cdecl lroundf (float); + extern long __cdecl lroundl (long double); + __MINGW_EXTENSION long long __cdecl llround (double); + __MINGW_EXTENSION long long __cdecl llroundf (float); + __MINGW_EXTENSION long long __cdecl llroundl (long double); + +/* 7.12.9.8 */ +/* round towards zero, regardless of fpu control word settings */ + extern double __cdecl trunc (double); + extern float __cdecl truncf (float); + extern long double __cdecl truncl (long double); + +/* 7.12.10.1 Double in C89 */ + extern float __cdecl fmodf (float, float); + extern long double __cdecl fmodl (long double, long double); + +/* 7.12.10.2 */ + extern double __cdecl remainder (double, double); + extern float __cdecl remainderf (float, float); + extern long double __cdecl remainderl (long double, long double); + +/* 7.12.10.3 */ + extern double __cdecl remquo(double, double, int *); + extern float __cdecl remquof(float, float, int *); + extern long double __cdecl remquol(long double, long double, int *); + +/* 7.12.11.1 */ + extern double __cdecl copysign (double, double); /* in libmoldname.a */ + extern float __cdecl copysignf (float, float); + extern long double __cdecl copysignl (long double, long double); + +#ifndef __CRT__NO_INLINE +#if !defined (__ia64__) + __CRT_INLINE double __cdecl copysign (double x, double y) + { + __mingw_dbl_type_t hx, hy; + hx.x = x; hy.x = y; + hx.lh.high = (hx.lh.high & 0x7fffffff) | (hy.lh.high & 0x80000000); + return hx.x; + } + __CRT_INLINE float __cdecl copysignf (float x, float y) + { + __mingw_flt_type_t hx, hy; + hx.x = x; hy.x = y; + hx.val = (hx.val & 0x7fffffff) | (hy.val & 0x80000000); + return hx.x; + } +#endif +#endif + +/* 7.12.11.2 Return a NaN */ + extern double __cdecl nan(const char *tagp); + extern float __cdecl nanf(const char *tagp); + extern long double __cdecl nanl(const char *tagp); + +#ifndef __STRICT_ANSI__ +#define _nan() nan("") +#define _nanf() nanf("") +#define _nanl() nanl("") +#endif + +/* 7.12.11.3 */ + extern double __cdecl nextafter (double, double); /* in libmoldname.a */ + extern float __cdecl nextafterf (float, float); + extern long double __cdecl nextafterl (long double, long double); + +/* 7.12.11.4 The nexttoward functions */ + extern double __cdecl nexttoward (double, long double); + extern float __cdecl nexttowardf (float, long double); + extern long double __cdecl nexttowardl (long double, long double); + +/* 7.12.12.1 */ +/* x > y ? (x - y) : 0.0 */ + extern double __cdecl fdim (double x, double y); + extern float __cdecl fdimf (float x, float y); + extern long double __cdecl fdiml (long double x, long double y); + +/* fmax and fmin. + NaN arguments are treated as missing data: if one argument is a NaN + and the other numeric, then these functions choose the numeric + value. */ + +/* 7.12.12.2 */ + extern double __cdecl fmax (double, double); + extern float __cdecl fmaxf (float, float); + extern long double __cdecl fmaxl (long double, long double); + +/* 7.12.12.3 */ + extern double __cdecl fmin (double, double); + extern float __cdecl fminf (float, float); + extern long double __cdecl fminl (long double, long double); + +/* 7.12.13.1 */ +/* return x * y + z as a ternary op */ + extern double __cdecl fma (double, double, double); + extern float __cdecl fmaf (float, float, float); + extern long double __cdecl fmal (long double, long double, long double); + +/* 7.12.14 */ +/* + * With these functions, comparisons involving quiet NaNs set the FP + * condition code to "unordered". The IEEE floating-point spec + * dictates that the result of floating-point comparisons should be + * false whenever a NaN is involved, with the exception of the != op, + * which always returns true: yes, (NaN != NaN) is true). + */ + +#if __GNUC__ >= 3 + +#define isgreater(x, y) __builtin_isgreater(x, y) +#define isgreaterequal(x, y) __builtin_isgreaterequal(x, y) +#define isless(x, y) __builtin_isless(x, y) +#define islessequal(x, y) __builtin_islessequal(x, y) +#define islessgreater(x, y) __builtin_islessgreater(x, y) +#define isunordered(x, y) __builtin_isunordered(x, y) + +#else +/* helper */ +#ifndef __CRT__NO_INLINE + __CRT_INLINE int __cdecl + __fp_unordered_compare (long double x, long double y){ + unsigned short retval; + __asm__ __volatile__ ("fucom %%st(1);" + "fnstsw;": "=a" (retval) : "t" (x), "u" (y)); + return retval; + } +#endif + +#define isgreater(x, y) ((__fp_unordered_compare(x, y) & 0x4500) == 0) +#define isless(x, y) ((__fp_unordered_compare (y, x) & 0x4500) == 0) +#define isgreaterequal(x, y) ((__fp_unordered_compare (x, y) & FP_INFINITE) == 0) +#define islessequal(x, y) ((__fp_unordered_compare(y, x) & FP_INFINITE) == 0) +#define islessgreater(x, y) ((__fp_unordered_compare(x, y) & FP_SUBNORMAL) == 0) +#define isunordered(x, y) ((__fp_unordered_compare(x, y) & 0x4500) == 0x4500) + +#endif + +#endif /* __STDC_VERSION__ >= 199901L */ +#endif /* __NO_ISOCEXT */ + +#if defined(_X86_) && !defined(__x86_64) + _CRTIMP float __cdecl _hypotf(float _X,float _Y); +#endif + +#if !defined(__ia64__) + _CRTIMP float __cdecl _copysignf (float _Number,float _Sign); + _CRTIMP float __cdecl _chgsignf (float _X); + _CRTIMP float __cdecl _logbf(float _X); + _CRTIMP float __cdecl _nextafterf(float _X,float _Y); + _CRTIMP int __cdecl _finitef(float _X); + _CRTIMP int __cdecl _isnanf(float _X); + _CRTIMP int __cdecl _fpclassf(float _X); +#endif + +#ifdef _SIGN_DEFINED + extern long double __cdecl _chgsignl (long double); +#define _copysignl copysignl +#endif /* _SIGN_DEFINED */ + +#define _hypotl hypotl #ifndef NO_OLDNAMES -#define DOMAIN _DOMAIN -#define SING _SING -#define OVERFLOW _OVERFLOW -#define UNDERFLOW _UNDERFLOW -#define TLOSS _TLOSS -#define PLOSS _PLOSS #define matherr _matherr -#define HUGE _HUGE - // _CRTIMP double __cdecl cabs(struct _complex x); - #define cabs _cabs - _CRTIMP double __cdecl hypot(double x,double y); - _CRTIMP double __cdecl j0(double x); - _CRTIMP double __cdecl j1(double x); - _CRTIMP double __cdecl jn(int x,double y); - _CRTIMP double __cdecl y0(double x); - _CRTIMP double __cdecl y1(double x); - _CRTIMP double __cdecl yn(int x,double y); - __CRT_INLINE float __cdecl hypotf(float x, float y) { return (float) hypot (x, y); } +#define HUGE _HUGE #endif #ifdef __cplusplus } -extern "C++" { - template<class _Ty> inline _Ty _Pow_int(_Ty x,int y) { - unsigned int _N; - if(y >= 0) _N = (unsigned int)y; - else _N = (unsigned int)(-y); - for(_Ty _Z = _Ty(1);;x *= x) { - if((_N & 1)!=0) _Z *= x; - if((_N >>= 1)==0) return (y < 0 ? _Ty(1) / _Z : _Z); - } - } -} -#endif +#endif + +#endif /* Not RC_INVOKED */ #pragma pack(pop) -#endif /* !_INC_MATH */ - -#if defined(_USE_MATH_DEFINES) && !defined(_MATH_DEFINES_DEFINED) -#define _MATH_DEFINES_DEFINED - -#define M_E 2.71828182845904523536 -#define M_LOG2E 1.44269504088896340736 -#define M_LOG10E 0.434294481903251827651 -#define M_LN2 0.693147180559945309417 -#define M_LN10 2.30258509299404568402 -#define M_PI 3.14159265358979323846 -#define M_PI_2 1.57079632679489661923 -#define M_PI_4 0.785398163397448309616 -#define M_1_PI 0.318309886183790671538 -#define M_2_PI 0.636619772367581343076 -#define M_2_SQRTPI 1.12837916709551257390 -#define M_SQRT2 1.41421356237309504880 -#define M_SQRT1_2 0.707106781186547524401 - -#endif /* _USE_MATH_DEFINES */ +#endif /* End _MATH_H_ */ +

1 0

[tfaber] 56988: [CMAKE] - Revert 56985 for now, as it apparently breaks syscalls See issue #7218 for more details.
by tfaber＠svn.reactos.org 29 Jul '12

29 Jul '12

Author: tfaber Date: Sun Jul 29 23:24:02 2012 New Revision: 56988 URL: http://svn.reactos.org/svn/reactos?rev=56988&view=rev Log: [CMAKE] - Revert 56985 for now, as it apparently breaks syscalls See issue #7218 for more details. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=56988&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Jul 29 23:24:02 2012 @@ -81,7 +81,7 @@ add_compile_flags("-fno-strict-aliasing") if(ARCH MATCHES i386) - add_compile_flags("-mpreferred-stack-boundary=4 -fno-set-stack-executable -fno-optimize-sibling-calls -fno-omit-frame-pointer") + add_compile_flags("-mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls -fno-omit-frame-pointer") if(OPTIMIZE STREQUAL "1") add_compile_flags("-ftracer -momit-leaf-frame-pointer") endif()

1 0

[jgardou] 56987: [INCLUDE] - Update gl.h from Mesa 8.0.4
by jgardou＠svn.reactos.org 29 Jul '12

29 Jul '12

Author: jgardou Date: Sun Jul 29 23:07:34 2012 New Revision: 56987 URL: http://svn.reactos.org/svn/reactos?rev=56987&view=rev Log: [INCLUDE] - Update gl.h from Mesa 8.0.4 Modified: trunk/reactos/include/GL/gl.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/GL/gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/GL/gl.h?rev=56987&…

1 0

[fireball] 56986: [NTOS/ARM3] - Implement MiProtectVirtualMemory for VAD based allocator (it's very similar to the already implemented MiSetProtectionOnSection function). However it still doesn't f...
by fireball＠svn.reactos.org 29 Jul '12

29 Jul '12

Author: fireball Date: Sun Jul 29 22:18:23 2012 New Revision: 56986 URL: http://svn.reactos.org/svn/reactos?rev=56986&view=rev Log: [NTOS/ARM3] - Implement MiProtectVirtualMemory for VAD based allocator (it's very similar to the already implemented MiSetProtectionOnSection function). However it still doesn't fully work because support in other functions is missing (failed assertions in MiFlushTbAndCapture). See issue #7216 for more details. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Jul 29 22:18:23 2012 @@ -25,6 +25,15 @@ IN OUT PSIZE_T NumberOfBytesToProtect, IN ULONG NewAccessProtection, OUT PULONG OldAccessProtection OPTIONAL); + +VOID +NTAPI +MiFlushTbAndCapture(IN PMMVAD FoundVad, + IN PMMPTE PointerPte, + IN ULONG ProtectionMask, + IN PMMPFN Pfn1, + IN BOOLEAN CaptureDirtyBit); + /* PRIVATE FUNCTIONS **********************************************************/ @@ -1719,7 +1728,17 @@ OUT PULONG OldAccessProtection OPTIONAL) { PMEMORY_AREA MemoryArea; - + PMMVAD Vad; + PMMSUPPORT AddressSpace; + ULONG_PTR StartingAddress, EndingAddress; + PMMPTE PointerPde, PointerPte, LastPte; + MMPTE PteContents; + PUSHORT UsedPageTableEntries; + PMMPFN Pfn1; + ULONG ProtectionMask; + NTSTATUS Status = STATUS_SUCCESS; + + /* Check for ROS specific memory area */ MemoryArea = MmLocateMemoryAreaByAddress(&Process->Vm, *BaseAddress); if ((MemoryArea) && (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW)) { @@ -1730,8 +1749,175 @@ OldAccessProtection); } - UNIMPLEMENTED; - return STATUS_CONFLICTING_ADDRESSES; + /* Calcualte base address for the VAD */ + StartingAddress = (ULONG_PTR)PAGE_ALIGN((*BaseAddress)); + EndingAddress = (((ULONG_PTR)*BaseAddress + *NumberOfBytesToProtect - 1) | (PAGE_SIZE - 1)); + + /* Calculate the protection mask and make sure it's valid */ + ProtectionMask = MiMakeProtectionMask(NewAccessProtection); + if (ProtectionMask == MM_INVALID_PROTECTION) + { + DPRINT1("Invalid protection mask\n"); + return STATUS_INVALID_PAGE_PROTECTION; + } + + /* Lock the address space and make sure the process isn't already dead */ + AddressSpace = MmGetCurrentAddressSpace(); + MmLockAddressSpace(AddressSpace); + if (Process->VmDeleted) + { + DPRINT1("Process is dying\n"); + Status = STATUS_PROCESS_IS_TERMINATING; + goto FailPath; + } + + /* Get the VAD for this address range, and make sure it exists */ + Vad = (PMMVAD)MiCheckForConflictingNode(StartingAddress >> PAGE_SHIFT, + EndingAddress >> PAGE_SHIFT, + &Process->VadRoot); + if (!Vad) + { + DPRINT("Could not find a VAD for this allocation\n"); + Status = STATUS_CONFLICTING_ADDRESSES; + goto FailPath; + } + + /* Make sure the address is within this VAD's boundaries */ + if ((((ULONG_PTR)StartingAddress >> PAGE_SHIFT) < Vad->StartingVpn) || + (((ULONG_PTR)EndingAddress >> PAGE_SHIFT) > Vad->EndingVpn)) + { + Status = STATUS_CONFLICTING_ADDRESSES; + goto FailPath; + } + + /* These kinds of VADs are not supported atm */ + if ((Vad->u.VadFlags.VadType == VadAwe) || + (Vad->u.VadFlags.VadType == VadDevicePhysicalMemory) || + (Vad->u.VadFlags.VadType == VadLargePages)) + { + DPRINT1("Illegal VAD for attempting to set protection\n"); + Status = STATUS_CONFLICTING_ADDRESSES; + goto FailPath; + } + + /* Check for a VAD whose protection can't be changed */ + if (Vad->u.VadFlags.NoChange == 1) + { + DPRINT1("Trying to change protection of a NoChange VAD\n"); + Status = STATUS_INVALID_PAGE_PROTECTION; + goto FailPath; + } + + if (Vad->u.VadFlags.PrivateMemory == 0) + { + /* This is a section, handled by the ROS specific code above */ + UNIMPLEMENTED; + } + else + { + /* Private memory, check protection flags */ + if ((NewAccessProtection & PAGE_WRITECOPY) || + (NewAccessProtection & PAGE_EXECUTE_WRITECOPY)) + { + Status = STATUS_INVALID_PARAMETER_4; + goto FailPath; + } + + //MiLockProcessWorkingSet(Thread, Process); + + /* TODO: Check if all pages in this range are committed */ + + /* Compute starting and ending PTE and PDE addresses */ + PointerPde = MiAddressToPde(StartingAddress); + PointerPte = MiAddressToPte(StartingAddress); + LastPte = MiAddressToPte(EndingAddress); + + /* Make this PDE valid */ + MiMakePdeExistAndMakeValid(PointerPde, Process, MM_NOIRQL); + + /* Save protection of the first page */ + if (PointerPte->u.Long != 0) + { + /* Capture the page protection and make the PDE valid */ + *OldAccessProtection = MiGetPageProtection(PointerPte); + MiMakePdeExistAndMakeValid(PointerPde, Process, MM_NOIRQL); + } + else + { + /* Grab the old protection from the VAD itself */ + *OldAccessProtection = MmProtectToValue[Vad->u.VadFlags.Protection]; + } + + /* Loop all the PTEs now */ + while (PointerPte <= LastPte) + { + /* Check if we've crossed a PDE boundary and make the new PDE valid too */ + if ((((ULONG_PTR)PointerPte) & (SYSTEM_PD_SIZE - 1)) == 0) + { + PointerPde = MiAddressToPte(PointerPte); + MiMakePdeExistAndMakeValid(PointerPde, Process, MM_NOIRQL); + } + + /* Capture the PTE and see what we're dealing with */ + PteContents = *PointerPte; + if (PteContents.u.Long == 0) + { + /* This used to be a zero PTE and it no longer is, so we must add a + reference to the pagetable. */ + UsedPageTableEntries = &MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(MiPteToAddress(PointerPte))]; + (*UsedPageTableEntries)++; + ASSERT((*UsedPageTableEntries) <= PTE_COUNT); + } + else if (PteContents.u.Hard.Valid == 1) + { + /* Get the PFN entry */ + Pfn1 = MiGetPfnEntry(PFN_FROM_PTE(&PteContents)); + + /* We don't support this yet */ + ASSERT(Pfn1->u3.e1.PrototypePte == 0); + + /* Check if the page should not be accessible at all */ + if ((NewAccessProtection & PAGE_NOACCESS) || + (NewAccessProtection & PAGE_GUARD)) + { + /* TODO */ + UNIMPLEMENTED; + } + + /* Write the protection mask and write it with a TLB flush */ + Pfn1->OriginalPte.u.Soft.Protection = ProtectionMask; + MiFlushTbAndCapture(Vad, + PointerPte, + ProtectionMask, + Pfn1, + TRUE); + } + else + { + /* We don't support these cases yet */ + ASSERT(PteContents.u.Soft.Prototype == 0); + ASSERT(PteContents.u.Soft.Transition == 0); + + /* The PTE is already demand-zero, just update the protection mask */ + PointerPte->u.Soft.Protection = ProtectionMask; + } + + PointerPte++; + } + + /* Unlock the working set and update quota charges if needed, then return */ + //MiUnlockProcessWorkingSet(Thread, Process); + } + +FailPath: + /* Unlock the address space */ + MmUnlockAddressSpace(AddressSpace); + + /* Return parameters */ + *NumberOfBytesToProtect = (SIZE_T)((PUCHAR)EndingAddress - (PUCHAR)StartingAddress + 1); + *BaseAddress = (PVOID)StartingAddress; + + return Status; } VOID

1 0

[tfaber] 56985: [CMAKE] - Align the stack on a 16-byte boundary for x86 like any sensible compiler would, anyway. Should fix weird GCC 4.7 behavior.
by tfaber＠svn.reactos.org 29 Jul '12

29 Jul '12

Author: tfaber Date: Sun Jul 29 18:19:40 2012 New Revision: 56985 URL: http://svn.reactos.org/svn/reactos?rev=56985&view=rev Log: [CMAKE] - Align the stack on a 16-byte boundary for x86 like any sensible compiler would, anyway. Should fix weird GCC 4.7 behavior. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=56985&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Jul 29 18:19:40 2012 @@ -81,7 +81,7 @@ add_compile_flags("-fno-strict-aliasing") if(ARCH MATCHES i386) - add_compile_flags("-mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls -fno-omit-frame-pointer") + add_compile_flags("-mpreferred-stack-boundary=4 -fno-set-stack-executable -fno-optimize-sibling-calls -fno-omit-frame-pointer") if(OPTIMIZE STREQUAL "1") add_compile_flags("-ftracer -momit-leaf-frame-pointer") endif()

1 0

[hpoussin] 56984: [FREELDR] Seek to correct sector number, even after ~4GB. See issue #6669 for more details.
by hpoussin＠svn.reactos.org 29 Jul '12

29 Jul '12

Author: hpoussin Date: Sun Jul 29 17:36:31 2012 New Revision: 56984 URL: http://svn.reactos.org/svn/reactos?rev=56984&view=rev Log: [FREELDR] Seek to correct sector number, even after ~4GB. See issue #6669 for more details. Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Sun Jul 29 17:36:31 2012 @@ -1338,7 +1338,7 @@ // // Seek to right position // - Position.HighPart = SectorNumber >> 9; + Position.HighPart = SectorNumber >> 23; Position.LowPart = SectorNumber << 9; ret = ArcSeek(Volume->DeviceId, &Position, SeekAbsolute); if (ret != ESUCCESS)

1 0

[tkreuzer] 56983: [INCLUDES] - Add _PRAGMA_WARNING_SUPPRESS() macro - Fix definition of __analysis_noreturn for PREFAST runs - Annotate RtlAssert with __analysis_noreturn everywhere - Add proper an...
by tkreuzer＠svn.reactos.org 29 Jul '12

29 Jul '12

Author: tkreuzer Date: Sun Jul 29 17:25:05 2012 New Revision: 56983 URL: http://svn.reactos.org/svn/reactos?rev=56983&view=rev Log: [INCLUDES] - Add _PRAGMA_WARNING_SUPPRESS() macro - Fix definition of __analysis_noreturn for PREFAST runs - Annotate RtlAssert with __analysis_noreturn everywhere - Add proper annotations to all DbgPrint and DbgPrintEx definitions - Suppress warnings for use of ProbeForRead outside of SEH Modified: trunk/reactos/include/crt/mingw32/intrin.h trunk/reactos/include/crt/msc/intrin.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/psdk/specstrings.h trunk/reactos/include/reactos/debug.h trunk/reactos/include/reactos/probe.h Modified: trunk/reactos/include/crt/mingw32/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin.h [iso-8859-1] Sun Jul 29 17:25:05 2012 @@ -30,6 +30,7 @@ #ifndef RC_INVOKED +#define _PRAGMA_WARNING_SUPPRESS(x) /* Only for MSVC */ #define __INTRIN_INLINE extern __inline__ __attribute__((__always_inline__,__gnu_inline__)) #ifndef _SIZE_T_DEFINED Modified: trunk/reactos/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/msc/intrin.h?r… ============================================================================== --- trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] Sun Jul 29 17:25:05 2012 @@ -4,6 +4,9 @@ #ifdef __cplusplus extern "C" { #endif + +/** Pragma support **/ +#define _PRAGMA_WARNING_SUPPRESS(x) __pragma(warning(suppress: x)) /*** Stack frame juggling ***/ void * _ReturnAddress(void); Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sun Jul 29 17:25:05 2012 @@ -593,6 +593,7 @@ IN PVECTORED_EXCEPTION_HANDLER VectoredHandler ); +__analysis_noreturn NTSYSAPI VOID NTAPI Modified: trunk/reactos/include/psdk/specstrings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/specstrings.h… ============================================================================== --- trunk/reactos/include/psdk/specstrings.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/specstrings.h [iso-8859-1] Sun Jul 29 17:25:05 2012 @@ -46,16 +46,17 @@ #define __in_awcount(expr,size) #define __nullnullterminated #define __in_data_source(src_sym) -#define __analysis_noreturn #define __kernel_entry #if (_MSC_VER >= 1000) && !defined(__midl) && defined(_PREFAST_) #define __inner_data_source(src_raw) _SA_annotes1(SAL_untrusted_data_source,src_raw) #define __out_data_source(src_sym) _Post_ __inner_data_source(#src_sym) +#define __analysis_noreturn __declspec(noreturn) #else #define __out_data_source(src_sym) +#define __analysis_noreturn #endif Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Sun Jul 29 17:25:05 2012 @@ -27,20 +27,21 @@ ULONG __cdecl DbgPrint( - IN PCCH Format, - IN ... + _In_z_ _Printf_format_string_ PCSTR Format, + ... ); NTSYSAPI ULONG __cdecl DbgPrintEx( - IN ULONG ComponentId, - IN ULONG Level, - IN PCCH Format, - IN ... + _In_ ULONG ComponentId, + _In_ ULONG Level, + _In_z_ _Printf_format_string_ PCCH Format, + ... ); +__analysis_noreturn NTSYSAPI VOID NTAPI @@ -107,7 +108,7 @@ #define WARN_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) #define TRACE_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) #define INFO_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) - + #define ERR__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_ERROR_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) #define WARN__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) #define TRACE__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) @@ -124,7 +125,7 @@ #define WARN_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #define TRACE_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #define INFO_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) - + #define ERR__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #define WARN__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #define TRACE__(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) Modified: trunk/reactos/include/reactos/probe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/probe.h?re… ============================================================================== --- trunk/reactos/include/reactos/probe.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/probe.h [iso-8859-1] Sun Jul 29 17:25:05 2012 @@ -109,9 +109,8 @@ } /* Probe the array */ - ProbeForRead(ArrayPtr, - ArraySize, - Alignment); + _PRAGMA_WARNING_SUPPRESS(28125) /* Must be inside __try / __except block */ + ProbeForRead(ArrayPtr, ArraySize, Alignment); } static __inline @@ -131,9 +130,8 @@ } /* Probe the array */ - ProbeForWrite(ArrayPtr, - ArraySize, - Alignment); + _PRAGMA_WARNING_SUPPRESS(28125) /* Must be inside __try / __except block */ + ProbeForWrite(ArrayPtr, ArraySize, Alignment); } #endif /* _WIN32K_ */

1 0

[tkreuzer] 56982: [SPEC2DEF] Fix use of uninitialized variable warning
by tkreuzer＠svn.reactos.org 29 Jul '12

29 Jul '12

Author: tkreuzer Date: Sun Jul 29 15:49:29 2012 New Revision: 56982 URL: http://svn.reactos.org/svn/reactos?rev=56982&view=rev Log: [SPEC2DEF] Fix use of uninitialized variable warning Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Sun Jul 29 15:49:29 2012 @@ -705,7 +705,7 @@ char *pszSource, *pszDefFileName = 0, *pszStubFileName = 0, *pszLibStubName = 0; char achDllName[40]; FILE *file; - int result, i; + int result = 0, i; if (argc < 2) {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs