Piotr Caban : msvcrt: Import sinf implementation from musl.
Alexandre Julliard
julliard at winehq.org
Mon May 24 15:59:53 CDT 2021
Module: wine
Branch: master
Commit: 14a8e16a44ad9b1e9ef7ca0fde45a1c89ab77da6
URL: https://source.winehq.org/git/wine.git/?a=commit;h=14a8e16a44ad9b1e9ef7ca0fde45a1c89ab77da6
Author: Piotr Caban <piotr at codeweavers.com>
Date: Sun May 23 16:37:33 2021 +0200
msvcrt: Import sinf implementation from musl.
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msvcrt/math.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++---
dlls/msvcrt/unixlib.c | 9 --------
dlls/msvcrt/unixlib.h | 1 -
3 files changed, 56 insertions(+), 13 deletions(-)
diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c
index e943076c1c7..d26aa06e9e7 100644
--- a/dlls/msvcrt/math.c
+++ b/dlls/msvcrt/math.c
@@ -1121,12 +1121,65 @@ float CDECL powf( float x, float y )
/*********************************************************************
* sinf (MSVCRT.@)
+ *
+ * Copied from musl: src/math/sinf.c
*/
float CDECL sinf( float x )
{
- float ret = unix_funcs->sinf( x );
- if (!isfinite(x)) return math_error(_DOMAIN, "sinf", x, 0, ret);
- return ret;
+ static const double s1pio2 = 1*M_PI_2,
+ s2pio2 = 2*M_PI_2,
+ s3pio2 = 3*M_PI_2,
+ s4pio2 = 4*M_PI_2;
+
+ double y;
+ UINT32 ix;
+ int n, sign;
+
+ ix = *(UINT32*)&x;
+ sign = ix >> 31;
+ ix &= 0x7fffffff;
+
+ if (ix <= 0x3f490fda) { /* |x| ~<= pi/4 */
+ if (ix < 0x39800000) { /* |x| < 2**-12 */
+ /* raise inexact if x!=0 and underflow if subnormal */
+ fp_barrierf(ix < 0x00800000 ? x / 0x1p120f : x + 0x1p120f);
+ return x;
+ }
+ return __sindf(x);
+ }
+ if (ix <= 0x407b53d1) { /* |x| ~<= 5*pi/4 */
+ if (ix <= 0x4016cbe3) { /* |x| ~<= 3pi/4 */
+ if (sign)
+ return -__cosdf(x + s1pio2);
+ else
+ return __cosdf(x - s1pio2);
+ }
+ return __sindf(sign ? -(x + s2pio2) : -(x - s2pio2));
+ }
+ if (ix <= 0x40e231d5) { /* |x| ~<= 9*pi/4 */
+ if (ix <= 0x40afeddf) { /* |x| ~<= 7*pi/4 */
+ if (sign)
+ return __cosdf(x + s3pio2);
+ else
+ return -__cosdf(x - s3pio2);
+ }
+ return __sindf(sign ? x + s4pio2 : x - s4pio2);
+ }
+
+ /* sin(Inf or NaN) is NaN */
+ if (isinf(x))
+ return math_error(_DOMAIN, "sinf", x, 0, x - x);
+ if (ix >= 0x7f800000)
+ return x - x;
+
+ /* general argument reduction needed */
+ n = __rem_pio2f(x, &y);
+ switch (n&3) {
+ case 0: return __sindf(y);
+ case 1: return __cosdf(y);
+ case 2: return __sindf(-y);
+ default: return -__cosdf(y);
+ }
}
/*********************************************************************
diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c
index 1cec98ae3d4..1fb16f48fcd 100644
--- a/dlls/msvcrt/unixlib.c
+++ b/dlls/msvcrt/unixlib.c
@@ -387,14 +387,6 @@ static float CDECL unix_powf( float x, float y )
return powf( x, y );
}
-/*********************************************************************
- * sinf
- */
-static float CDECL unix_sinf( float x )
-{
- return sinf( x );
-}
-
/*********************************************************************
* sinh
*/
@@ -496,7 +488,6 @@ static const struct unix_funcs funcs =
unix_log2f,
unix_pow,
unix_powf,
- unix_sinf,
unix_sinh,
unix_sinhf,
unix_tanf,
diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h
index d34117eeb32..4c2cf5852ea 100644
--- a/dlls/msvcrt/unixlib.h
+++ b/dlls/msvcrt/unixlib.h
@@ -56,7 +56,6 @@ struct unix_funcs
float (CDECL *log2f)(float x);
double (CDECL *pow)(double x, double y);
float (CDECL *powf)(float x, float y);
- float (CDECL *sinf)(float x);
double (CDECL *sinh)(double x);
float (CDECL *sinhf)(float x);
float (CDECL *tanf)(float x);
More information about the wine-cvs
mailing list