summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/math/remainder.c12
-rw-r--r--src/math/remainderf.c9
2 files changed, 6 insertions, 15 deletions
diff --git a/src/math/remainder.c b/src/math/remainder.c
index db176c88..2dede3a8 100644
--- a/src/math/remainder.c
+++ b/src/math/remainder.c
@@ -20,8 +20,6 @@
#include "libm.h"
-static const double zero = 0.0;
-
double remainder(double x, double p)
{
int32_t hx,hp;
@@ -35,17 +33,15 @@ double remainder(double x, double p)
hx &= 0x7fffffff;
/* purge off exception values */
- if ((hp|lp) == 0) /* p = 0 */
- return (x*p)/(x*p);
- if (hx >= 0x7ff00000 || /* x not finite */
+ if ((hp|lp) == 0 || /* p = 0 */
+ hx >= 0x7ff00000 || /* x not finite */
(hp >= 0x7ff00000 && (hp-0x7ff00000 | lp) != 0)) /* p is NaN */
- // FIXME: why long double?
- return ((long double)x*p)/((long double)x*p);
+ return (x*p)/(x*p);
if (hp <= 0x7fdfffff)
x = fmod(x, p+p); /* now x < 2p */
if (((hx-hp)|(lx-lp)) == 0)
- return zero*x;
+ return 0.0*x;
x = fabs(x);
p = fabs(p);
if (hp < 0x00200000) {
diff --git a/src/math/remainderf.c b/src/math/remainderf.c
index 61c3c660..77671039 100644
--- a/src/math/remainderf.c
+++ b/src/math/remainderf.c
@@ -15,8 +15,6 @@
#include "libm.h"
-static const float zero = 0.0;
-
float remainderf(float x, float p)
{
int32_t hx,hp;
@@ -30,16 +28,13 @@ float remainderf(float x, float p)
hx &= 0x7fffffff;
/* purge off exception values */
- if (hp == 0) /* p = 0 */
+ if (hp == 0 || hx >= 0x7f800000 || hp > 0x7f800000) /* p = 0, x not finite, p is NaN */
return (x*p)/(x*p);
- if (hx >= 0x7f800000 || hp > 0x7f800000) /* x not finite, p is NaN */
- // FIXME: why long double?
- return ((long double)x*p)/((long double)x*p);
if (hp <= 0x7effffff)
x = fmodf(x, p + p); /* now x < 2p */
if (hx - hp == 0)
- return zero*x;
+ return 0.0f*x;
x = fabsf(x);
p = fabsf(p);
if (hp < 0x01000000) {