wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Rémi Bernon : hidclass.sys: Return irp->IoStatus.Status consistently.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 6f4ccd04cdaebdc92a7c7747a8b821a8baaa81b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f4ccd04cdaebdc92a7c7747… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 3 18:55:18 2021 +0200 hidclass.sys: Return irp->IoStatus.Status consistently. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 126 ++++++++++++++++++--------------------------- 1 file changed, 51 insertions(+), 75 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f4ccd04cdaebdc92a7c…

1 0

Rémi Bernon : hidclass.sys: Implement button array value caps.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 7096c26a2e48089424fe90956c80c29617bce9f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7096c26a2e48089424fe9095… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 3 18:55:17 2021 +0200 hidclass.sys: Implement button array value caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 62 ++++++++++++++++++++++++++++++++++++-- dlls/hidclass.sys/descriptor.c | 11 +++++-- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 16 ++++------ include/wine/hid.h | 1 + 4 files changed, 75 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7096c26a2e48089424fe…

1 0

Gabriel Ivăncescu : ntdll: Fix offsetof syntax for IOCTL_AFD_WINE_GET_IRLMP_ENUMDEVICES.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 26724c3ef40b9ef874b5b6baa28f3572c73946d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26724c3ef40b9ef874b5b6ba… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Aug 4 17:43:50 2021 +0300 ntdll: Fix offsetof syntax for IOCTL_AFD_WINE_GET_IRLMP_ENUMDEVICES. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 0e52db178d8..9dc697ea959 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1976,7 +1976,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc if (needs_close) close( fd ); if (ret) return sock_errno_to_status( errno ); - io->Information = offsetof( DEVICELIST, unix_list->len ); + io->Information = offsetof( DEVICELIST, Device[unix_list->len] ); if (out_size < io->Information) return STATUS_BUFFER_TOO_SMALL;

1 0

Francois Gouget : ntdll/tests: Account for some timer resolution rounding.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: b2c89b1a41fa8184a56b1a8cbd900cac4deecad0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2c89b1a41fa8184a56b1a8c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 4 15:11:10 2021 +0200 ntdll/tests: Account for some timer resolution rounding. With some time source drivers the requested timer resolution is rounded to the nearest value supported by the hardware, and that is then reported by NtSetTimerResolution(). So adjust the timer tests to allow close values, including outside the max-min range! Make sure the values given to NtQueryTimerResolution() are well outside the range of what it could return. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/time.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index f75b159f441..7ea506337a4 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -216,18 +216,20 @@ static void test_RtlQueryPerformanceCounter(void) } #endif +#define TIMER_LEEWAY 10 #define CHECK_CURRENT_TIMER(expected) \ do { \ ok(status == STATUS_SUCCESS, "NtSetTimerResolution failed %x\n", status); \ - ok(cur2 == (expected), "expected new timer resolution %u, got %u\n", (expected), cur2); \ - min2 = min + 10; \ + ok(cur2 == (expected) || broken(abs((int)((expected) - cur2)) <= TIMER_LEEWAY), "expected new timer resolution %u, got %u\n", (expected), cur2); \ + set = cur2; \ + min2 = min + 20000; \ cur2 = min2 + 1; \ max2 = cur2 + 1; \ status = NtQueryTimerResolution(&min2, &max2, &cur2); \ ok(status == STATUS_SUCCESS, "NtQueryTimerResolution() failed %x\n", status); \ ok(min2 == min, "NtQueryTimerResolution() expected min=%u, got %u\n", min, min2); \ ok(max2 == max, "NtQueryTimerResolution() expected max=%u, got %u\n", max, max2); \ - ok(cur2 == expected, "NtQueryTimerResolution() expected timer resolution %u, got %u\n", (expected), cur2); \ + ok(cur2 == set, "NtQueryTimerResolution() expected timer resolution %u, got %u\n", set, cur2); \ } while (0) static void test_TimerResolution(void) @@ -252,7 +254,8 @@ static void test_TimerResolution(void) ok(min == 156250 /* 1/64s HPET */ || min == 156001 /* RTC */, "unexpected minimum timer resolution %u\n", min); ok(0 < max, "invalid maximum timer resolution, should be 0 < %u\n", max); - ok(max <= cur && cur <= min, "invalid timer resolutions, should be %u <= %u <= %u\n", max, cur, min); + ok(max <= cur || broken(max - TIMER_LEEWAY <= cur), "invalid timer resolutions, should be %u <= %u\n", max, cur); + ok(cur <= min || broken(cur <= min + TIMER_LEEWAY), "invalid timer resolutions, should be %u <= %u\n", cur, min); status = NtSetTimerResolution(0, FALSE, NULL); ok(status == STATUS_ACCESS_VIOLATION, "NtSetTimerResolution(,,NULL) success\n"); @@ -261,7 +264,7 @@ static void test_TimerResolution(void) status = NtSetTimerResolution(cur - 1, TRUE, NULL); ok(status == STATUS_ACCESS_VIOLATION, "NtSetTimerResolution() failed %x\n", status); - min2 = min + 1; + min2 = min + 10000; cur2 = min2 + 1; max2 = cur2 + 1; status = NtQueryTimerResolution(&min2, &max2, &cur2); @@ -311,7 +314,7 @@ static void test_TimerResolution(void) set = max < cur ? cur - 1 : max; status = NtSetTimerResolution(set, TRUE, &cur2); ok(status == STATUS_SUCCESS, "NtSetTimerResolution() failed %x\n", status); - ok(cur2 <= set, "expected new timer resolution %u <= %u\n", cur2, set); + ok(cur2 <= set || broken(cur2 <= set + TIMER_LEEWAY), "expected new timer resolution %u <= %u\n", cur2, set); trace("timer resolution: %u(max) <= %u(cur) <= %u(prev) <= %u(min)\n", max, cur2, cur, min); cur2 = 7654321;

1 0

Zebediah Figura : krnl386: Remove unused support for WCB16_REGS_LONG.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 3338972febac68504fe60da158605dd038387b8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3338972febac68504fe60da1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 4 10:21:20 2021 -0500 krnl386: Remove unused support for WCB16_REGS_LONG. This was introduced in 3a5b7cf105f52c3a2936be09e318c4177454bcc9 as way to expose wine_call_to_16_regs_long(); however, the same commit changed the only user to use WCB16_REGS instead. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/wowthunk.c | 19 ++++--------------- include/wownt32.h | 1 - 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/krnl386.exe16/wowthunk.c b/dlls/krnl386.exe16/wowthunk.c index 73d1565c573..5bd9d7aecd4 100644 --- a/dlls/krnl386.exe16/wowthunk.c +++ b/dlls/krnl386.exe16/wowthunk.c @@ -400,7 +400,7 @@ BOOL WINAPI K32WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags, memcpy( stack, pArgs, cbArgs ); - if (dwFlags & (WCB16_REGS|WCB16_REGS_LONG)) + if (dwFlags & WCB16_REGS) { CONTEXT *context = (CONTEXT *)pdwRetCode; @@ -420,20 +420,9 @@ BOOL WINAPI K32WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags, } /* push return address */ - if (dwFlags & WCB16_REGS_LONG) - { - stack -= sizeof(DWORD); - *((DWORD *)stack) = HIWORD(call16_ret_addr); - stack -= sizeof(DWORD); - *((DWORD *)stack) = LOWORD(call16_ret_addr); - cbArgs += 2 * sizeof(DWORD); - } - else - { - stack -= sizeof(SEGPTR); - *((SEGPTR *)stack) = call16_ret_addr; - cbArgs += sizeof(SEGPTR); - } + stack -= sizeof(SEGPTR); + *((SEGPTR *)stack) = call16_ret_addr; + cbArgs += sizeof(SEGPTR); _EnterWin16Lock(); wine_call_to_16_regs( context, cbArgs, call16_handler ); diff --git a/include/wownt32.h b/include/wownt32.h index 51b1108d1c9..ddfa9b562b7 100644 --- a/include/wownt32.h +++ b/include/wownt32.h @@ -150,7 +150,6 @@ WORD WINAPI WOWHandle16(HANDLE,WOW_HANDLE_TYPE); /* Wine extensions: call register function, context ptr is passed in the return value LPDWORD */ #define WCB16_REGS 2 -#define WCB16_REGS_LONG 4 /* function uses 32-bit lret */ DWORD WINAPI WOWCallback16(DWORD,DWORD); BOOL WINAPI WOWCallback16Ex(DWORD,DWORD,DWORD,LPVOID,LPDWORD);

1 0

Piotr Caban : msvcrt: Implement _fpreset on arm and aarch64.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: a440e8aa8e519b122f6f2c8f7c919f891d5b8ff9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a440e8aa8e519b122f6f2c8f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 4 18:05:29 2021 +0200 msvcrt: Implement _fpreset on arm and aarch64. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a60104e16b3..bb450fad01c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5982,11 +5982,9 @@ void CDECL _fpreset(void) unsigned int cw = _MCW_EM, sw = 0; _setfp_sse(&cw, ~0, &sw, ~0); } -#elif defined(__x86_64__) +#else unsigned int cw = _MCW_EM, sw = 0; _setfp(&cw, ~0, &sw, ~0); -#else - FIXME( "not implemented\n" ); #endif }

1 0

Piotr Caban : msvcrt: Use _setfp helper on all architectures.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 0c808ff4d36ff99e6082a9ee924d850d93867790 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c808ff4d36ff99e6082a9ee… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 4 18:05:18 2021 +0200 msvcrt: Use _setfp helper on all architectures. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 61ca51d0b1f..a60104e16b3 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5235,12 +5235,10 @@ static BOOL _setfp_sse( unsigned int *cw, unsigned int cw_mask, } #endif -#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || (defined(__arm__) && !defined(__SOFTFP__)) static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, unsigned int *sw, unsigned int sw_mask ) { -#if defined(__GNUC__) || defined(__clang__) -#ifdef __i386__ +#if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) unsigned long oldcw = 0, newcw = 0; unsigned long oldsw = 0, newsw = 0; unsigned int flags; @@ -5503,7 +5501,6 @@ static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, if (old_fpscr != fpscr) __asm__ __volatile__( "vmsr fpscr, %0" :: "r" (fpscr) ); return TRUE; -#endif #else FIXME("not implemented\n"); if (cw) *cw = 0; @@ -5511,7 +5508,6 @@ static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, return FALSE; #endif } -#endif /********************************************************************** * _statusfp2 (MSVCR80.@) @@ -5540,10 +5536,8 @@ unsigned int CDECL _statusfp(void) _statusfp2( &x86_sw, &sse2_sw ); /* FIXME: there's no definition for ambiguous status, just return all status bits for now */ flags = x86_sw | sse2_sw; -#elif defined(__x86_64__) || defined(__aarch64__) || (defined(__arm__) && !defined(__SOFTFP__)) - _setfp(NULL, 0, &flags, 0); #else - FIXME( "not implemented\n" ); + _setfp(NULL, 0, &flags, 0); #endif return flags; } @@ -5563,10 +5557,8 @@ unsigned int CDECL _clearfp(void) _setfp_sse(NULL, 0, &sse_sw, _MCW_EM); flags |= sse_sw; } -#elif defined(__x86_64__) || defined(__aarch64__) || (defined(__arm__) && !defined(__SOFTFP__)) - _setfp(NULL, 0, &flags, _MCW_EM); #else - FIXME( "not implemented\n" ); + _setfp(NULL, 0, &flags, _MCW_EM); #endif return flags; } @@ -5654,11 +5646,9 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) if ((flags ^ sse2_cw) & (_MCW_EM | _MCW_RC)) flags |= _EM_AMBIGUOUS; flags |= sse2_cw; -#elif defined(__x86_64__) || defined(__aarch64__) || (defined(__arm__) && !defined(__SOFTFP__)) +#else flags = newval; _setfp(&flags, mask, NULL, 0); -#else - FIXME( "not implemented\n" ); #endif return flags; } @@ -5803,7 +5793,6 @@ static __msvcrt_ulong fenv_encode(unsigned int x, unsigned int y) return x | y; } -#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || (defined(__arm__) && !defined(__SOFTFP__)) static BOOL fenv_decode(__msvcrt_ulong enc, unsigned int *x, unsigned int *y) { if (enc & 0x20) @@ -5813,7 +5802,6 @@ static BOOL fenv_decode(__msvcrt_ulong enc, unsigned int *x, unsigned int *y) return TRUE; } #endif -#endif #if _MSVCR_VER>=120 /********************************************************************* @@ -6008,7 +5996,6 @@ void CDECL _fpreset(void) */ int CDECL fesetenv(const fenv_t *env) { -#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || (defined(__arm__) && !defined(__SOFTFP__)) unsigned int x87_cw, cw, x87_stat, stat; unsigned int mask; @@ -6045,10 +6032,6 @@ int CDECL fesetenv(const fenv_t *env) return 1; return 0; #endif -#else - FIXME( "not implemented\n" ); - return 1; -#endif } #endif

1 0

Piotr Caban : msvcrt: Introduce _setfp helper on arm.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: b28b409bb51ea361b8da0ff9d9cf27d06d795761 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b28b409bb51ea361b8da0ff9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 4 18:05:13 2021 +0200 msvcrt: Introduce _setfp helper on arm. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 157 +++++++++++++++++++++++++---------------------------- 1 file changed, 73 insertions(+), 84 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ff945ff4bae..61ca51d0b1f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5235,7 +5235,7 @@ static BOOL _setfp_sse( unsigned int *cw, unsigned int cw_mask, } #endif -#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) +#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || (defined(__arm__) && !defined(__SOFTFP__)) static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, unsigned int *sw, unsigned int sw_mask ) { @@ -5435,6 +5435,74 @@ static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, if (old_fpcr != fpcr) __asm__ __volatile__( "msr fpcr, %0" :: "r" (fpcr) ); return TRUE; +#elif defined(__arm__) && !defined(__SOFTFP__) + DWORD old_fpscr, fpscr; + unsigned int flags; + + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpscr) ); + old_fpscr = fpscr; + + cw_mask &= _MCW_EM | _MCW_RC; + sw_mask &= _MCW_EM; + + if (sw) + { + flags = 0; + if (fpscr & 0x1) flags |= _SW_INVALID; + if (fpscr & 0x2) flags |= _SW_ZERODIVIDE; + if (fpscr & 0x4) flags |= _SW_OVERFLOW; + if (fpscr & 0x8) flags |= _SW_UNDERFLOW; + if (fpscr & 0x10) flags |= _SW_INEXACT; + if (fpscr & 0x80) flags |= _SW_DENORMAL; + + *sw = (flags & ~sw_mask) | (*sw & sw_mask); + TRACE("arm update sw %08x to %08x\n", flags, *sw); + fpscr &= ~0x9f; + if (*sw & _SW_INVALID) fpscr |= 0x1; + if (*sw & _SW_ZERODIVIDE) fpscr |= 0x2; + if (*sw & _SW_OVERFLOW) fpscr |= 0x4; + if (*sw & _SW_UNDERFLOW) fpscr |= 0x8; + if (*sw & _SW_INEXACT) fpscr |= 0x10; + if (*sw & _SW_DENORMAL) fpscr |= 0x80; + *sw = flags; + } + + if (cw) + { + flags = 0; + if (!(fpscr & 0x100)) flags |= _EM_INVALID; + if (!(fpscr & 0x200)) flags |= _EM_ZERODIVIDE; + if (!(fpscr & 0x400)) flags |= _EM_OVERFLOW; + if (!(fpscr & 0x800)) flags |= _EM_UNDERFLOW; + if (!(fpscr & 0x1000)) flags |= _EM_INEXACT; + if (!(fpscr & 0x8000)) flags |= _EM_DENORMAL; + switch (fpscr & 0xc00000) + { + case 0x400000: flags |= _RC_UP; break; + case 0x800000: flags |= _RC_DOWN; break; + case 0xc00000: flags |= _RC_CHOP; break; + } + + *cw = (flags & ~cw_mask) | (*cw & cw_mask); + TRACE("arm update cw %08x to %08x\n", flags, *cw); + fpscr &= ~0xc09f00ul; + if (!(*cw & _EM_INVALID)) fpscr |= 0x100; + if (!(*cw & _EM_ZERODIVIDE)) fpscr |= 0x200; + if (!(*cw & _EM_OVERFLOW)) fpscr |= 0x400; + if (!(*cw & _EM_UNDERFLOW)) fpscr |= 0x800; + if (!(*cw & _EM_INEXACT)) fpscr |= 0x1000; + if (!(*cw & _EM_DENORMAL)) fpscr |= 0x8000; + switch (*cw & _MCW_RC) + { + case _RC_CHOP: fpscr |= 0xc00000; break; + case _RC_UP: fpscr |= 0x400000; break; + case _RC_DOWN: fpscr |= 0x800000; break; + } + } + + if (old_fpscr != fpscr) + __asm__ __volatile__( "vmsr fpscr, %0" :: "r" (fpscr) ); + return TRUE; #endif #else FIXME("not implemented\n"); @@ -5472,18 +5540,8 @@ unsigned int CDECL _statusfp(void) _statusfp2( &x86_sw, &sse2_sw ); /* FIXME: there's no definition for ambiguous status, just return all status bits for now */ flags = x86_sw | sse2_sw; -#elif defined(__x86_64__) || defined(__aarch64__) +#elif defined(__x86_64__) || defined(__aarch64__) || (defined(__arm__) && !defined(__SOFTFP__)) _setfp(NULL, 0, &flags, 0); -#elif defined(__arm__) && !defined(__SOFTFP__) - DWORD fpscr; - - __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpscr) ); - if (fpscr & 0x1) flags |= _SW_INVALID; - if (fpscr & 0x2) flags |= _SW_ZERODIVIDE; - if (fpscr & 0x4) flags |= _SW_OVERFLOW; - if (fpscr & 0x8) flags |= _SW_UNDERFLOW; - if (fpscr & 0x10) flags |= _SW_INEXACT; - if (fpscr & 0x80) flags |= _SW_DENORMAL; #else FIXME( "not implemented\n" ); #endif @@ -5505,20 +5563,8 @@ unsigned int CDECL _clearfp(void) _setfp_sse(NULL, 0, &sse_sw, _MCW_EM); flags |= sse_sw; } -#elif defined(__x86_64__) || defined(__aarch64__) +#elif defined(__x86_64__) || defined(__aarch64__) || (defined(__arm__) && !defined(__SOFTFP__)) _setfp(NULL, 0, &flags, _MCW_EM); -#elif defined(__arm__) && !defined(__SOFTFP__) - DWORD fpscr; - - __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpscr) ); - if (fpscr & 0x1) flags |= _SW_INVALID; - if (fpscr & 0x2) flags |= _SW_ZERODIVIDE; - if (fpscr & 0x4) flags |= _SW_OVERFLOW; - if (fpscr & 0x8) flags |= _SW_UNDERFLOW; - if (fpscr & 0x10) flags |= _SW_INEXACT; - if (fpscr & 0x80) flags |= _SW_DENORMAL; - fpscr &= ~0x9f; - __asm__ __volatile__( "vmsr fpscr, %0" :: "r" (fpscr) ); #else FIXME( "not implemented\n" ); #endif @@ -5608,40 +5654,9 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) if ((flags ^ sse2_cw) & (_MCW_EM | _MCW_RC)) flags |= _EM_AMBIGUOUS; flags |= sse2_cw; -#elif defined(__x86_64__) || defined(__aarch64__) +#elif defined(__x86_64__) || defined(__aarch64__) || (defined(__arm__) && !defined(__SOFTFP__)) flags = newval; _setfp(&flags, mask, NULL, 0); -#elif defined(__arm__) && !defined(__SOFTFP__) - DWORD fpscr; - - __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpscr) ); - if (!(fpscr & 0x100)) flags |= _EM_INVALID; - if (!(fpscr & 0x200)) flags |= _EM_ZERODIVIDE; - if (!(fpscr & 0x400)) flags |= _EM_OVERFLOW; - if (!(fpscr & 0x800)) flags |= _EM_UNDERFLOW; - if (!(fpscr & 0x1000)) flags |= _EM_INEXACT; - if (!(fpscr & 0x8000)) flags |= _EM_DENORMAL; - switch (fpscr & 0xc00000) - { - case 0x400000: flags |= _RC_UP; break; - case 0x800000: flags |= _RC_DOWN; break; - case 0xc00000: flags |= _RC_CHOP; break; - } - flags = (flags & ~mask) | (newval & mask); - fpscr &= ~0xc09f00ul; - if (!(flags & _EM_INVALID)) fpscr |= 0x100; - if (!(flags & _EM_ZERODIVIDE)) fpscr |= 0x200; - if (!(flags & _EM_OVERFLOW)) fpscr |= 0x400; - if (!(flags & _EM_UNDERFLOW)) fpscr |= 0x800; - if (!(flags & _EM_INEXACT)) fpscr |= 0x1000; - if (!(flags & _EM_DENORMAL)) fpscr |= 0x8000; - switch (flags & _MCW_RC) - { - case _RC_CHOP: fpscr |= 0xc00000; break; - case _RC_UP: fpscr |= 0x400000; break; - case _RC_DOWN: fpscr |= 0x800000; break; - } - __asm__ __volatile__( "vmsr fpscr, %0" :: "r" (fpscr) ); #else FIXME( "not implemented\n" ); #endif @@ -5993,7 +6008,7 @@ void CDECL _fpreset(void) */ int CDECL fesetenv(const fenv_t *env) { -#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) +#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || (defined(__arm__) && !defined(__SOFTFP__)) unsigned int x87_cw, cw, x87_stat, stat; unsigned int mask; @@ -6030,32 +6045,6 @@ int CDECL fesetenv(const fenv_t *env) return 1; return 0; #endif -#elif defined(__arm__) && !defined(__SOFTFP__) - DWORD fpscr; - unsigned int tmp, fp_cw, fp_stat; - - if (!env->_Fe_ctl && !env->_Fe_stat) { - _fpreset(); - return 0; - } - - if (!fenv_decode(env->_Fe_ctl, &tmp, &fp_cw)) - return 1; - if (!fenv_decode(env->_Fe_stat, &tmp, &fp_stat)) - return 1; - - _control87(_MCW_EM, _MCW_EM); - __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpscr) ); - fpscr &= ~0x9f; - if (fp_stat & _SW_INVALID) fpscr |= 0x1; - if (fp_stat & _SW_ZERODIVIDE) fpscr |= 0x2; - if (fp_stat & _SW_OVERFLOW) fpscr |= 0x4; - if (fp_stat & _SW_UNDERFLOW) fpscr |= 0x8; - if (fp_stat & _SW_INEXACT) fpscr |= 0x10; - if (fp_stat & _SW_DENORMAL) fpscr |= 0x80; - __asm__ __volatile__( "vmsr fpscr, %0" :: "r" (fpscr) ); - _control87(fp_cw, 0xffffffff); - return 0; #else FIXME( "not implemented\n" ); return 1;

1 0

Piotr Caban : msvcrt: Introduce _setfp helper on aarch64.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: 63f3f4283f89366d8c83857e4c93666fa60ac73b URL: https://source.winehq.org/git/wine.git/?a=commit;h=63f3f4283f89366d8c83857e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 4 18:05:06 2021 +0200 msvcrt: Introduce _setfp helper on aarch64. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 169 +++++++++++++++++++++++++++-------------------------- 1 file changed, 85 insertions(+), 84 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b27b6391a6f..ff945ff4bae 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5235,7 +5235,7 @@ static BOOL _setfp_sse( unsigned int *cw, unsigned int cw_mask, } #endif -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, unsigned int *sw, unsigned int sw_mask ) { @@ -5355,6 +5355,86 @@ static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, return TRUE; #elif defined(__x86_64__) return _setfp_sse(cw, cw_mask, sw, sw_mask); +#elif defined(__aarch64__) + ULONG_PTR old_fpsr = 0, fpsr = 0, old_fpcr = 0, fpcr = 0; + unsigned int flags; + + cw_mask &= _MCW_EM | _MCW_RC; + sw_mask &= _MCW_EM; + + if (sw) + { + __asm__ __volatile__( "mrs %0, fpsr" : "=r" (fpsr) ); + old_fpsr = fpsr; + + flags = 0; + if (fpsr & 0x1) flags |= _SW_INVALID; + if (fpsr & 0x2) flags |= _SW_ZERODIVIDE; + if (fpsr & 0x4) flags |= _SW_OVERFLOW; + if (fpsr & 0x8) flags |= _SW_UNDERFLOW; + if (fpsr & 0x10) flags |= _SW_INEXACT; + if (fpsr & 0x80) flags |= _SW_DENORMAL; + + *sw = (flags & ~sw_mask) | (*sw & sw_mask); + TRACE("aarch64 update sw %08x to %08x\n", flags, *sw); + fpsr &= ~0x9f; + if (*sw & _SW_INVALID) fpsr |= 0x1; + if (*sw & _SW_ZERODIVIDE) fpsr |= 0x2; + if (*sw & _SW_OVERFLOW) fpsr |= 0x4; + if (*sw & _SW_UNDERFLOW) fpsr |= 0x8; + if (*sw & _SW_INEXACT) fpsr |= 0x10; + if (*sw & _SW_DENORMAL) fpsr |= 0x80; + *sw = flags; + } + + if (cw) + { + __asm__ __volatile__( "mrs %0, fpcr" : "=r" (fpcr) ); + old_fpcr = fpcr; + + flags = 0; + if (!(fpcr & 0x100)) flags |= _EM_INVALID; + if (!(fpcr & 0x200)) flags |= _EM_ZERODIVIDE; + if (!(fpcr & 0x400)) flags |= _EM_OVERFLOW; + if (!(fpcr & 0x800)) flags |= _EM_UNDERFLOW; + if (!(fpcr & 0x1000)) flags |= _EM_INEXACT; + if (!(fpcr & 0x8000)) flags |= _EM_DENORMAL; + switch (fpcr & 0xc00000) + { + case 0x400000: flags |= _RC_UP; break; + case 0x800000: flags |= _RC_DOWN; break; + case 0xc00000: flags |= _RC_CHOP; break; + } + + *cw = (flags & ~cw_mask) | (*cw & cw_mask); + TRACE("aarch64 update cw %08x to %08x\n", flags, *cw); + fpcr &= ~0xc09f00ul; + if (!(*cw & _EM_INVALID)) fpcr |= 0x100; + if (!(*cw & _EM_ZERODIVIDE)) fpcr |= 0x200; + if (!(*cw & _EM_OVERFLOW)) fpcr |= 0x400; + if (!(*cw & _EM_UNDERFLOW)) fpcr |= 0x800; + if (!(*cw & _EM_INEXACT)) fpcr |= 0x1000; + if (!(*cw & _EM_DENORMAL)) fpcr |= 0x8000; + switch (*cw & _MCW_RC) + { + case _RC_CHOP: fpcr |= 0xc00000; break; + case _RC_UP: fpcr |= 0x400000; break; + case _RC_DOWN: fpcr |= 0x800000; break; + } + } + + /* mask exceptions if needed */ + if (old_fpcr != fpcr && ~(old_fpcr >> 8) & fpsr & 0x9f != fpsr & 0x9f) + { + ULONG_PTR mask = fpcr & ~0x9f00; + __asm__ __volatile__( "msr fpcr, %0" :: "r" (mask) ); + } + + if (old_fpsr != fpsr) + __asm__ __volatile__( "msr fpsr, %0" :: "r" (fpsr) ); + if (old_fpcr != fpcr) + __asm__ __volatile__( "msr fpcr, %0" :: "r" (fpcr) ); + return TRUE; #endif #else FIXME("not implemented\n"); @@ -5392,18 +5472,8 @@ unsigned int CDECL _statusfp(void) _statusfp2( &x86_sw, &sse2_sw ); /* FIXME: there's no definition for ambiguous status, just return all status bits for now */ flags = x86_sw | sse2_sw; -#elif defined(__x86_64__) +#elif defined(__x86_64__) || defined(__aarch64__) _setfp(NULL, 0, &flags, 0); -#elif defined(__aarch64__) - ULONG_PTR fpsr; - - __asm__ __volatile__( "mrs %0, fpsr" : "=r" (fpsr) ); - if (fpsr & 0x1) flags |= _SW_INVALID; - if (fpsr & 0x2) flags |= _SW_ZERODIVIDE; - if (fpsr & 0x4) flags |= _SW_OVERFLOW; - if (fpsr & 0x8) flags |= _SW_UNDERFLOW; - if (fpsr & 0x10) flags |= _SW_INEXACT; - if (fpsr & 0x80) flags |= _SW_DENORMAL; #elif defined(__arm__) && !defined(__SOFTFP__) DWORD fpscr; @@ -5435,20 +5505,8 @@ unsigned int CDECL _clearfp(void) _setfp_sse(NULL, 0, &sse_sw, _MCW_EM); flags |= sse_sw; } -#elif defined(__x86_64__) +#elif defined(__x86_64__) || defined(__aarch64__) _setfp(NULL, 0, &flags, _MCW_EM); -#elif defined(__aarch64__) - ULONG_PTR fpsr; - - __asm__ __volatile__( "mrs %0, fpsr" : "=r" (fpsr) ); - if (fpsr & 0x1) flags |= _SW_INVALID; - if (fpsr & 0x2) flags |= _SW_ZERODIVIDE; - if (fpsr & 0x4) flags |= _SW_OVERFLOW; - if (fpsr & 0x8) flags |= _SW_UNDERFLOW; - if (fpsr & 0x10) flags |= _SW_INEXACT; - if (fpsr & 0x80) flags |= _SW_DENORMAL; - fpsr &= ~0x9f; - __asm__ __volatile__( "msr fpsr, %0" :: "r" (fpsr) ); #elif defined(__arm__) && !defined(__SOFTFP__) DWORD fpscr; @@ -5550,40 +5608,9 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) if ((flags ^ sse2_cw) & (_MCW_EM | _MCW_RC)) flags |= _EM_AMBIGUOUS; flags |= sse2_cw; -#elif defined(__x86_64__) +#elif defined(__x86_64__) || defined(__aarch64__) flags = newval; _setfp(&flags, mask, NULL, 0); -#elif defined(__aarch64__) - ULONG_PTR fpcr; - - __asm__ __volatile__( "mrs %0, fpcr" : "=r" (fpcr) ); - if (!(fpcr & 0x100)) flags |= _EM_INVALID; - if (!(fpcr & 0x200)) flags |= _EM_ZERODIVIDE; - if (!(fpcr & 0x400)) flags |= _EM_OVERFLOW; - if (!(fpcr & 0x800)) flags |= _EM_UNDERFLOW; - if (!(fpcr & 0x1000)) flags |= _EM_INEXACT; - if (!(fpcr & 0x8000)) flags |= _EM_DENORMAL; - switch (fpcr & 0xc00000) - { - case 0x400000: flags |= _RC_UP; break; - case 0x800000: flags |= _RC_DOWN; break; - case 0xc00000: flags |= _RC_CHOP; break; - } - flags = (flags & ~mask) | (newval & mask); - fpcr &= ~0xc09f00ul; - if (!(flags & _EM_INVALID)) fpcr |= 0x100; - if (!(flags & _EM_ZERODIVIDE)) fpcr |= 0x200; - if (!(flags & _EM_OVERFLOW)) fpcr |= 0x400; - if (!(flags & _EM_UNDERFLOW)) fpcr |= 0x800; - if (!(flags & _EM_INEXACT)) fpcr |= 0x1000; - if (!(flags & _EM_DENORMAL)) fpcr |= 0x8000; - switch (flags & _MCW_RC) - { - case _RC_CHOP: fpcr |= 0xc00000; break; - case _RC_UP: fpcr |= 0x400000; break; - case _RC_DOWN: fpcr |= 0x800000; break; - } - __asm__ __volatile__( "msr fpcr, %0" :: "r" (fpcr) ); #elif defined(__arm__) && !defined(__SOFTFP__) DWORD fpscr; @@ -5966,7 +5993,7 @@ void CDECL _fpreset(void) */ int CDECL fesetenv(const fenv_t *env) { -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) unsigned int x87_cw, cw, x87_stat, stat; unsigned int mask; @@ -6003,32 +6030,6 @@ int CDECL fesetenv(const fenv_t *env) return 1; return 0; #endif -#elif defined(__aarch64__) - ULONG_PTR fpsr; - unsigned int tmp, fp_cw, fp_stat; - - if (!env->_Fe_ctl && !env->_Fe_stat) { - _fpreset(); - return 0; - } - - if (!fenv_decode(env->_Fe_ctl, &tmp, &fp_cw)) - return 1; - if (!fenv_decode(env->_Fe_stat, &tmp, &fp_stat)) - return 1; - - _control87(_MCW_EM, _MCW_EM); - __asm__ __volatile__( "mrs %0, fpsr" : "=r" (fpsr) ); - fpsr &= ~0x9f; - if (fp_stat & _SW_INVALID) fpsr |= 0x1; - if (fp_stat & _SW_ZERODIVIDE) fpsr |= 0x2; - if (fp_stat & _SW_OVERFLOW) fpsr |= 0x4; - if (fp_stat & _SW_UNDERFLOW) fpsr |= 0x8; - if (fp_stat & _SW_INEXACT) fpsr |= 0x10; - if (fp_stat & _SW_DENORMAL) fpsr |= 0x80; - __asm__ __volatile__( "msr fpsr, %0" :: "r" (fpsr) ); - _control87(fp_cw, 0xffffffff); - return 0; #elif defined(__arm__) && !defined(__SOFTFP__) DWORD fpscr; unsigned int tmp, fp_cw, fp_stat;

1 0

Piotr Caban : msvcrt: Introduce _setfp helper to access floating point status and control words.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: wine Branch: master Commit: f1ef14dc177b23c908e4dd2d47846cb673e3feac URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1ef14dc177b23c908e4dd2d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 4 18:05:03 2021 +0200 msvcrt: Introduce _setfp helper to access floating point status and control words. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 320 ++++++++++++++++++++++++++--------------------------- 1 file changed, 160 insertions(+), 160 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f1ef14dc177b23c908e4…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021