[PATCH 0/1] MR1772: ntdll: Make sure xmm6-xmm15 are always restored in unix call dispatcher

[Torge Matthies (＠tmatthies)]

If after a unix call `frame->restore_flags` was not 0 but did not include either `CONTEXT_FLOATING_POINT` or `CONTEXT_XSTATE`, xmm6-xmm15 were not restored to their previous values.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1772

[PATCH 1/1] ntdll: Make sure xmm6-xmm15 are always restored in unix call dispatcher.

[Torge Matthies]

From: Torge Matthies <tmatthies(a)codeweavers.com>

Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com>
---
 dlls/ntdll/unix/signal_x86_64.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index fa8660ca914..16124ac421f 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -2913,14 +2913,8 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher,
                    "movq %r8,%rdi\n\t"             /* args */
                    "callq *(%r10,%rdx,8)\n\t"
                    "movq %rsp,%rcx\n"
-                   "testl $0xffff,0x94(%rcx)\n\t"  /* frame->restore_flags */
+                   "testl $0x8,0x94(%rcx)\n\t"     /* frame->restore_flags */
                    "jnz .L__wine_syscall_dispatcher_return\n\t"
-#ifdef __linux__
-                   "testl $12,%r14d\n\t"           /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */
-                   "jz 1f\n\t"
-                   "movw 0x7e(%rcx),%fs\n"
-                   "1:\n\t"
-#endif
                    "movdqa 0x1c0(%rcx),%xmm6\n\t"
                    "movdqa 0x1d0(%rcx),%xmm7\n\t"
                    "movdqa 0x1e0(%rcx),%xmm8\n\t"
@@ -2931,6 +2925,14 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher,
                    "movdqa 0x230(%rcx),%xmm13\n\t"
                    "movdqa 0x240(%rcx),%xmm14\n\t"
                    "movdqa 0x250(%rcx),%xmm15\n\t"
+                   "testl $0xffff,0x94(%rcx)\n\t"  /* frame->restore_flags */
+                   "jnz .L__wine_syscall_dispatcher_return\n\t"
+#ifdef __linux__
+                   "testl $12,%r14d\n\t"           /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */
+                   "jz 1f\n\t"
+                   "movw 0x7e(%rcx),%fs\n"
+                   "1:\n\t"
+#endif
                    "movq 0x60(%rcx),%r14\n\t"
                    __ASM_CFI(".cfi_same_value r14\n\t")
                    "movq 0x28(%rcx),%rdi\n\t"
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1772