math: simplify hypot and hypotf using scalbn
authorSzabolcs Nagy <nsz@port70.net>
Tue, 13 Nov 2012 20:54:32 +0000 (21:54 +0100)
committerSzabolcs Nagy <nsz@port70.net>
Tue, 13 Nov 2012 20:54:32 +0000 (21:54 +0100)
this also fixes overflow/underflow raising and excess
precision issues (as those are handled well in scalbn)

src/math/hypot.c
src/math/hypotf.c

index ba4c757..9a4cbdb 100644 (file)
@@ -117,12 +117,7 @@ double hypot(double x, double y)
                t2 = a - t1;
                w  = sqrt(t1*y1-(w*(-w)-(t1*y2+t2*b)));
        }
-       if (k != 0) {
-               uint32_t high;
-               t1 = 1.0;
-               GET_HIGH_WORD(high, t1);
-               SET_HIGH_WORD(t1, high+(k<<20));
-               return t1*w;
-       }
+       if (k)
+               w = scalbn(w, k);
        return w;
 }
index 9fd77e6..4d80178 100644 (file)
@@ -80,9 +80,7 @@ float hypotf(float x, float y)
                t2 = a - t1;
                w  = sqrtf(t1*y1-(w*(-w)-(t1*y2+t2*b)));
        }
-       if (k != 0) {
-               SET_FLOAT_WORD(t1, 0x3f800000+(k<<23));
-               return t1*w;
-       }
+       if (k)
+               w = scalbnf(w, k);
        return w;
 }