Merge branch 'master' of git://sourceware.org/git/glibc

[thirdparty/glibc.git] / math / s_nexttowardf.c

diff --git a/math/s_nexttowardf.c b/math/s_nexttowardf.c
index 1a1026612e2ebe076e44fe57150fcd66a49a31cb..cdc06109cae11b36b3d25082e91fc7b7bb32d0b7 100644 (file)
--- a/math/s_nexttowardf.c
+++ b/math/s_nexttowardf.c
@@ -20,20 +20,16 @@
  *   Special cases:
  */
 
+#include <errno.h>
 #include <math.h>
-#include "math_private.h"
+#include <math-barriers.h>
+#include <math_private.h>
 #include <float.h>
 
-#ifdef __STDC__
-       float __nexttowardf(float x, long double y)
-#else
-       float __nexttowardf(x,y)
-       float x;
-       long double y;
-#endif
+float __nexttowardf(float x, long double y)
 {
        int32_t hx,hy,ix,iy;
-       u_int32_t ly;
+       uint32_t ly;
 
        GET_FLOAT_WORD(hx,x);
        EXTRACT_WORDS(hy,ly,y);
@@ -45,40 +41,34 @@
           return x+y;
        if((long double) x==y) return y;        /* x=y, return y */
        if(ix==0) {                             /* x == 0 */
-           float x2;
-           SET_FLOAT_WORD(x,(u_int32_t)(hy&0x80000000)|1);/* return +-minsub*/
-           x2 = x*x;
-           if(x2==x) return x2; else return x; /* raise underflow flag */
+           float u;
+           SET_FLOAT_WORD(x,(uint32_t)(hy&0x80000000)|1);/* return +-minsub*/
+           u = math_opt_barrier (x);
+           u = u * u;
+           math_force_eval (u);                 /* raise underflow flag */
+           return x;
        }
        if(hx>=0) {                             /* x > 0 */
-           if(hy<0||(ix>>23)>(iy>>20)-0x380
-              || ((ix>>23)==(iy>>20)-0x380
-                  && (ix&0x7fffff)>(((hy<<3)|(ly>>29))&0x7fffff)))     /* x > y, x -= ulp */
+           if(x > y)                           /* x -= ulp */
                hx -= 1;
            else                                /* x < y, x += ulp */
                hx += 1;
        } else {                                /* x < 0 */
-           if(hy>=0||(ix>>23)>(iy>>20)-0x380
-              || ((ix>>23)==(iy>>20)-0x380
-                  && (ix&0x7fffff)>(((hy<<3)|(ly>>29))&0x7fffff)))     /* x < y, x -= ulp */
+           if(x < y)                           /* x -= ulp */
                hx -= 1;
            else                                /* x > y, x += ulp */
                hx += 1;
        }
        hy = hx&0x7f800000;
        if(hy>=0x7f800000) {
-         x = x+x;      /* overflow  */
-         if (FLT_EVAL_METHOD != 0)
-           /* Force conversion to float.  */
-           asm ("" : "=m"(x) : "m"(x));
-         return x;
+         float u = x+x;                        /* overflow  */
+         math_force_eval (u);
+         __set_errno (ERANGE);
        }
-       if(hy<0x00800000) {             /* underflow */
-           float x2 = x*x;
-           if(x2!=x) {         /* raise underflow flag */
-               SET_FLOAT_WORD(x2,hx);
-               return x2;
-           }
+       if(hy<0x00800000) {
+           float u = x*x;                      /* underflow */
+           math_force_eval (u);                /* raise underflow flag */
+           __set_errno (ERANGE);
        }
        SET_FLOAT_WORD(x,hx);
        return x;