diff --git a/External/cephes/src/128bit/atanll.c b/External/cephes/src/128bit/atanll.c index 5aaaf024e..ec9e793f4 100644 --- a/External/cephes/src/128bit/atanll.c +++ b/External/cephes/src/128bit/atanll.c @@ -132,13 +132,13 @@ if( f128_lt(&state, x, zero) ) if( f128_lt(&state, T3P8, x) ) { - y = PIO2L; + y = F128_PIO2L; x = f128_complement_sign( f128_div(&state, one, x)); } else if( f128_lt(&state, TP8, x) ) { - y = PIO4L; + y = F128_PIO4L; x = f128_div(&state, f128_sub(&state, x, one), f128_add(&state, x, one)); } else @@ -182,20 +182,20 @@ if( f128_eq(&state, x, zero) ) if( code & 1 ) { #if ANSIC - return( f128_complement_sign(PIO2L) ); + return( f128_complement_sign(F128_PIO2L) ); #else - return( f128_mul(&state, f_3_p0, PIO2L) ); + return( f128_mul(&state, f_3_p0, F128_PIO2L) ); #endif } if( f128_eq(&state, y, zero) ) return zero; - return( PIO2L ); + return( F128_PIO2L ); } if( f128_eq(&state, y, zero) ) { if( code & 2 ) - return( PIL ); + return( F128_PIL ); return zero; } @@ -205,13 +205,13 @@ switch( code ) #if ANSIC case 0: case 1: w = zero; break; - case 2: w = PIL; break; - case 3: w = f128_complement_sign(PIL); break; + case 2: w = F128_PIL; break; + case 3: w = f128_complement_sign(F128_PIL); break; #else case 0: w = zero; break; - case 1: w = f128_mul(&state, f_2_p0, PIL); break; + case 1: w = f128_mul(&state, f_2_p0, F128_PIL); break; case 2: - case 3: w = PIL; break; + case 3: w = F128_PIL; break; #endif } diff --git a/External/cephes/src/128bit/constll.c b/External/cephes/src/128bit/constll.c index 7abd351ed..45d8cb3b7 100644 --- a/External/cephes/src/128bit/constll.c +++ b/External/cephes/src/128bit/constll.c @@ -1,34 +1,34 @@ #include "mconf.h" /* (1 - 2^-113) 2^16384 */ -float128_t MAXNUML = {0xffffffffffffffffULL, 0x7ffeffffffffffffULL}; //1.189731495357231765085759326628007016196469e4932L; +float128_t F128_MAXNUML = {0xffffffffffffffffULL, 0x7ffeffffffffffffULL}; //1.189731495357231765085759326628007016196469e4932L; /* 2^-113 */ -float128_t MACHEPL = {0x0000000000000000ULL, 0x3f8e000000000000ULL}; // 9.629649721936179265279889712924636592690508e-35L; +float128_t F128_MACHEPL = {0x0000000000000000ULL, 0x3f8e000000000000ULL}; // 9.629649721936179265279889712924636592690508e-35L; /* (1 + 2^-112) 2^-16382 */ -float128_t UFTHRESHL = {0x0000000000000001ULL, 0x0001000000000000ULL}; // 3.362103143112093506262677817321753250115591e-4932L; +float128_t F128_UFTHRESHL = {0x0000000000000001ULL, 0x0001000000000000ULL}; // 3.362103143112093506262677817321753250115591e-4932L; /* 2^-16494 */ -float128_t MINNUML = {0x0000000000000001ULL, 0x0000000000000000ULL}; // 6.475175119438025110924438958227646552499569e-4966L; +float128_t F128_MINNUML = {0x0000000000000001ULL, 0x0000000000000000ULL}; // 6.475175119438025110924438958227646552499569e-4966L; /* ln(MAXNUM) */ -float128_t MAXLOGL = {0xf35793c7673007e6ULL, 0x400c62e42fefa39eULL}; // 1.1356523406294143949491931077970764891253E4L; +float128_t F128_MAXLOGL = {0xf35793c7673007e6ULL, 0x400c62e42fefa39eULL}; // 1.1356523406294143949491931077970764891253E4L; /* ln(MINNUM) */ -float128_t MINLOGL = {0x2c89d24d65e96274ULL, 0xc00c654628220780ULL}; // -1.143276959615573793352782661133116431383730e4L; +float128_t F128_MINLOGL = {0x2c89d24d65e96274ULL, 0xc00c654628220780ULL}; // -1.143276959615573793352782661133116431383730e4L; /* ln(UFTHRESH) */ -/* float128_t MINLOGL = -1.135513711193302405887309661372784853802025e4L; */ +/* float128_t F128_MINLOGL = -1.135513711193302405887309661372784853802025e4L; */ -float128_t PIL = {0x8469898cc51701b8ULL, 0x4000921fb54442d1ULL}; // 3.141592653589793238462643383279502884197169L; +float128_t F128_PIL = {0x8469898cc51701b8ULL, 0x4000921fb54442d1ULL}; // 3.141592653589793238462643383279502884197169L; -float128_t PIO2L = {0x8469898cc51701b8ULL, 0x3fff921fb54442d1ULL}; // 1.570796326794896619231321691639751442098585L; +float128_t F128_PIO2L = {0x8469898cc51701b8ULL, 0x3fff921fb54442d1ULL}; // 1.570796326794896619231321691639751442098585L; -float128_t PIO4L = {0x8469898cc51701b8ULL, 0x3ffe921fb54442d1ULL}; // 0.7853981633974483096156608458198757210492923L; +float128_t F128_PIO4L = {0x8469898cc51701b8ULL, 0x3ffe921fb54442d1ULL}; // 0.7853981633974483096156608458198757210492923L; -float128_t LOGE2L = {0xf35793c7673007e6ULL, 0x3ffe62e42fefa39eULL}; // 0.6931471805599453094172321214581765680755001L; +float128_t F128_LOGE2L = {0xf35793c7673007e6ULL, 0x3ffe62e42fefa39eULL}; // 0.6931471805599453094172321214581765680755001L; -float128_t LOG2EL = {0xe1777d0ffda0d23aULL, 0x3fff71547652b82fULL}; // 1.442695040888963407359924681001892137426646L; +float128_t F128_LOG2EL = {0xe1777d0ffda0d23aULL, 0x3fff71547652b82fULL}; // 1.442695040888963407359924681001892137426646L; -float128_t INFINITYL = {0x0000000000000000ULL, 0x7fff000000000000ULL}; // 1.0L / 0.0L; +float128_t F128_INFINITYL = {0x0000000000000000ULL, 0x7fff000000000000ULL}; // 1.0L / 0.0L; diff --git a/External/cephes/src/128bit/exp2ll.c b/External/cephes/src/128bit/exp2ll.c index 80e8a4a07..5b49157e1 100644 --- a/External/cephes/src/128bit/exp2ll.c +++ b/External/cephes/src/128bit/exp2ll.c @@ -82,7 +82,7 @@ static const float128_t zero = {0, 0}; static const float128_t f_0_p5 = {0, 0x3ffe000000000000ULL}; static const float128_t one = {0, 0x3fff000000000000ULL}; -extern float128_t MAXNUML; +extern float128_t F128_MAXNUML; float128_t cephes_f128_exp2l(float128_t x) { struct softfloat_state state = {}; @@ -92,7 +92,7 @@ int n; if( f128_le(&state, MAXL2, x)) { mtherr( fname, OVERFLOW ); - return( MAXNUML ); + return( F128_MAXNUML ); } if(f128_lt(&state, x, MINL2) ) diff --git a/External/cephes/src/128bit/floorll.c b/External/cephes/src/128bit/floorll.c index 30b537444..bf0521098 100644 --- a/External/cephes/src/128bit/floorll.c +++ b/External/cephes/src/128bit/floorll.c @@ -85,7 +85,7 @@ char *unkmsg = "ceill(), floorl(), frexpl(), ldexpl() must be rewritten!\n"; #define EXPOFS 0 #endif -extern float128_t MAXNUML; +extern float128_t F128_MAXNUML; static const float128_t zero = {0, 0}; diff --git a/External/cephes/src/128bit/mconf.h b/External/cephes/src/128bit/mconf.h index 7f0aeaf51..e30dee504 100644 --- a/External/cephes/src/128bit/mconf.h +++ b/External/cephes/src/128bit/mconf.h @@ -170,11 +170,11 @@ typedef struct extern int merror; /* Forward declarations */ -extern float128_t MINLOGL; +extern float128_t F128_MINLOGL; -extern float128_t MAXNUML; -extern float128_t PIL; -extern float128_t PIO2L, PIO4L; +extern float128_t F128_MAXNUML; +extern float128_t F128_PIL; +extern float128_t F128_PIO2L, F128_PIO4L; float128_t cephes_f128_atanl(float128_t x); #if ANSIC diff --git a/External/cephes/src/128bit/sinll.c b/External/cephes/src/128bit/sinll.c index 7d401e841..98ac38503 100644 --- a/External/cephes/src/128bit/sinll.c +++ b/External/cephes/src/128bit/sinll.c @@ -164,7 +164,7 @@ if( f128_lt(&state, lossth, x)) return zero; } -y = cephes_f128_floorl( f128_div(&state, x, PIO4L) ); /* integer part of x/PIO4 */ +y = cephes_f128_floorl( f128_div(&state, x, F128_PIO4L) ); /* integer part of x/PIO4 */ /* strip high bits of integer part to prevent integer overflow */ z = cephes_f128_ldexpl( y, -4 ); @@ -245,7 +245,7 @@ if( f128_lt(&state, lossth, x)) return zero; } -y = cephes_f128_floorl( f128_div(&state, x, PIO4L)); +y = cephes_f128_floorl( f128_div(&state, x, F128_PIO4L)); z = cephes_f128_ldexpl( y, -4 ); z = cephes_f128_floorl(z); /* integer part of y/8 */ z = f128_sub(&state, y, cephes_f128_ldexpl( z, 4 )); /* y - 16 * (y/16) */ diff --git a/External/cephes/src/128bit/tanll.c b/External/cephes/src/128bit/tanll.c index 56df8e4a6..94fc9ab75 100644 --- a/External/cephes/src/128bit/tanll.c +++ b/External/cephes/src/128bit/tanll.c @@ -138,7 +138,7 @@ struct softfloat_state state = {}; if( f128_eq(&state, x, zero) ) { mtherr( "cotl", SING ); - return( MAXNUML ); + return( F128_MAXNUML ); } return( tancotl(&state, x,1) ); } @@ -173,7 +173,7 @@ if (f128_lt(state, lossth, x)) } /* compute x mod PIO4 */ -y = cephes_f128_floorl( f128_div(state, x, PIO4L)); +y = cephes_f128_floorl( f128_div(state, x, F128_PIO4L)); /* strip high bits of integer part */ z = cephes_f128_ldexpl( y, -4 );