diff options
| author |   martynas <martynas@openbsd.org> | 2011-07-25 16:20:09 +0000 |
|---|---|---|
| committer | martynas <martynas@openbsd.org> | 2011-07-25 16:20:09 +0000 |
| commit | f5ce416ccaec8d9958a6d6ec8f89a3c89f69ca94 (patch) | |
| tree | 120b0f7d500732d8686d47d68c238688328a54a8 /lib/libm/src | |
| parent | Sort options alphabetically, from Tiago Cunha. (diff) | |
| download | wireguard-openbsd-f5ce416ccaec8d9958a6d6ec8f89a3c89f69ca94.tar.xz wireguard-openbsd-f5ce416ccaec8d9958a6d6ec8f89a3c89f69ca94.zip | |
Make huge constants actually long, so they don't overflow and become
infinite.
Diffstat (limited to 'lib/libm/src')
| -rw-r--r-- | lib/libm/src/ld80/s_ceill.c | 26 | ||||
| -rw-r--r-- | lib/libm/src/ld80/s_floorl.c | 26 |
2 files changed, 26 insertions, 26 deletions
diff --git a/lib/libm/src/ld80/s_ceill.c b/lib/libm/src/ld80/s_ceill.c index 5ad3d39dcac..bff5277806f 100644 --- a/lib/libm/src/ld80/s_ceill.c +++ b/lib/libm/src/ld80/s_ceill.c @@ -23,29 +23,29 @@ #include "math_private.h" -static const long double huge = 1.0e4930; +static const long double huge = 1.0e4930L; long double ceill(long double x) { - int32_t i1,j0; + int32_t i1,jj0; u_int32_t i,j,se,i0,sx; GET_LDOUBLE_WORDS(se,i0,i1,x); sx = (se>>15)&1; - j0 = (se&0x7fff)-0x3fff; - if(j0<31) { - if(j0<0) { /* raise inexact if x != 0 */ + jj0 = (se&0x7fff)-0x3fff; + if(jj0<31) { + if(jj0<0) { /* raise inexact if x != 0 */ if(huge+x>0.0) {/* return 0*sign(x) if |x|<1 */ if(sx) {se=0x8000;i0=0;i1=0;} else if((i0|i1)!=0) { se=0x3fff;i0=0;i1=0;} } } else { - i = (0x7fffffff)>>j0; + i = (0x7fffffff)>>jj0; if(((i0&i)|i1)==0) return x; /* x is integral */ if(huge+x>0.0) { /* raise inexact flag */ if(sx==0) { - if (j0>0 && (i0+(0x80000000>>j0))>i0) - i0+=0x80000000>>j0; + if (jj0>0 && (i0+(0x80000000>>jj0))>i0) + i0+=0x80000000>>jj0; else { i = 0x7fffffff; @@ -55,17 +55,17 @@ ceill(long double x) i0 &= (~i); i1=0; } } - } else if (j0>62) { - if(j0==0x4000) return x+x; /* inf or NaN */ + } else if (jj0>62) { + if(jj0==0x4000) return x+x; /* inf or NaN */ else return x; /* x is integral */ } else { - i = ((u_int32_t)(0xffffffff))>>(j0-31); + i = ((u_int32_t)(0xffffffff))>>(jj0-31); if((i1&i)==0) return x; /* x is integral */ if(huge+x>0.0) { /* raise inexact flag */ if(sx==0) { - if(j0==31) i0+=1; + if(jj0==31) i0+=1; else { - j = i1 + (1<<(63-j0)); + j = i1 + (1<<(63-jj0)); if(j<i1) i0+=1; /* got a carry */ i1 = j; } diff --git a/lib/libm/src/ld80/s_floorl.c b/lib/libm/src/ld80/s_floorl.c index d9f6ab08734..a1751ab9615 100644 --- a/lib/libm/src/ld80/s_floorl.c +++ b/lib/libm/src/ld80/s_floorl.c @@ -23,30 +23,30 @@ #include "math_private.h" -static const long double huge = 1.0e4930; +static const long double huge = 1.0e4930L; long double floorl(long double x) { - int32_t i1,j0; + int32_t i1,jj0; u_int32_t i,j,se,i0,sx; GET_LDOUBLE_WORDS(se,i0,i1,x); sx = (se>>15)&1; - j0 = (se&0x7fff)-0x3fff; - if(j0<31) { - if(j0<0) { /* raise inexact if x != 0 */ + jj0 = (se&0x7fff)-0x3fff; + if(jj0<31) { + if(jj0<0) { /* raise inexact if x != 0 */ if(huge+x>0.0) {/* return 0*sign(x) if |x|<1 */ if(sx==0) {se=0;i0=i1=0;} else if(((se&0x7fff)|i0|i1)!=0) { se=0xbfff;i0=i1=0;} } } else { - i = (0x7fffffff)>>j0; + i = (0x7fffffff)>>jj0; if(((i0&i)|i1)==0) return x; /* x is integral */ if(huge+x>0.0) { /* raise inexact flag */ if(sx) { - if (j0>0 && (i0+(0x80000000>>j0))>i0) - i0 += (0x80000000)>>j0; + if (jj0>0 && (i0+(0x80000000>>jj0))>i0) + i0 += (0x80000000)>>jj0; else { i = 0x7fffffff; @@ -56,17 +56,17 @@ floorl(long double x) i0 &= (~i); i1=0; } } - } else if (j0>62) { - if(j0==0x4000) return x+x; /* inf or NaN */ + } else if (jj0>62) { + if(jj0==0x4000) return x+x; /* inf or NaN */ else return x; /* x is integral */ } else { - i = ((u_int32_t)(0xffffffff))>>(j0-31); + i = ((u_int32_t)(0xffffffff))>>(jj0-31); if((i1&i)==0) return x; /* x is integral */ if(huge+x>0.0) { /* raise inexact flag */ if(sx) { - if(j0==31) i0+=1; + if(jj0==31) i0+=1; else { - j = i1+(1<<(63-j0)); + j = i1+(1<<(63-jj0)); if(j<i1) i0 +=1 ; /* got a carry */ i1=j; } |