[PATCH 0/5] MR2629: msvcrt: Use remaining math functions from the bundled musl library.
From: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcrt/math.c | 24 +++++++++++------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 618fc3acbba..d4757be4a6f 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2325,9 +2325,9 @@ @ cdecl rand() @ cdecl rand_s(ptr) @ cdecl realloc(ptr long) -@ cdecl remainder(double double) -@ cdecl remainderf(float float) -@ cdecl remainderl(double double) remainder +@ cdecl remainder(double double) MSVCRT_remainder +@ cdecl remainderf(float float) MSVCRT_remainderf +@ cdecl remainderl(double double) MSVCRT_remainder @ cdecl remove(str) @ cdecl remquo(double double ptr) @ cdecl remquof(float float ptr) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2acfe23278d..5146ac43644 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3350,36 +3350,34 @@ float CDECL _scalbf(float num, __msvcrt_long power) return ldexp(num, power); } -#if _MSVCR_VER>=120 +#if _MSVCR_VER == 120 /* other versions call remainder() directly */ /********************************************************************* * remainder (MSVCR120.@) - * - * Copied from musl: src/math/remainder.c */ -double CDECL remainder(double x, double y) +double CDECL MSVCRT_remainder(double x, double y) { - int q; -#if _MSVCR_VER == 120 && defined(__x86_64__) +#ifdef __x86_64__ if (isnan(x) || isnan(y)) *_errno() = EDOM; #endif - return remquo(x, y, &q); + return remainder(x, y); } /********************************************************************* * remainderf (MSVCR120.@) - * - * Copied from musl: src/math/remainderf.c */ -float CDECL remainderf(float x, float y) +float CDECL MSVCRT_remainderf(float x, float y) { - int q; -#if _MSVCR_VER == 120 && defined(__x86_64__) +#ifdef __x86_64__ if (isnan(x) || isnan(y)) *_errno() = EDOM; #endif - return remquof(x, y, &q); + return remainderf(x, y); } +#endif /* _MSVCR_VER == 120 */ + +#if _MSVCR_VER>=120 + /********************************************************************* * _except1 (MSVCR120.@) * TODO: -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2629
From: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 369 -------------------------------------- libs/musl/src/math/erf.c | 5 +- libs/musl/src/math/erff.c | 5 +- 3 files changed, 8 insertions(+), 371 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 5146ac43644..f2d39076fd3 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -77,15 +77,6 @@ void msvcrt_init_math( void *module ) #endif } -/* Copied from musl: src/internal/libm.h */ -#if _MSVCR_VER >= 120 -static inline double fp_barrier(double x) -{ - volatile double y = x; - return y; -} -#endif - static inline double ret_nan( BOOL update_sw ) { double x = 1.0; @@ -2874,365 +2865,6 @@ short CDECL _fdtest(float *x) return _fdclass(*x); } -static double erfc1(double x) -{ - static const double erx = 8.45062911510467529297e-01, - pa0 = -2.36211856075265944077e-03, - pa1 = 4.14856118683748331666e-01, - pa2 = -3.72207876035701323847e-01, - pa3 = 3.18346619901161753674e-01, - pa4 = -1.10894694282396677476e-01, - pa5 = 3.54783043256182359371e-02, - pa6 = -2.16637559486879084300e-03, - qa1 = 1.06420880400844228286e-01, - qa2 = 5.40397917702171048937e-01, - qa3 = 7.18286544141962662868e-02, - qa4 = 1.26171219808761642112e-01, - qa5 = 1.36370839120290507362e-02, - qa6 = 1.19844998467991074170e-02; - - double s, P, Q; - - s = fabs(x) - 1; - P = pa0 + s * (pa1 + s * (pa2 + s * (pa3 + s * (pa4 + s * (pa5 + s * pa6))))); - Q = 1 + s * (qa1 + s * (qa2 + s * (qa3 + s * (qa4 + s * (qa5 + s * qa6))))); - return 1 - erx - P / Q; -} - -static double erfc2(UINT32 ix, double x) -{ - static const double ra0 = -9.86494403484714822705e-03, - ra1 = -6.93858572707181764372e-01, - ra2 = -1.05586262253232909814e+01, - ra3 = -6.23753324503260060396e+01, - ra4 = -1.62396669462573470355e+02, - ra5 = -1.84605092906711035994e+02, - ra6 = -8.12874355063065934246e+01, - ra7 = -9.81432934416914548592e+00, - sa1 = 1.96512716674392571292e+01, - sa2 = 1.37657754143519042600e+02, - sa3 = 4.34565877475229228821e+02, - sa4 = 6.45387271733267880336e+02, - sa5 = 4.29008140027567833386e+02, - sa6 = 1.08635005541779435134e+02, - sa7 = 6.57024977031928170135e+00, - sa8 = -6.04244152148580987438e-02, - rb0 = -9.86494292470009928597e-03, - rb1 = -7.99283237680523006574e-01, - rb2 = -1.77579549177547519889e+01, - rb3 = -1.60636384855821916062e+02, - rb4 = -6.37566443368389627722e+02, - rb5 = -1.02509513161107724954e+03, - rb6 = -4.83519191608651397019e+02, - sb1 = 3.03380607434824582924e+01, - sb2 = 3.25792512996573918826e+02, - sb3 = 1.53672958608443695994e+03, - sb4 = 3.19985821950859553908e+03, - sb5 = 2.55305040643316442583e+03, - sb6 = 4.74528541206955367215e+02, - sb7 = -2.24409524465858183362e+01; - - double s, R, S, z; - UINT64 iz; - - if (ix < 0x3ff40000) /* |x| < 1.25 */ - return erfc1(x); - - x = fabs(x); - s = 1 / (x * x); - if (ix < 0x4006db6d) { /* |x| < 1/.35 ~ 2.85714 */ - R = ra0 + s * (ra1 + s * (ra2 + s * (ra3 + s * (ra4 + s * - (ra5 + s * (ra6 + s * ra7)))))); - S = 1.0 + s * (sa1 + s * (sa2 + s * (sa3 + s * (sa4 + s * - (sa5 + s * (sa6 + s * (sa7 + s * sa8))))))); - } else { /* |x| > 1/.35 */ - R = rb0 + s * (rb1 + s * (rb2 + s * (rb3 + s * (rb4 + s * - (rb5 + s * rb6))))); - S = 1.0 + s * (sb1 + s * (sb2 + s * (sb3 + s * (sb4 + s * - (sb5 + s * (sb6 + s * sb7)))))); - } - z = x; - iz = *(ULONGLONG*)&z; - iz &= 0xffffffff00000000ULL; - z = *(double*)&iz; - return exp(-z * z - 0.5625) * exp((z - x) * (z + x) + R / S) / x; -} - -/********************************************************************* - * erf (MSVCR120.@) - */ -double CDECL erf(double x) -{ - static const double efx8 = 1.02703333676410069053e+00, - pp0 = 1.28379167095512558561e-01, - pp1 = -3.25042107247001499370e-01, - pp2 = -2.84817495755985104766e-02, - pp3 = -5.77027029648944159157e-03, - pp4 = -2.37630166566501626084e-05, - qq1 = 3.97917223959155352819e-01, - qq2 = 6.50222499887672944485e-02, - qq3 = 5.08130628187576562776e-03, - qq4 = 1.32494738004321644526e-04, - qq5 = -3.96022827877536812320e-06; - - double r, s, z, y; - UINT32 ix; - int sign; - - ix = *(UINT64*)&x >> 32; - sign = ix >> 31; - ix &= 0x7fffffff; - if (ix >= 0x7ff00000) { - /* erf(nan)=nan, erf(+-inf)=+-1 */ - return 1 - 2 * sign + 1 / x; - } - if (ix < 0x3feb0000) { /* |x| < 0.84375 */ - if (ix < 0x3e300000) { /* |x| < 2**-28 */ - /* avoid underflow */ - return 0.125 * (8 * x + efx8 * x); - } - z = x * x; - r = pp0 + z * (pp1 + z * (pp2 + z * (pp3 + z * pp4))); - s = 1.0 + z * (qq1 + z * (qq2 + z * (qq3 + z * (qq4 + z * qq5)))); - y = r / s; - return x + x * y; - } - if (ix < 0x40180000) /* 0.84375 <= |x| < 6 */ - y = 1 - erfc2(ix, x); - else - y = 1 - DBL_MIN; - return sign ? -y : y; -} - -static float erfc1f(float x) -{ - static const float erx = 8.4506291151e-01, - pa0 = -2.3621185683e-03, - pa1 = 4.1485610604e-01, - pa2 = -3.7220788002e-01, - pa3 = 3.1834661961e-01, - pa4 = -1.1089469492e-01, - pa5 = 3.5478305072e-02, - pa6 = -2.1663755178e-03, - qa1 = 1.0642088205e-01, - qa2 = 5.4039794207e-01, - qa3 = 7.1828655899e-02, - qa4 = 1.2617121637e-01, - qa5 = 1.3637083583e-02, - qa6 = 1.1984500103e-02; - - float s, P, Q; - - s = fabsf(x) - 1; - P = pa0 + s * (pa1 + s * (pa2 + s * (pa3 + s * (pa4 + s * (pa5 + s * pa6))))); - Q = 1 + s * (qa1 + s * (qa2 + s * (qa3 + s * (qa4 + s * (qa5 + s * qa6))))); - return 1 - erx - P / Q; -} - -static float erfc2f(UINT32 ix, float x) -{ - static const float ra0 = -9.8649440333e-03, - ra1 = -6.9385856390e-01, - ra2 = -1.0558626175e+01, - ra3 = -6.2375331879e+01, - ra4 = -1.6239666748e+02, - ra5 = -1.8460508728e+02, - ra6 = -8.1287437439e+01, - ra7 = -9.8143291473e+00, - sa1 = 1.9651271820e+01, - sa2 = 1.3765776062e+02, - sa3 = 4.3456588745e+02, - sa4 = 6.4538726807e+02, - sa5 = 4.2900814819e+02, - sa6 = 1.0863500214e+02, - sa7 = 6.5702495575e+00, - sa8 = -6.0424413532e-02, - rb0 = -9.8649431020e-03, - rb1 = -7.9928326607e-01, - rb2 = -1.7757955551e+01, - rb3 = -1.6063638306e+02, - rb4 = -6.3756646729e+02, - rb5 = -1.0250950928e+03, - rb6 = -4.8351919556e+02, - sb1 = 3.0338060379e+01, - sb2 = 3.2579251099e+02, - sb3 = 1.5367296143e+03, - sb4 = 3.1998581543e+03, - sb5 = 2.5530502930e+03, - sb6 = 4.7452853394e+02, - sb7 = -2.2440952301e+01; - - float s, R, S, z; - - if (ix < 0x3fa00000) /* |x| < 1.25 */ - return erfc1f(x); - - x = fabsf(x); - s = 1 / (x * x); - if (ix < 0x4036db6d) { /* |x| < 1/0.35 */ - R = ra0 + s * (ra1 + s * (ra2 + s * (ra3 + s * (ra4 + s * - (ra5 + s * (ra6 + s * ra7)))))); - S = 1.0f + s * (sa1 + s * (sa2 + s * (sa3 + s * (sa4 + s * - (sa5 + s * (sa6 + s * (sa7 + s * sa8))))))); - } else { /* |x| >= 1/0.35 */ - R = rb0 + s * (rb1 + s * (rb2 + s * (rb3 + s * (rb4 + s * (rb5 + s * rb6))))); - S = 1.0f + s * (sb1 + s * (sb2 + s * (sb3 + s * (sb4 + s * - (sb5 + s * (sb6 + s * sb7)))))); - } - - ix = *(UINT32*)&x & 0xffffe000; - z = *(float*)&ix; - return expf(-z * z - 0.5625f) * expf((z - x) * (z + x) + R / S) / x; -} - -/********************************************************************* - * erff (MSVCR120.@) - * - * Copied from musl: src/math/erff.c - */ -float CDECL erff(float x) -{ - static const float efx8 = 1.0270333290e+00, - pp0 = 1.2837916613e-01, - pp1 = -3.2504209876e-01, - pp2 = -2.8481749818e-02, - pp3 = -5.7702702470e-03, - pp4 = -2.3763017452e-05, - qq1 = 3.9791721106e-01, - qq2 = 6.5022252500e-02, - qq3 = 5.0813062117e-03, - qq4 = 1.3249473704e-04, - qq5 = -3.9602282413e-06; - - float r, s, z, y; - UINT32 ix; - int sign; - - ix = *(UINT32*)&x; - sign = ix >> 31; - ix &= 0x7fffffff; - if (ix >= 0x7f800000) { - /* erf(nan)=nan, erf(+-inf)=+-1 */ - return 1 - 2 * sign + 1 / x; - } - if (ix < 0x3f580000) { /* |x| < 0.84375 */ - if (ix < 0x31800000) { /* |x| < 2**-28 */ - /*avoid underflow */ - return 0.125f * (8 * x + efx8 * x); - } - z = x * x; - r = pp0 + z * (pp1 + z * (pp2 + z * (pp3 + z * pp4))); - s = 1 + z * (qq1 + z * (qq2 + z * (qq3 + z * (qq4 + z * qq5)))); - y = r / s; - return x + x * y; - } - if (ix < 0x40c00000) /* |x| < 6 */ - y = 1 - erfc2f(ix, x); - else - y = 1 - FLT_MIN; - return sign ? -y : y; -} - -/********************************************************************* - * erfc (MSVCR120.@) - * - * Copied from musl: src/math/erf.c - */ -double CDECL erfc(double x) -{ - static const double pp0 = 1.28379167095512558561e-01, - pp1 = -3.25042107247001499370e-01, - pp2 = -2.84817495755985104766e-02, - pp3 = -5.77027029648944159157e-03, - pp4 = -2.37630166566501626084e-05, - qq1 = 3.97917223959155352819e-01, - qq2 = 6.50222499887672944485e-02, - qq3 = 5.08130628187576562776e-03, - qq4 = 1.32494738004321644526e-04, - qq5 = -3.96022827877536812320e-06; - - double r, s, z, y; - UINT32 ix; - int sign; - - ix = *(ULONGLONG*)&x >> 32; - sign = ix >> 31; - ix &= 0x7fffffff; - if (ix >= 0x7ff00000) { - /* erfc(nan)=nan, erfc(+-inf)=0,2 */ - return 2 * sign + 1 / x; - } - if (ix < 0x3feb0000) { /* |x| < 0.84375 */ - if (ix < 0x3c700000) /* |x| < 2**-56 */ - return 1.0 - x; - z = x * x; - r = pp0 + z * (pp1 + z * (pp2 + z * (pp3 + z * pp4))); - s = 1.0 + z * (qq1 + z * (qq2 + z * (qq3 + z * (qq4 + z * qq5)))); - y = r / s; - if (sign || ix < 0x3fd00000) { /* x < 1/4 */ - return 1.0 - (x + x * y); - } - return 0.5 - (x - 0.5 + x * y); - } - if (ix < 0x403c0000) { /* 0.84375 <= |x| < 28 */ - return sign ? 2 - erfc2(ix, x) : erfc2(ix, x); - } - if (sign) - return 2 - DBL_MIN; - *_errno() = ERANGE; - return fp_barrier(DBL_MIN) * DBL_MIN; -} - -/********************************************************************* - * erfcf (MSVCR120.@) - * - * Copied from musl: src/math/erff.c - */ -float CDECL erfcf(float x) -{ - static const float pp0 = 1.2837916613e-01, - pp1 = -3.2504209876e-01, - pp2 = -2.8481749818e-02, - pp3 = -5.7702702470e-03, - pp4 = -2.3763017452e-05, - qq1 = 3.9791721106e-01, - qq2 = 6.5022252500e-02, - qq3 = 5.0813062117e-03, - qq4 = 1.3249473704e-04, - qq5 = -3.9602282413e-06; - - float r, s, z, y; - UINT32 ix; - int sign; - - ix = *(UINT32*)&x; - sign = ix >> 31; - ix &= 0x7fffffff; - if (ix >= 0x7f800000) { - /* erfc(nan)=nan, erfc(+-inf)=0,2 */ - return 2 * sign + 1 / x; - } - - if (ix < 0x3f580000) { /* |x| < 0.84375 */ - if (ix < 0x23800000) /* |x| < 2**-56 */ - return 1.0f - x; - z = x * x; - r = pp0 + z * (pp1 + z * (pp2 + z * (pp3 + z * pp4))); - s = 1.0f + z * (qq1 + z * (qq2 + z * (qq3 + z * (qq4 + z * qq5)))); - y = r / s; - if (sign || ix < 0x3e800000) /* x < 1/4 */ - return 1.0f - (x + x * y); - return 0.5f - (x - 0.5f + x * y); - } - if (ix < 0x41e00000) { /* |x| < 28 */ - return sign ? 2 - erfc2f(ix, x) : erfc2f(ix, x); - } - if (sign) - return 2 - FLT_MIN; - *_errno() = ERANGE; - return FLT_MIN * FLT_MIN; -} - /********************************************************************* * _fdsign (MSVCR120.@) */ @@ -3251,7 +2883,6 @@ int CDECL _dsign(double x) return (u.i >> 48) & 0x8000; } - /********************************************************************* * _dpcomp (MSVCR120.@) */ diff --git a/libs/musl/src/math/erf.c b/libs/musl/src/math/erf.c index 2b7bca21dbd..3e6edb39cba 100644 --- a/libs/musl/src/math/erf.c +++ b/libs/musl/src/math/erf.c @@ -269,5 +269,8 @@ double __cdecl erfc(double x) if (ix < 0x403c0000) { /* 0.84375 <= |x| < 28 */ return sign ? 2 - erfc2(ix,x) : erfc2(ix,x); } - return sign ? 2 - 0x1p-1022 : 0x1p-1022*0x1p-1022; + if (sign) + return 2 - DBL_MIN; + errno = ERANGE; + return fp_barrier(DBL_MIN) * DBL_MIN; } diff --git a/libs/musl/src/math/erff.c b/libs/musl/src/math/erff.c index eea668f56b6..6ab7d4f0ab6 100644 --- a/libs/musl/src/math/erff.c +++ b/libs/musl/src/math/erff.c @@ -179,5 +179,8 @@ float __cdecl erfcf(float x) if (ix < 0x41e00000) { /* |x| < 28 */ return sign ? 2 - erfc2(ix,x) : erfc2(ix,x); } - return sign ? 2 - 0x1p-120f : 0x1p-120f*0x1p-120f; + if (sign) + return 2 - FLT_MIN; + errno = ERANGE; + return FLT_MIN * FLT_MIN; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2629
From: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/math.c | 62 ++----------------------------------- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 +-- libs/musl/src/math/sqrtf.c | 2 +- 9 files changed, 12 insertions(+), 68 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6ef7befa344..3c969c9d307 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1791,7 +1791,7 @@ @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) @ cdecl sqrt(double) -@ cdecl -arch=!i386 sqrtf(float) +@ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) @ varargs sscanf_s(str str) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index bd44b4476cd..a071b0ead42 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2149,7 +2149,7 @@ @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) @ cdecl sqrt(double) -@ cdecl -arch=!i386 sqrtf(float) +@ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) @ varargs sscanf_s(str str) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index d4757be4a6f..3a502f9a8fe 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2360,7 +2360,7 @@ @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) @ cdecl sqrt(double) -@ cdecl -arch=!i386 sqrtf(float) +@ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) @ varargs sscanf_s(str str) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a1273d7d995..2c3faa2233e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1472,7 +1472,7 @@ @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) @ cdecl sqrt(double) -@ cdecl -arch=!i386 sqrtf(float) +@ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) @ varargs sscanf_s(str str) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e199475aa30..11fa5fc1f61 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1444,7 +1444,7 @@ @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) @ cdecl sqrt(double) -@ cdecl -arch=!i386 sqrtf(float) +@ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) @ varargs sscanf_s(str str) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f2d39076fd3..9d020e1f20d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -288,6 +288,7 @@ float CDECL MSVCRT_atanf( float x ) } #endif +#ifdef __x86_64__ static BOOL sqrtf_validate( float *x ) { short c = _fdclass(*x); @@ -303,7 +304,6 @@ static BOOL sqrtf_validate( float *x ) return TRUE; } -#if defined(__x86_64__) || defined(__i386__) float CDECL sse2_sqrtf(float); __ASM_GLOBAL_FUNC( sse2_sqrtf, "sqrtss %xmm0, %xmm0\n\t" @@ -312,10 +312,8 @@ __ASM_GLOBAL_FUNC( sse2_sqrtf, /********************************************************************* * sqrtf (MSVCRT.@) - * - * Copied from musl: src/math/sqrtf.c */ -float CDECL sqrtf( float x ) +float CDECL MSVCRT_sqrtf( float x ) { #ifdef __x86_64__ if (!sqrtf_validate(&x)) @@ -323,61 +321,7 @@ float CDECL sqrtf( float x ) return sse2_sqrtf(x); #else - static const float tiny = 1.0e-30; - - float z; - int ix,s,q,m,t,i; - unsigned int r; - - ix = *(int*)&x; - - if (!sqrtf_validate(&x)) - return x; - - /* normalize x */ - m = ix >> 23; - if (m == 0) { /* subnormal x */ - for (i = 0; (ix & 0x00800000) == 0; i++) - ix <<= 1; - m -= i - 1; - } - m -= 127; /* unbias exponent */ - ix = (ix & 0x007fffff) | 0x00800000; - if (m & 1) /* odd m, double x to make it even */ - ix += ix; - m >>= 1; /* m = [m/2] */ - - /* generate sqrt(x) bit by bit */ - ix += ix; - q = s = 0; /* q = sqrt(x) */ - r = 0x01000000; /* r = moving bit from right to left */ - - while (r != 0) { - t = s + r; - if (t <= ix) { - s = t + r; - ix -= t; - q += r; - } - ix += ix; - r >>= 1; - } - - /* use floating add to find out rounding direction */ - if (ix != 0) { - z = 1.0f - tiny; /* raise inexact flag */ - if (z >= 1.0f) { - z = 1.0f + tiny; - if (z > 1.0f) - q += 2; - else - q += q & 1; - } - } - ix = (q >> 1) + 0x3f000000; - r = ix + ((unsigned int)m << 23); - z = *(float*)&r; - return z; + return sqrtf( x ); #endif } diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 3566e1e4728..7e0d3d62ba4 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1423,7 +1423,7 @@ @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) @ cdecl sqrt(double) -@ cdecl -arch=!i386 sqrtf(float) +@ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) @ varargs sscanf_s(str str) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 258a1aa945a..7394e3cc5d0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1779,7 +1779,7 @@ @ cdecl _o_sinh(double) sinh @ cdecl -arch=!i386 _o_sinhf(float) sinhf @ cdecl _o_sqrt(double) sqrt -@ cdecl -arch=!i386 _o_sqrtf(float) sqrtf +@ cdecl -arch=!i386 _o_sqrtf(float) MSVCRT_sqrtf @ cdecl _o_srand(long) srand @ cdecl _o_strcat_s(str long str) strcat_s @ cdecl _o_strcoll(str str) strcoll @@ -2495,7 +2495,7 @@ @ cdecl sinh(double) @ cdecl -arch=!i386 sinhf(float) @ cdecl sqrt(double) -@ cdecl -arch=!i386 sqrtf(float) +@ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ cdecl strcat(str str) @ cdecl strcat_s(str long str) diff --git a/libs/musl/src/math/sqrtf.c b/libs/musl/src/math/sqrtf.c index d22a2a26141..45559f0bb66 100644 --- a/libs/musl/src/math/sqrtf.c +++ b/libs/musl/src/math/sqrtf.c @@ -24,7 +24,7 @@ float __cdecl sqrtf(float x) if (ix == 0x7f800000) return x; if (ix > 0x7f800000) - return __math_invalidf(x); + return math_error(_DOMAIN, "sqrtf", x, 0, (x - x) / (x - x)); /* x is subnormal, normalize it. */ ix = asuint(x * 0x1p23f); ix -= 23 << 23; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2629
From: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/math.c | 107 ++---------------------------------- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 +- libs/musl/src/math/sqrt.c | 2 +- 13 files changed, 18 insertions(+), 115 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index 98d729b9eb1..c9aa44fcf91 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -468,7 +468,7 @@ @ cdecl sin(double) @ cdecl sinh(double) @ varargs sprintf(ptr str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) @ varargs sscanf(str str) @ cdecl strcat(str str) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 3c969c9d307..3ebbe6cef16 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1790,7 +1790,7 @@ @ cdecl -arch=!i386 sinhf(float) @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index a071b0ead42..1032c9e4c7a 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2148,7 +2148,7 @@ @ cdecl -arch=!i386 sinhf(float) @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 3a502f9a8fe..ca11ea4b49d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2359,7 +2359,7 @@ @ cdecl -arch=!i386 sinhf(float) @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index fe281841198..253df1cdbd8 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -816,7 +816,7 @@ @ cdecl sin(double) @ cdecl sinh(double) @ varargs sprintf(ptr str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) @ varargs sscanf(str str) @ cdecl strcat(str str) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index ed9de904884..5f3bf499ad4 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -811,7 +811,7 @@ @ cdecl sin(double) @ cdecl sinh(double) @ varargs sprintf(ptr str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) @ varargs sscanf(str str) @ cdecl strcat(str str) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 2c3faa2233e..9b040615693 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1471,7 +1471,7 @@ @ cdecl -arch=!i386 sinhf(float) @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 11fa5fc1f61..e9043c8c926 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1443,7 +1443,7 @@ @ cdecl -arch=!i386 sinhf(float) @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 9d020e1f20d..7fc9c44dbf5 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -77,12 +77,14 @@ void msvcrt_init_math( void *module ) #endif } +#if defined(__i386__) || defined(__x86_64__) static inline double ret_nan( BOOL update_sw ) { double x = 1.0; if (!update_sw) return -NAN; return (x - x) / (x - x); } +#endif #define SET_X87_CW(MASK) \ "subl $4, %esp\n\t" \ @@ -408,6 +410,7 @@ double CDECL MSVCRT_exp( double x ) } #endif +#if defined(__x86_64__) || defined(__i386__) static BOOL sqrt_validate( double *x, BOOL update_sw ) { short c = _dclass(*x); @@ -433,7 +436,6 @@ static BOOL sqrt_validate( double *x, BOOL update_sw ) return TRUE; } -#if defined(__x86_64__) || defined(__i386__) double CDECL sse2_sqrt(double); __ASM_GLOBAL_FUNC( sse2_sqrt, "sqrtsd %xmm0, %xmm0\n\t" @@ -452,10 +454,8 @@ __ASM_GLOBAL_FUNC( x87_sqrt, /********************************************************************* * sqrt (MSVCRT.@) - * - * Copied from musl: src/math/sqrt.c */ -double CDECL sqrt( double x ) +double CDECL MSVCRT_sqrt( double x ) { #ifdef __x86_64__ if (!sqrt_validate(&x, TRUE)) @@ -468,104 +468,7 @@ double CDECL sqrt( double x ) return x87_sqrt(x); #else - static const double tiny = 1.0e-300; - - double z; - int sign = 0x80000000; - int ix0,s0,q,m,t,i; - unsigned int r,t1,s1,ix1,q1; - ULONGLONG ix; - - if (!sqrt_validate(&x, TRUE)) - return x; - - ix = *(ULONGLONG*)&x; - ix0 = ix >> 32; - ix1 = ix; - - /* normalize x */ - m = ix0 >> 20; - if (m == 0) { /* subnormal x */ - while (ix0 == 0) { - m -= 21; - ix0 |= (ix1 >> 11); - ix1 <<= 21; - } - for (i=0; (ix0 & 0x00100000) == 0; i++) - ix0 <<= 1; - m -= i - 1; - ix0 |= ix1 >> (32 - i); - ix1 <<= i; - } - m -= 1023; /* unbias exponent */ - ix0 = (ix0 & 0x000fffff) | 0x00100000; - if (m & 1) { /* odd m, double x to make it even */ - ix0 += ix0 + ((ix1 & sign) >> 31); - ix1 += ix1; - } - m >>= 1; /* m = [m/2] */ - - /* generate sqrt(x) bit by bit */ - ix0 += ix0 + ((ix1 & sign) >> 31); - ix1 += ix1; - q = q1 = s0 = s1 = 0; /* [q,q1] = sqrt(x) */ - r = 0x00200000; /* r = moving bit from right to left */ - - while (r != 0) { - t = s0 + r; - if (t <= ix0) { - s0 = t + r; - ix0 -= t; - q += r; - } - ix0 += ix0 + ((ix1 & sign) >> 31); - ix1 += ix1; - r >>= 1; - } - - r = sign; - while (r != 0) { - t1 = s1 + r; - t = s0; - if (t < ix0 || (t == ix0 && t1 <= ix1)) { - s1 = t1 + r; - if ((t1&sign) == sign && (s1 & sign) == 0) - s0++; - ix0 -= t; - if (ix1 < t1) - ix0--; - ix1 -= t1; - q1 += r; - } - ix0 += ix0 + ((ix1 & sign) >> 31); - ix1 += ix1; - r >>= 1; - } - - /* use floating add to find out rounding direction */ - if ((ix0 | ix1) != 0) { - z = 1.0 - tiny; /* raise inexact flag */ - if (z >= 1.0) { - z = 1.0 + tiny; - if (q1 == (unsigned int)0xffffffff) { - q1 = 0; - q++; - } else if (z > 1.0) { - if (q1 == (unsigned int)0xfffffffe) - q++; - q1 += 2; - } else - q1 += q1 & 1; - } - } - ix0 = (q >> 1) + 0x3fe00000; - ix1 = q1 >> 1; - if (q & 1) - ix1 |= sign; - ix = ix0 + ((unsigned int)m << 20); - ix <<= 32; - ix |= ix1; - return *(double*)&ix; + return sqrt( x ); #endif } diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7e0d3d62ba4..22da5acfcce 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1422,7 +1422,7 @@ @ cdecl -arch=!i386 sinhf(float) @ varargs sprintf(ptr str) @ varargs sprintf_s(ptr long str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ varargs sscanf(str str) diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index e1f9e0a6cf3..2ab89d244cc 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -769,7 +769,7 @@ @ cdecl sin(double) @ cdecl sinh(double) @ varargs sprintf(ptr str) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl srand(long) @ varargs sscanf(str str) @ cdecl strcat(str str) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 7394e3cc5d0..cad6cf1c381 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1778,7 +1778,7 @@ @ cdecl -arch=!i386 _o_sinf(float) sinf @ cdecl _o_sinh(double) sinh @ cdecl -arch=!i386 _o_sinhf(float) sinhf -@ cdecl _o_sqrt(double) sqrt +@ cdecl _o_sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 _o_sqrtf(float) MSVCRT_sqrtf @ cdecl _o_srand(long) srand @ cdecl _o_strcat_s(str long str) strcat_s @@ -2494,7 +2494,7 @@ @ cdecl -arch=!i386 sinf(float) @ cdecl sinh(double) @ cdecl -arch=!i386 sinhf(float) -@ cdecl sqrt(double) +@ cdecl sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ cdecl strcat(str str) diff --git a/libs/musl/src/math/sqrt.c b/libs/musl/src/math/sqrt.c index f0185ec855e..beee70a42b3 100644 --- a/libs/musl/src/math/sqrt.c +++ b/libs/musl/src/math/sqrt.c @@ -35,7 +35,7 @@ double __cdecl sqrt(double x) if (ix == 0x7ff0000000000000) return x; if (ix > 0x7ff0000000000000) - return __math_invalid(x); + return math_error(_DOMAIN, "sqrt", x, 0, (x - x) / (x - x)); /* x is subnormal, normalize it. */ ix = asuint64(x * 0x1p52); top = ix >> 52; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2629
From: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 34 ++++------------------------------ 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 7fc9c44dbf5..a4d53934c04 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -207,36 +207,6 @@ float CDECL _chgsignf( float num ) #endif -/********************************************************************* - * _fdclass (MSVCR120.@) - * - * Copied from musl: src/math/__fpclassifyf.c - */ -short CDECL _fdclass(float x) -{ - union { float f; UINT32 i; } u = { x }; - int e = u.i >> 23 & 0xff; - - if (!e) return u.i << 1 ? FP_SUBNORMAL : FP_ZERO; - if (e == 0xff) return u.i << 9 ? FP_NAN : FP_INFINITE; - return FP_NORMAL; -} - -/********************************************************************* - * _dclass (MSVCR120.@) - * - * Copied from musl: src/math/__fpclassify.c - */ -short CDECL _dclass(double x) -{ - union { double f; UINT64 i; } u = { x }; - int e = u.i >> 52 & 0x7ff; - - if (!e) return u.i << 1 ? FP_SUBNORMAL : FP_ZERO; - if (e == 0x7ff) return (u.i << 12) ? FP_NAN : FP_INFINITE; - return FP_NORMAL; -} - #ifndef __i386__ /********************************************************************* @@ -291,6 +261,8 @@ float CDECL MSVCRT_atanf( float x ) #endif #ifdef __x86_64__ +extern short CDECL _fdclass(float x); + static BOOL sqrtf_validate( float *x ) { short c = _fdclass(*x); @@ -411,6 +383,8 @@ double CDECL MSVCRT_exp( double x ) #endif #if defined(__x86_64__) || defined(__i386__) +extern short CDECL _dclass(double x); + static BOOL sqrt_validate( double *x, BOOL update_sw ) { short c = _dclass(*x); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2629
This merge request was approved by Piotr Caban. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2629
participants (3)
-
Alexandre Julliard -
Alexandre Julliard (＠julliard)
-
Piotr Caban (＠piotr)