Piotr Caban : msvcrt: Import floorf implementation from musl.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e5ddf0e8d8d5cf0021a1b210f6902f1285f54378
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=e5ddf0e8d8d5cf0021a1b210f...

Author: Piotr Caban 
Date:   Mon May 17 15:38:12 2021 +0200

msvcrt: Import floorf implementation from musl.

Signed-off-by: Piotr Caban 
Signed-off-by: Alexandre Julliard

---

dlls/msvcrt/math.c    | 23 ++++++++++++++++++++++-
 dlls/msvcrt/unixlib.c |  9 ---------
 dlls/msvcrt/unixlib.h |  1 -
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c
index 5502e2934e9..d85b43c7d7f 100644
--- a/dlls/msvcrt/math.c
+++ b/dlls/msvcrt/math.c
@@ -827,10 +827,31 @@ float CDECL ceilf( float x )

/*********************************************************************
  *      floorf (MSVCRT.@)
+ *
+ * Copied from musl: src/math/floorf.c
  */
 float CDECL floorf( float x )
 {
-  return unix_funcs->floorf(x);
+    union {float f; UINT32 i;} u = {x};
+    int e = (int)(u.i >> 23 & 0xff) - 0x7f;
+    UINT32 m;
+
+    if (e >= 23)
+        return x;
+    if (e >= 0) {
+        m = 0x007fffff >> e;
+        if ((u.i & m) == 0)
+            return x;
+        if (u.i >> 31)
+            u.i += m;
+        u.i &= ~m;
+    } else {
+        if (u.i >> 31 == 0)
+            return 0;
+        else if (u.i << 1)
+            return -1;
+    }
+    return u.f;
 }

/*********************************************************************
diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c
index 634ab6f1a4b..9cdcd14e986 100644
--- a/dlls/msvcrt/unixlib.c
+++ b/dlls/msvcrt/unixlib.c
@@ -281,14 +281,6 @@ static double CDECL unix_floor( double x )
     return floor( x );
 }

-/*********************************************************************
- *      floorf
- */
-static float CDECL unix_floorf( float x )
-{
-    return floorf( x );
-}
-
 /*********************************************************************
  *      fma
  */
@@ -712,7 +704,6 @@ static const struct unix_funcs funcs =
     unix_expm1,
     unix_expm1f,
     unix_floor,
-    unix_floorf,
     unix_fma,
     unix_fmaf,
     unix_fmod,
diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h
index 472eb323850..47af0e464cd 100644
--- a/dlls/msvcrt/unixlib.h
+++ b/dlls/msvcrt/unixlib.h
@@ -44,7 +44,6 @@ struct unix_funcs
     double          (CDECL *expm1)(double x);
     float           (CDECL *expm1f)(float x);
     double          (CDECL *floor)(double x);
-    float           (CDECL *floorf)(float x);
     double          (CDECL *fma)(double x, double y, double z);
     float           (CDECL *fmaf)(float x, float y, float z);
     double          (CDECL *fmod)(double x, double y);