April 2023 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Use the log() implementation from the bundled musl library.
by Alexandre Julliard April 12, 2023

April 12, 2023

Module: wine Branch: master Commit: 9de6d202e6c538c4cdc8d957d09f15f96486b748 URL: https://gitlab.winehq.org/wine/wine/-/commit/9de6d202e6c538c4cdc8d957d09f15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 18:42:17 2023 +0200 ntdll: Use the log() implementation from the bundled musl library. --- dlls/ntdll/math.c | 373 ------------------------------------------------------ 1 file changed, 373 deletions(-)

1 0

Alexandre Julliard : ntdll: Use the pow() implementation from the bundled musl library.
by Alexandre Julliard April 12, 2023

April 12, 2023

Module: wine Branch: master Commit: 913d6abc50228ca4809095631f57860a22ec4004 URL: https://gitlab.winehq.org/wine/wine/-/commit/913d6abc50228ca4809095631f5786… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 18:43:24 2023 +0200 ntdll: Use the pow() implementation from the bundled musl library. --- dlls/ntdll/math.c | 578 ------------------------------------------------------ 1 file changed, 578 deletions(-)

1 0

Alexandre Julliard : ntdll: Use the sqrt() implementation from the bundled musl library.
by Alexandre Julliard April 12, 2023

April 12, 2023

Module: wine Branch: master Commit: 4371d5a9dcd841cee668a04742e6135c594be806 URL: https://gitlab.winehq.org/wine/wine/-/commit/4371d5a9dcd841cee668a04742e613… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 18:44:07 2023 +0200 ntdll: Use the sqrt() implementation from the bundled musl library. --- dlls/ntdll/math.c | 139 ------------------------------------------------------ 1 file changed, 139 deletions(-) diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c index f06dbbac06b..c30fc2de61e 100644 --- a/dlls/ntdll/math.c +++ b/dlls/ntdll/math.c @@ -47,38 +47,6 @@ double math_error( int type, const char *name, double arg1, double arg2, double return retval; } -/* Copied from musl: src/math/__fpclassify.c */ -static short _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; -} - -static BOOL sqrt_validate( double *x, BOOL update_sw ) -{ - short c = _dclass(*x); - - if (c == FP_ZERO) return FALSE; - if (c == FP_NAN) - { - /* set signaling bit */ - *(ULONGLONG*)x |= 0x8000000000000ULL; - return FALSE; - } - if (signbit(*x)) - { - *x = -NAN; - return FALSE; - } - if (c == FP_INFINITE) return FALSE; - return TRUE; -} - - /********************************************************************* * abs (NTDLL.@) */ @@ -157,113 +125,6 @@ double CDECL floor( double x ) return u.f; } -/********************************************************************* - * sqrt (NTDLL.@) - * - * Copied from musl: src/math/sqrt.c - */ -double CDECL sqrt( double x ) -{ - 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; -} - #if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) #define FPU_DOUBLE(var) double var; \

1 0

Alexandre Julliard : ntdll: Use the floor() implementation from the bundled musl library.
by Alexandre Julliard April 12, 2023

April 12, 2023

Module: wine Branch: master Commit: 0aa71bdec46f6fcdd52b4843fff1db0976f7890d URL: https://gitlab.winehq.org/wine/wine/-/commit/0aa71bdec46f6fcdd52b4843fff1db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 18:46:05 2023 +0200 ntdll: Use the floor() implementation from the bundled musl library. --- dlls/ntdll/math.c | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c index 31be13db4ae..18369c9896b 100644 --- a/dlls/ntdll/math.c +++ b/dlls/ntdll/math.c @@ -67,35 +67,6 @@ double CDECL fabs( double x ) return u.f; } -/********************************************************************* - * floor (NTDLL.@) - * - * Based on musl: src/math/floorf.c - */ -double CDECL floor( double x ) -{ - union {double f; UINT64 i;} u = {x}; - int e = (int)(u.i >> 52 & 0x7ff) - 0x3ff; - UINT64 m; - - if (e >= 52) - return x; - if (e >= 0) { - m = 0x000fffffffffffffULL >> e; - if ((u.i & m) == 0) - return x; - if (u.i >> 63) - u.i += m; - u.i &= ~m; - } else { - if (u.i >> 63 == 0) - return 0; - else if (u.i << 1) - return -1; - } - return u.f; -} - #if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) #define FPU_DOUBLE(var) double var; \

1 0

Alexandre Julliard : ntdll: Use the atan() implementation from the bundled musl library.
by Alexandre Julliard April 12, 2023

April 12, 2023

Module: wine Branch: master Commit: 50c1ec60605d059ade63c89e7f09e4413f6a2e52 URL: https://gitlab.winehq.org/wine/wine/-/commit/50c1ec60605d059ade63c89e7f09e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 18:40:06 2023 +0200 ntdll: Use the atan() implementation from the bundled musl library. --- dlls/ntdll/math.c | 92 ------------------------------------------------------- 1 file changed, 92 deletions(-) diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c index 30c1723c939..4544908f4c4 100644 --- a/dlls/ntdll/math.c +++ b/dlls/ntdll/math.c @@ -48,12 +48,6 @@ double math_error( int type, const char *name, double arg1, double arg2, double } /* Copied from musl: src/internal/libm.h */ -static inline float fp_barrierf(float x) -{ - volatile float y = x; - return y; -} - static inline double fp_barrier(double x) { volatile double y = x; @@ -582,92 +576,6 @@ int CDECL abs( int i ) return i >= 0 ? i : -i; } -/********************************************************************* - * atan (NTDLL.@) - * - * Copied from musl: src/math/atan.c - */ -double CDECL atan( double x ) -{ - static const double atanhi[] = { - 4.63647609000806093515e-01, - 7.85398163397448278999e-01, - 9.82793723247329054082e-01, - 1.57079632679489655800e+00, - }; - static const double atanlo[] = { - 2.26987774529616870924e-17, - 3.06161699786838301793e-17, - 1.39033110312309984516e-17, - 6.12323399573676603587e-17, - }; - static const double aT[] = { - 3.33333333333329318027e-01, - -1.99999999998764832476e-01, - 1.42857142725034663711e-01, - -1.11111104054623557880e-01, - 9.09088713343650656196e-02, - -7.69187620504482999495e-02, - 6.66107313738753120669e-02, - -5.83357013379057348645e-02, - 4.97687799461593236017e-02, - -3.65315727442169155270e-02, - 1.62858201153657823623e-02, - }; - - double w, s1, s2, z; - unsigned int ix, sign; - int id; - - ix = *(ULONGLONG*)&x >> 32; - sign = ix >> 31; - ix &= 0x7fffffff; - if (ix >= 0x44100000) { /* if |x| >= 2^66 */ - if (isnan(x)) - return x; - z = atanhi[3] + 7.5231638452626401e-37; - return sign ? -z : z; - } - if (ix < 0x3fdc0000) { /* |x| < 0.4375 */ - if (ix < 0x3e400000) { /* |x| < 2^-27 */ - if (ix < 0x00100000) - /* raise underflow for subnormal x */ - fp_barrierf((float)x); - return x; - } - id = -1; - } else { - x = fabs(x); - if (ix < 0x3ff30000) { /* |x| < 1.1875 */ - if (ix < 0x3fe60000) { /* 7/16 <= |x| < 11/16 */ - id = 0; - x = (2.0 * x - 1.0) / (2.0 + x); - } else { /* 11/16 <= |x| < 19/16 */ - id = 1; - x = (x - 1.0) / (x + 1.0); - } - } else { - if (ix < 0x40038000) { /* |x| < 2.4375 */ - id = 2; - x = (x - 1.5) / (1.0 + 1.5 * x); - } else { /* 2.4375 <= |x| < 2^66 */ - id = 3; - x = -1.0 / x; - } - } - } - /* end of argument reduction */ - z = x * x; - w = z * z; - /* break sum from i=0 to 10 aT[i]z**(i+1) into odd and even poly */ - s1 = z * (aT[0] + w * (aT[2] + w * (aT[4] + w * (aT[6] + w * (aT[8] + w * aT[10]))))); - s2 = w * (aT[1] + w * (aT[3] + w * (aT[5] + w * (aT[7] + w * aT[9])))); - if (id < 0) - return x - x * (s1 + s2); - z = atanhi[id] - (x * (s1 + s2) - atanlo[id] - x); - return sign ? -z : z; -} - /********************************************************************* * atan2 (NTDLL.@) *

1 0

Alexandre Julliard : ntdll: Use the tan() implementation from the bundled musl library.
by Alexandre Julliard April 12, 2023

April 12, 2023

Module: wine Branch: master Commit: 05e4a39f0d45d71343babb6dbea231fad7d284c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/05e4a39f0d45d71343babb6dbea231… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 18:38:19 2023 +0200 ntdll: Use the tan() implementation from the bundled musl library. --- dlls/ntdll/math.c | 500 ------------------------------------------------------ 1 file changed, 500 deletions(-)

1 0

Alexandre Julliard : ntdll: Use the cos() implementation from the bundled musl library.
by Alexandre Julliard April 12, 2023

April 12, 2023

Module: wine Branch: master Commit: b655da15560b2d927748096e8a9931ded1af4845 URL: https://gitlab.winehq.org/wine/wine/-/commit/b655da15560b2d927748096e8a9931… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 18:37:10 2023 +0200 ntdll: Use the cos() implementation from the bundled musl library. --- dlls/ntdll/math.c | 81 ------------------------------------------------------- 1 file changed, 81 deletions(-) diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c index c700b293a76..cb20552e88e 100644 --- a/dlls/ntdll/math.c +++ b/dlls/ntdll/math.c @@ -492,47 +492,6 @@ medium: return n; } -/* Copied from musl: src/math/__sin.c */ -static double __sin(double x, double y, int iy) -{ - static const double S1 = -1.66666666666666324348e-01, - S2 = 8.33333333332248946124e-03, - S3 = -1.98412698298579493134e-04, - S4 = 2.75573137070700676789e-06, - S5 = -2.50507602534068634195e-08, - S6 = 1.58969099521155010221e-10; - - double z, r, v, w; - - z = x * x; - w = z * z; - r = S2 + z * (S3 + z * S4) + z * w * (S5 + z * S6); - v = z * x; - if (iy == 0) - return x + v * (S1 + z * r); - else - return x - ((z * (0.5 * y - v * r) - y) - v * S1); -} - -/* Copied from musl: src/math/__cos.c */ -static double __cos(double x, double y) -{ - static const double C1 = 4.16666666666666019037e-02, - C2 = -1.38888888888741095749e-03, - C3 = 2.48015872894767294178e-05, - C4 = -2.75573143513906633035e-07, - C5 = 2.08757232129817482790e-09, - C6 = -1.13596475577881948265e-11; - double hz, z, r, w; - - z = x * x; - w = z * z; - r = z * (C1 + z * (C2 + z * C3)) + w * w * (C4 + z * (C5 + z * C6)); - hz = 0.5 * z; - w = 1.0 - hz; - return w + (((1.0 - w) - hz) + (z * r - x * y)); -} - /* Copied from musl: src/math/__tan.c */ static double __tan(double x, double y, int odd) { @@ -1280,46 +1239,6 @@ double CDECL ceil( double x ) return u.f; } -/********************************************************************* - * cos (NTDLL.@) - * - * Copied from musl: src/math/cos.c - */ -double CDECL cos( double x ) -{ - double y[2]; - UINT32 ix; - unsigned n; - - ix = *(ULONGLONG*)&x >> 32; - ix &= 0x7fffffff; - - /* |x| ~< pi/4 */ - if (ix <= 0x3fe921fb) { - if (ix < 0x3e46a09e) { /* |x| < 2**-27 * sqrt(2) */ - /* raise inexact if x!=0 */ - fp_barrier(x + 0x1p120f); - return 1.0; - } - return __cos(x, 0); - } - - /* cos(Inf or NaN) is NaN */ - if (isinf(x)) - return x - x; - if (ix >= 0x7ff00000) - return x - x; - - /* argument reduction */ - n = __rem_pio2(x, y); - switch (n & 3) { - case 0: return __cos(y[0], y[1]); - case 1: return -__sin(y[0], y[1], 1); - case 2: return -__cos(y[0], y[1]); - default: return __sin(y[0], y[1], 1); - } -} - /********************************************************************* * fabs (NTDLL.@) *

1 0

Alexandre Julliard : ntdll: Use the sin() implementation from the bundled musl library.
by Alexandre Julliard April 12, 2023

April 12, 2023

Module: wine Branch: master Commit: aa4d70b5dc460a910ccab32472e46dedb09c336e URL: https://gitlab.winehq.org/wine/wine/-/commit/aa4d70b5dc460a910ccab32472e46d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 18:35:38 2023 +0200 ntdll: Use the sin() implementation from the bundled musl library. --- dlls/ntdll/Makefile.in | 2 +- dlls/ntdll/math.c | 45 +++++---------------------------------------- 2 files changed, 6 insertions(+), 41 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 7aeee3a7316..2e862c68b7e 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_NTSYSTEM_ -D_ACRTIMP= -DWINBASEAPI= MODULE = ntdll.dll UNIXLIB = ntdll.so IMPORTLIB = ntdll -IMPORTS = winecrt0 +IMPORTS = $(MUSL_PE_LIBS) winecrt0 UNIX_CFLAGS = $(UNWIND_CFLAGS) UNIX_LIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS) diff --git a/dlls/ntdll/math.c b/dlls/ntdll/math.c index aeed5d31696..c700b293a76 100644 --- a/dlls/ntdll/math.c +++ b/dlls/ntdll/math.c @@ -42,6 +42,11 @@ #define WIN32_NO_STATUS #include "ntdll_misc.h" +double math_error( int type, const char *name, double arg1, double arg2, double retval ) +{ + return retval; +} + /* Copied from musl: src/internal/libm.h */ static inline float fp_barrierf(float x) { @@ -1818,46 +1823,6 @@ double CDECL pow( double x, double y ) return pow_exp(x, y, ehi, elo, sign_bias); } -/********************************************************************* - * sin (NTDLL.@) - * - * Copied from musl: src/math/sin.c - */ -double CDECL sin( double x ) -{ - double y[2]; - UINT32 ix; - unsigned n; - - ix = *(ULONGLONG*)&x >> 32; - ix &= 0x7fffffff; - - /* |x| ~< pi/4 */ - if (ix <= 0x3fe921fb) { - if (ix < 0x3e500000) { /* |x| < 2**-26 */ - /* raise inexact if x != 0 and underflow if subnormal*/ - fp_barrier(ix < 0x00100000 ? x/0x1p120f : x+0x1p120f); - return x; - } - return __sin(x, 0.0, 0); - } - - /* sin(Inf or NaN) is NaN */ - if (isinf(x)) - return x - x; - if (ix >= 0x7ff00000) - return x - x; - - /* argument reduction needed */ - n = __rem_pio2(x, y); - switch (n&3) { - case 0: return __sin(y[0], y[1], 1); - case 1: return __cos(y[0], y[1]); - case 2: return -__sin(y[0], y[1], 1); - default: return -__cos(y[0], y[1]); - } -} - /********************************************************************* * sqrt (NTDLL.@) *

1 0

Conor McCarthy : vkd3d-shader/ir: Normalise control point phase output registers to include the control point id.
by Alexandre Julliard April 12, 2023

April 12, 2023

Module: vkd3d Branch: master Commit: 14295a224d9fe2e487bf3a67f4f2fc5218e1b17c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/14295a224d9fe2e487bf3a67f4f2f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 4 17:55:05 2023 +1000 vkd3d-shader/ir: Normalise control point phase output registers to include the control point id. In SPIR-V the address must include the invocation id, but in TPF it is implicit. Move the register index up one slot and insert an OUTPOINTID relative address. --- libs/vkd3d-shader/ir.c | 101 +++++++++++++++++++++++++++++++ libs/vkd3d-shader/spirv.c | 32 +++------- libs/vkd3d-shader/vkd3d_shader_private.h | 3 + 3 files changed, 111 insertions(+), 25 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/ir: Insert hull shader control point input declarations if no control point phase is defined.
by Alexandre Julliard April 12, 2023

April 12, 2023

Module: vkd3d Branch: master Commit: 98b5e2c6e01199d714d18fccfe54826a680aecbf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/98b5e2c6e01199d714d18fccfe548… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 4 17:28:48 2023 +1000 vkd3d-shader/ir: Insert hull shader control point input declarations if no control point phase is defined. The SPIR-V backend will emit a default control point phase. Inserting inputs into the IR allows handling of declarations via the usual path instead of an ad hoc implementation which may not match later changes to input handling. --- libs/vkd3d-shader/ir.c | 86 ++++++++++++++- libs/vkd3d-shader/spirv.c | 178 +++---------------------------- libs/vkd3d-shader/vkd3d_shader_private.h | 11 +- 3 files changed, 112 insertions(+), 163 deletions(-)

1 0