[PATCH 5/6] ntdll: Restore frame in return path of the x86_64 syscall dispatcher.

[Rémi Bernon]

From: Rémi Bernon

Making it a bit more consistent with the i386 dispatcher.
---
 dlls/ntdll/unix/signal_x86_64.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index abf96a9f740..81e5e4d2fdc 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -2733,11 +2733,11 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
                    "subq $0x20,%rsp\n\t"
                    "movq (%rbx),%r10\n\t"          /* table->ServiceTable */
                    "callq *(%r10,%rax,8)\n\t"
+
+                "\n.L__wine_syscall_dispatcher_restore:\n\t"
                    "leaq -0x98(%rbp),%rcx\n\t"
                    /* $rcx is now pointing to "frame" again */
                    __ASM_CFI(".cfi_restore_state\n\t")
-
-                "\n.L__wine_syscall_dispatcher_restore:\n\t"
                    "movl 0x94(%rcx),%edx\n\t"      /* frame->restore_flags */
 #ifdef __linux__
                    "testl $12,%r14d\n\t"           /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */
@@ -2823,6 +2823,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
                 __ASM_NAME("__wine_syscall_dispatcher_return") ":\n\t"
                    "movl 0xb0(%rcx),%r14d\n\t"     /* frame->syscall_flags */
                    "movq %rdx,%rax\n\t"
+                   "leaq 0x98(%rcx),%rbp\n\t"
                    "jmp .L__wine_syscall_dispatcher_restore\n\t" )