From c149db9037bae55786f77897ddb9c4bbd949fe43 Mon Sep 17 00:00:00 2001 From: Olaf Barthel Date: Fri, 24 Jul 2015 14:08:57 +0200 Subject: [PATCH] - The contents of the math_fmodf.c and math_modff.c did not match the names of the respective files. In fact, the contents of these files were swapped. --- library/math_fmodf.c | 103 ++++++++++++++++++++++++++++++------------- library/math_modff.c | 101 ++++++++++++------------------------------ 2 files changed, 102 insertions(+), 102 deletions(-) diff --git a/library/math_fmodf.c b/library/math_fmodf.c index 3c39be6..799c1f0 100644 --- a/library/math_fmodf.c +++ b/library/math_fmodf.c @@ -1,5 +1,5 @@ /* - * $Id: math_fmodf.c,v 1.3 2006-01-08 12:04:23 obarthel Exp $ + * $Id$ * * :ts=4 * @@ -53,39 +53,82 @@ /****************************************************************************/ -static const float one = 1.0; +static const float one = 1.0, Zero[] = {0.0, -0.0,}; float -modff(float x, float *iptr) +fmodf(float x, float y) { - LONG i0,j_0; - ULONG i; - GET_FLOAT_WORD(i0,x); - j_0 = ((i0>>23)&0xff)-0x7f; /* exponent of x */ - if(j_0<23) { /* integer part in x */ - if(j_0<0) { /* |x|<1 */ - SET_FLOAT_WORD(*iptr,i0&0x80000000U); /* *iptr = +-0 */ - return x; - } else { - i = (0x007fffff)>>j_0; - if((i0&i)==0) { /* x is integral */ - ULONG ix; - *iptr = x; - GET_FLOAT_WORD(ix,x); - SET_FLOAT_WORD(x,ix&0x80000000U); /* return +-0 */ - return x; - } else { - SET_FLOAT_WORD(*iptr,i0&(~i)); - return x - *iptr; - } - } - } else { /* no fraction part */ - ULONG ix; - *iptr = x*one; - GET_FLOAT_WORD(ix,x); - SET_FLOAT_WORD(x,ix&0x80000000U); /* return +-0 */ - return x; + LONG n,hx,hy,hz,ix,iy,sx,i; + + GET_FLOAT_WORD(hx,x); + GET_FLOAT_WORD(hy,y); + sx = hx&0x80000000U; /* sign of x */ + hx ^=sx; /* |x| */ + hy &= 0x7fffffff; /* |y| */ + + /* purge off exception values */ + if(hy==0||(hx>=0x7f800000)|| /* y=0,or x not finite */ + (hy>0x7f800000)) /* or y is NaN */ + return (x*y)/(x*y); + if(hx>31]; /* |x|=|y| return x*0*/ + + /* determine ix = ilogb(x) */ + if(hx<0x00800000) { /* subnormal x */ + for (ix = -126,i=(hx<<8); i>0; i<<=1) ix -=1; + } else ix = (hx>>23)-127; + + /* determine iy = ilogb(y) */ + if(hy<0x00800000) { /* subnormal y */ + for (iy = -126,i=(hy<<8); i>=0; i<<=1) iy -=1; + } else iy = (hy>>23)-127; + + /* set up {hx,lx}, {hy,ly} and align y to x */ + if(ix >= -126) + hx = 0x00800000|(0x007fffff&hx); + else { /* subnormal x, shift x to normal */ + n = -126-ix; + hx = hx<= -126) + hy = 0x00800000|(0x007fffff&hy); + else { /* subnormal y, shift y to normal */ + n = -126-iy; + hy = hy<>31]; + hx = hz+hz; + } + } + hz=hx-hy; + if(hz>=0) {hx=hz;} + + /* convert back to floating value and restore the sign */ + if(hx==0) /* return sign(x)*0 */ + return Zero[(ULONG)sx>>31]; + while(hx<0x00800000) { /* normalize x */ + hx = hx+hx; + iy -= 1; + } + if(iy>= -126) { /* normalize output */ + hx = ((hx-0x00800000)|((iy+127)<<23)); + SET_FLOAT_WORD(x,hx|sx); + } else { /* subnormal output */ + n = -126 - iy; + hx >>= n; + SET_FLOAT_WORD(x,hx|sx); + x *= one; /* create necessary signal */ + } + return x; /* exact output */ } /****************************************************************************/ diff --git a/library/math_modff.c b/library/math_modff.c index b08717f..ffe424b 100644 --- a/library/math_modff.c +++ b/library/math_modff.c @@ -1,5 +1,5 @@ /* - * $Id: math_modff.c,v 1.3 2006-01-08 12:04:23 obarthel Exp $ + * $Id$ * * :ts=4 * @@ -53,82 +53,39 @@ /****************************************************************************/ -static const float one = 1.0, Zero[] = {0.0, -0.0,}; +static const float one = 1.0; float -fmodf(float x, float y) +modff(float x, float *iptr) { - LONG n,hx,hy,hz,ix,iy,sx,i; - - GET_FLOAT_WORD(hx,x); - GET_FLOAT_WORD(hy,y); - sx = hx&0x80000000U; /* sign of x */ - hx ^=sx; /* |x| */ - hy &= 0x7fffffff; /* |y| */ - - /* purge off exception values */ - if(hy==0||(hx>=0x7f800000)|| /* y=0,or x not finite */ - (hy>0x7f800000)) /* or y is NaN */ - return (x*y)/(x*y); - if(hx>31]; /* |x|=|y| return x*0*/ - - /* determine ix = ilogb(x) */ - if(hx<0x00800000) { /* subnormal x */ - for (ix = -126,i=(hx<<8); i>0; i<<=1) ix -=1; - } else ix = (hx>>23)-127; - - /* determine iy = ilogb(y) */ - if(hy<0x00800000) { /* subnormal y */ - for (iy = -126,i=(hy<<8); i>=0; i<<=1) iy -=1; - } else iy = (hy>>23)-127; - - /* set up {hx,lx}, {hy,ly} and align y to x */ - if(ix >= -126) - hx = 0x00800000|(0x007fffff&hx); - else { /* subnormal x, shift x to normal */ - n = -126-ix; - hx = hx<= -126) - hy = 0x00800000|(0x007fffff&hy); - else { /* subnormal y, shift y to normal */ - n = -126-iy; - hy = hy<>31]; - hx = hz+hz; + LONG i0,j_0; + ULONG i; + GET_FLOAT_WORD(i0,x); + j_0 = ((i0>>23)&0xff)-0x7f; /* exponent of x */ + if(j_0<23) { /* integer part in x */ + if(j_0<0) { /* |x|<1 */ + SET_FLOAT_WORD(*iptr,i0&0x80000000U); /* *iptr = +-0 */ + return x; + } else { + i = (0x007fffff)>>j_0; + if((i0&i)==0) { /* x is integral */ + ULONG ix; + *iptr = x; + GET_FLOAT_WORD(ix,x); + SET_FLOAT_WORD(x,ix&0x80000000U); /* return +-0 */ + return x; + } else { + SET_FLOAT_WORD(*iptr,i0&(~i)); + return x - *iptr; + } } + } else { /* no fraction part */ + ULONG ix; + *iptr = x*one; + GET_FLOAT_WORD(ix,x); + SET_FLOAT_WORD(x,ix&0x80000000U); /* return +-0 */ + return x; } - hz=hx-hy; - if(hz>=0) {hx=hz;} - - /* convert back to floating value and restore the sign */ - if(hx==0) /* return sign(x)*0 */ - return Zero[(ULONG)sx>>31]; - while(hx<0x00800000) { /* normalize x */ - hx = hx+hx; - iy -= 1; - } - if(iy>= -126) { /* normalize output */ - hx = ((hx-0x00800000)|((iy+127)<<23)); - SET_FLOAT_WORD(x,hx|sx); - } else { /* subnormal output */ - n = -126 - iy; - hx >>= n; - SET_FLOAT_WORD(x,hx|sx); - x *= one; /* create necessary signal */ - } - return x; /* exact output */ } /****************************************************************************/