November 2023 - Wine-commits

Alexandre Julliard : ntdll: Get rid of the thread exit frame on ARM64.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: e5af98dc17fd4e2b50995c962b31cee970a9b71f URL: https://gitlab.winehq.org/wine/wine/-/commit/e5af98dc17fd4e2b50995c962b31ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 14:21:42 2023 +0100 ntdll: Get rid of the thread exit frame on ARM64. --- dlls/ntdll/unix/signal_arm64.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 8bf9fce3948..6bf100351e1 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -148,13 +148,11 @@ C_ASSERT( sizeof( struct syscall_frame ) == 0x330 ); struct arm64_thread_data { - void *exit_frame; /* 02f0 exit frame pointer */ - struct syscall_frame *syscall_frame; /* 02f8 frame pointer on syscall entry */ + struct syscall_frame *syscall_frame; /* 02f0 frame pointer on syscall entry */ }; C_ASSERT( sizeof(struct arm64_thread_data) <= sizeof(((struct ntdll_thread_data *)0)->cpu_data) ); -C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm64_thread_data, exit_frame ) == 0x2f0 ); -C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm64_thread_data, syscall_frame ) == 0x2f8 ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm64_thread_data, syscall_frame ) == 0x2f0 ); static inline struct arm64_thread_data *arm64_thread_data(void) { @@ -1143,9 +1141,9 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, "ldr x4, [x18]\n\t" /* teb->Tib.ExceptionList */ "stp x3, x4, [x29, #0xb0]\n\t" - "ldr x7, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ + "ldr x7, [x18, #0x2f0]\n\t" /* arm64_thread_data()->syscall_frame */ "sub x3, sp, #0x330\n\t" /* sizeof(struct syscall_frame) */ - "str x3, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ + "str x3, [x18, #0x2f0]\n\t" /* arm64_thread_data()->syscall_frame */ "add x8, x29, #0xc0\n\t" "stp x7, x8, [x3, #0x110]\n\t" /* frame->prev_frame,syscall_cfa */ /* switch to user stack */ @@ -1159,9 +1157,9 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, extern void DECLSPEC_NORETURN user_mode_callback_return( void *ret_ptr, ULONG ret_len, NTSTATUS status, TEB *teb ); __ASM_GLOBAL_FUNC( user_mode_callback_return, - "ldr x4, [x3, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ + "ldr x4, [x3, #0x2f0]\n\t" /* arm64_thread_data()->syscall_frame */ "ldp x5, x29, [x4,#0x110]\n\t" /* prev_frame,syscall_cfa */ - "str x5, [x3, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ + "str x5, [x3, #0x2f0]\n\t" /* arm64_thread_data()->syscall_frame */ "sub x29, x29, #0xc0\n\t" __ASM_CFI(".cfi_def_cfa_register 29\n\t") __ASM_CFI(".cfi_rel_offset 29,0x00\n\t") @@ -1757,13 +1755,11 @@ __ASM_GLOBAL_FUNC( signal_start_thread, __ASM_CFI(".cfi_rel_offset 27,0x50\n\t") __ASM_CFI(".cfi_rel_offset 28,0x58\n\t") "add x5, x29, #0xc0\n\t" /* syscall_cfa */ - /* store exit frame */ - "str x29, [x3, #0x2f0]\n\t" /* arm64_thread_data()->exit_frame */ /* set syscall frame */ - "ldr x4, [x3, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ + "ldr x4, [x3, #0x2f0]\n\t" /* arm64_thread_data()->syscall_frame */ "cbnz x4, 1f\n\t" "sub x4, sp, #0x330\n\t" /* sizeof(struct syscall_frame) */ - "str x4, [x3, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ + "str x4, [x3, #0x2f0]\n\t" /* arm64_thread_data()->syscall_frame */ /* switch to kernel stack */ "1:\tmov sp, x4\n\t" "bl " __ASM_NAME("call_init_thunk") ) @@ -1771,21 +1767,14 @@ __ASM_GLOBAL_FUNC( signal_start_thread, /*********************************************************************** * signal_exit_thread */ -__ASM_GLOBAL_FUNC( signal_exit_thread, - "stp x29, x30, [sp,#-0xc0]!\n\t" - "ldr x3, [x2, #0x2f0]\n\t" /* arm64_thread_data()->exit_frame */ - "str xzr, [x2, #0x2f0]\n\t" - "cbz x3, 1f\n\t" - "mov sp, x3\n" - "1:\tldp x29, x30, [sp], #0xc0\n\t" - "br x1" ) +__ASM_GLOBAL_FUNC( signal_exit_thread, "br x1" ) /*********************************************************************** * __wine_syscall_dispatcher */ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, - "ldr x10, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ + "ldr x10, [x18, #0x2f0]\n\t" /* arm64_thread_data()->syscall_frame */ "stp x18, x19, [x10, #0x90]\n\t" "stp x20, x21, [x10, #0xa0]\n\t" "stp x22, x23, [x10, #0xb0]\n\t" @@ -1920,7 +1909,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, * __wine_unix_call_dispatcher */ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, - "ldr x10, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ + "ldr x10, [x18, #0x2f0]\n\t" /* arm64_thread_data()->syscall_frame */ "stp x18, x19, [x10, #0x90]\n\t" "stp x20, x21, [x10, #0xa0]\n\t" "stp x22, x23, [x10, #0xb0]\n\t"

1 0

Alexandre Julliard : ntdll: Get rid of the thread exit frame on ARM.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: 5ee1bf0aa195882c08dce66cb317cd2134d0f02a URL: https://gitlab.winehq.org/wine/wine/-/commit/5ee1bf0aa195882c08dce66cb317cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 14:27:48 2023 +0100 ntdll: Get rid of the thread exit frame on ARM. --- dlls/ntdll/unix/signal_arm.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index a5ab2473ade..07327718c0b 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -205,15 +205,13 @@ C_ASSERT( sizeof( struct syscall_frame ) == 0x160); struct arm_thread_data { - void *exit_frame; /* 1d4 exit frame pointer */ + SYSTEM_SERVICE_TABLE *syscall_table; /* 1d4 syscall table */ struct syscall_frame *syscall_frame; /* 1d8 frame pointer on syscall entry */ - SYSTEM_SERVICE_TABLE *syscall_table; /* 1dc syscall table */ }; C_ASSERT( sizeof(struct arm_thread_data) <= sizeof(((struct ntdll_thread_data *)0)->cpu_data) ); -C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm_thread_data, exit_frame ) == 0x1d4 ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm_thread_data, syscall_table ) == 0x1d4 ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm_thread_data, syscall_frame ) == 0x1d8 ); -C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm_thread_data, syscall_table ) == 0x1dc ); static inline struct arm_thread_data *arm_thread_data(void) { @@ -1653,8 +1651,6 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "push {r4-r12,lr}\n\t" "add r7, sp, #0x28\n\t" /* syscall_cfa */ "mcr p15, 0, r3, c13, c0, 2\n\t" /* set teb register */ - /* store exit frame */ - "str sp, [r3, #0x1d4]\n\t" /* arm_thread_data()->exit_frame */ /* set syscall frame */ "ldr r6, [r3, #0x1d8]\n\t" /* arm_thread_data()->syscall_frame */ "cbnz r6, 1f\n\t" @@ -1669,15 +1665,7 @@ __ASM_GLOBAL_FUNC( signal_start_thread, /*********************************************************************** * signal_exit_thread */ -__ASM_GLOBAL_FUNC( signal_exit_thread, - __ASM_EHABI(".cantunwind\n\t") - "ldr r3, [r2, #0x1d4]\n\t" /* arm_thread_data()->exit_frame */ - "mov ip, #0\n\t" - "str ip, [r2, #0x1d4]\n\t" - "cmp r3, ip\n\t" - "it ne\n\t" - "movne sp, r3\n\t" - "blx r1" ) +__ASM_GLOBAL_FUNC( signal_exit_thread, "bx r1" ) /*********************************************************************** @@ -1718,7 +1706,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI(".cfi_offset r11,-0x0c\n\t") __ASM_CFI(".cfi_offset r12,-0x08\n\t") __ASM_CFI(".cfi_offset lr,-0x04\n\t") - "ldr r5, [r2, #0x1dc]\n\t" /* arm_thread_data()->syscall_table */ + "ldr r5, [r2, #0x1d4]\n\t" /* arm_thread_data()->syscall_table */ "ubfx r4, ip, #12, #2\n\t" /* syscall table number */ "bfc ip, #12, #20\n\t" /* syscall number */ "add r4, r5, r4, lsl #4\n\t"

1 0

Alexandre Julliard : ntdll: Remove the signal_exit_thread wrapper.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: 101bb94a69075cfddc527efda25772dbf4b76adf URL: https://gitlab.winehq.org/wine/wine/-/commit/101bb94a69075cfddc527efda25772… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 14:31:36 2023 +0100 ntdll: Remove the signal_exit_thread wrapper. --- dlls/ntdll/unix/signal_arm.c | 6 ------ dlls/ntdll/unix/signal_arm64.c | 5 ----- dlls/ntdll/unix/signal_i386.c | 6 ------ dlls/ntdll/unix/signal_x86_64.c | 6 ------ dlls/ntdll/unix/thread.c | 8 ++++---- dlls/ntdll/unix/unix_private.h | 3 +-- 6 files changed, 5 insertions(+), 29 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 07327718c0b..f255328fc73 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1662,12 +1662,6 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "bl " __ASM_NAME("call_init_thunk") ) -/*********************************************************************** - * signal_exit_thread - */ -__ASM_GLOBAL_FUNC( signal_exit_thread, "bx r1" ) - - /*********************************************************************** * __wine_syscall_dispatcher */ diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 6bf100351e1..0208913010d 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1764,11 +1764,6 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "1:\tmov sp, x4\n\t" "bl " __ASM_NAME("call_init_thunk") ) -/*********************************************************************** - * signal_exit_thread - */ -__ASM_GLOBAL_FUNC( signal_exit_thread, "br x1" ) - /*********************************************************************** * __wine_syscall_dispatcher diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index a1454d8d291..a5aa9623b07 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -2525,12 +2525,6 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "call " __ASM_NAME("call_init_thunk") ) -/*********************************************************************** - * signal_exit_thread - */ -__ASM_GLOBAL_FUNC( signal_exit_thread, "jmp *8(%esp)" ) - - /*********************************************************************** * __wine_syscall_dispatcher */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index b7bed4e3702..851655a0b5a 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2572,12 +2572,6 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "call " __ASM_NAME("call_init_thunk")) -/*********************************************************************** - * signal_exit_thread - */ -__ASM_GLOBAL_FUNC( signal_exit_thread, "jmp *%rsi" ) - - /*********************************************************************** * __wine_syscall_dispatcher */ diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 2a9bc41e788..c4653c6a769 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1078,7 +1078,7 @@ static void contexts_from_server( CONTEXT *context, context_t server_contexts[2] /*********************************************************************** * pthread_exit_wrapper */ -static void pthread_exit_wrapper( int status ) +static DECLSPEC_NORETURN void pthread_exit_wrapper( int status ) { close( ntdll_get_thread_data()->wait_fd[0] ); close( ntdll_get_thread_data()->wait_fd[1] ); @@ -1404,7 +1404,7 @@ void abort_thread( int status ) { pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); if (InterlockedDecrement( &nb_threads ) <= 0) abort_process( status ); - signal_exit_thread( status, pthread_exit_wrapper, NtCurrentTeb() ); + pthread_exit_wrapper( status ); } @@ -1439,7 +1439,7 @@ static DECLSPEC_NORETURN void exit_thread( int status ) virtual_free_teb( teb ); } } - signal_exit_thread( status, pthread_exit_wrapper, NtCurrentTeb() ); + pthread_exit_wrapper( status ); } @@ -1449,7 +1449,7 @@ static DECLSPEC_NORETURN void exit_thread( int status ) void exit_process( int status ) { pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); - signal_exit_thread( get_unix_exit_code( status ), process_exit_wrapper, NtCurrentTeb() ); + process_exit_wrapper( get_unix_exit_code( status )); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index ef116bee917..9aeacc7b823 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -203,7 +203,7 @@ extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t * extern int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, int *needs_close, enum server_fd_type *type, unsigned int *options ); extern void wine_server_send_fd( int fd ); -extern void process_exit_wrapper( int status ); +extern void process_exit_wrapper( int status ) DECLSPEC_NORETURN; extern size_t server_init_process(void); extern void server_init_process_done(void); extern void server_init_thread( void *entry_point, BOOL *suspend ); @@ -276,7 +276,6 @@ extern void signal_free_thread( TEB *teb ); extern void signal_init_process(void); extern void DECLSPEC_NORETURN signal_start_thread( PRTL_THREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB *teb ); -extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int), TEB *teb ); extern SYSTEM_SERVICE_TABLE KeServiceDescriptorTable[4]; extern void __wine_syscall_dispatcher(void); extern void DECLSPEC_NORETURN __wine_syscall_dispatcher_return( void *frame, ULONG_PTR retval );

1 0

Alexandre Julliard : ntdll: Store the syscall table in the TEB on i386.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: d4439fd92b5e782e7d1320a8a47af0a3535cb46c URL: https://gitlab.winehq.org/wine/wine/-/commit/d4439fd92b5e782e7d1320a8a47af0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 09:46:05 2023 +0100 ntdll: Store the syscall table in the TEB on i386. --- dlls/ntdll/unix/signal_i386.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 99592429a81..ba6bc38fe85 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -455,7 +455,7 @@ struct syscall_frame UINT edi; /* 02c */ UINT esi; /* 030 */ UINT ebp; /* 034 */ - SYSTEM_SERVICE_TABLE *syscall_table; /* 038 */ + void *unused; /* 038 */ struct syscall_frame *prev_frame; /* 03c */ union /* 040 */ { @@ -482,12 +482,14 @@ struct x86_thread_data UINT dr7; /* 1f0 */ void *exit_frame; /* 1f4 exit frame pointer */ struct syscall_frame *syscall_frame; /* 1f8 frame pointer on syscall entry */ + SYSTEM_SERVICE_TABLE *syscall_table; /* 1fc syscall table */ }; C_ASSERT( sizeof(struct x86_thread_data) <= sizeof(((struct ntdll_thread_data *)0)->cpu_data) ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, gs ) == 0x1d8 ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, exit_frame ) == 0x1f4 ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, syscall_frame ) == 0x1f8 ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, syscall_table ) == 0x1fc ); /* flags to control the behavior of the syscall dispatcher */ #define SYSCALL_HAVE_XSAVE 1 @@ -1596,8 +1598,6 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, "movl 0x1f8(%edx),%ecx\n\t" /* x86_thread_data()->syscall_frame */ "movl (%ecx),%eax\n\t" /* frame->syscall_flags */ "movl %eax,(%esp)\n\t" - "movl 0x38(%ecx),%eax\n\t" /* frame->syscall_table */ - "movl %eax,0x38(%esp)\n\t" "movl %ecx,0x3c(%esp)\n\t" /* frame->prev_frame */ "movl %esp,0x1f8(%edx)\n\t" /* x86_thread_data()->syscall_frame */ "movl 0x1c(%ebp),%ecx\n\t" /* func */ @@ -2423,6 +2423,7 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB ldt_set_fs( thread_data->fs, teb ); thread_data->gs = get_gs(); + thread_data->syscall_table = KeServiceDescriptorTable; context.SegCs = get_cs(); context.SegDs = get_ds(); @@ -2458,7 +2459,6 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB frame->eip = (DWORD)pLdrInitializeThunk; frame->prev_frame = NULL; frame->syscall_flags = syscall_flags; - frame->syscall_table = KeServiceDescriptorTable; frame->restore_flags |= LOWORD(CONTEXT_INTEGER); pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); @@ -2569,7 +2569,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movl %eax,%ebx\n\t" "shrl $8,%ebx\n\t" "andl $0x30,%ebx\n\t" /* syscall table number */ - "addl 0x38(%ecx),%ebx\n\t" /* frame->syscall_table */ + "addl %fs:0x1fc,%ebx\n\t" /* x86_thread_data()->syscall_table */ "testl $3,(%ecx)\n\t" /* frame->syscall_flags & (SYSCALL_HAVE_XSAVE | SYSCALL_HAVE_XSAVEC) */ "jz 2f\n\t" "movl $7,%eax\n\t"

1 0

Alexandre Julliard : ntdll: Store the syscall table in the TEB on ARM.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: f7fa433d82ef0b21782df71910521a6f481baeef URL: https://gitlab.winehq.org/wine/wine/-/commit/f7fa433d82ef0b21782df71910521a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 09:47:16 2023 +0100 ntdll: Store the syscall table in the TEB on ARM. --- dlls/ntdll/unix/signal_arm.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 5ba429c6364..0b272421902 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -194,7 +194,7 @@ struct syscall_frame UINT restore_flags; /* 044 */ UINT fpscr; /* 048 */ struct syscall_frame *prev_frame; /* 04c */ - SYSTEM_SERVICE_TABLE *syscall_table; /* 050 */ + void *unused; /* 050 */ UINT align[3]; /* 054 */ ULONGLONG d[32]; /* 060 */ }; @@ -205,11 +205,13 @@ struct arm_thread_data { void *exit_frame; /* 1d4 exit frame pointer */ struct syscall_frame *syscall_frame; /* 1d8 frame pointer on syscall entry */ + SYSTEM_SERVICE_TABLE *syscall_table; /* 1dc syscall table */ }; C_ASSERT( sizeof(struct arm_thread_data) <= sizeof(((struct ntdll_thread_data *)0)->cpu_data) ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm_thread_data, exit_frame ) == 0x1d4 ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm_thread_data, syscall_frame ) == 0x1d8 ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm_thread_data, syscall_table ) == 0x1dc ); static inline struct arm_thread_data *arm_thread_data(void) { @@ -1171,8 +1173,6 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, "ldr r5, [r4, #0x1d8]\n\t" /* arm_thread_data()->syscall_frame */ "str r5, [sp, #0x4c]\n\t" /* frame->prev_frame */ "str sp, [r4, #0x1d8]\n\t" /* arm_thread_data()->syscall_frame */ - "ldr r6, [r5, #0x50]\n\t" /* prev_frame->syscall_table */ - "str r6, [sp, #0x50]\n\t" /* frame->syscall_table */ "mov sp, r1\n\t" "bx ip" ) @@ -1578,6 +1578,8 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB __asm__ __volatile__( "mcr p15, 0, %0, c13, c0, 2" : : "r" (teb) ); + thread_data->syscall_table = KeServiceDescriptorTable; + context.R0 = (DWORD)entry; context.R1 = (DWORD)arg; context.Sp = (DWORD)teb->Tib.StackBase; @@ -1598,7 +1600,6 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB frame->r0 = (DWORD)ctx; frame->prev_frame = NULL; frame->restore_flags |= CONTEXT_INTEGER; - frame->syscall_table = KeServiceDescriptorTable; pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); __wine_syscall_dispatcher_return( frame, 0 ); @@ -1641,12 +1642,12 @@ __ASM_GLOBAL_FUNC( signal_exit_thread, */ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_EHABI(".cantunwind\n\t") - "mrc p15, 0, r1, c13, c0, 2\n\t" /* NtCurrentTeb() */ - "ldr r1, [r1, #0x1d8]\n\t" /* arm_thread_data()->syscall_frame */ + "mrc p15, 0, r2, c13, c0, 2\n\t" /* NtCurrentTeb() */ + "ldr r1, [r2, #0x1d8]\n\t" /* arm_thread_data()->syscall_frame */ "add r0, r1, #0x10\n\t" "stm r0, {r4-r12,lr}\n\t" - "add r2, sp, #0x10\n\t" - "str r2, [r1, #0x38]\n\t" + "add r0, sp, #0x10\n\t" + "str r0, [r1, #0x38]\n\t" "str r3, [r1, #0x3c]\n\t" "mrs r0, CPSR\n\t" "bfi r0, lr, #5, #1\n\t" /* set thumb bit */ @@ -1662,7 +1663,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "mov r6, sp\n\t" "mov sp, r1\n\t" "mov r8, r1\n\t" - "ldr r5, [r1, #0x50]\n\t" /* frame->syscall_table */ + "ldr r5, [r2, #0x1dc]\n\t" /* arm_thread_data()->syscall_table */ "ubfx r4, ip, #12, #2\n\t" /* syscall table number */ "bfc ip, #12, #20\n\t" /* syscall number */ "add r4, r5, r4, lsl #4\n\t"

1 0

Alexandre Julliard : ntdll: Directly access the syscall table variable on x86-64.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: ab08ba1ba0469c3dc67d61ceabb6796a8869e6e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/ab08ba1ba0469c3dc67d61ceabb679… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 09:49:54 2023 +0100 ntdll: Directly access the syscall table variable on x86-64. --- dlls/ntdll/unix/signal_x86_64.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index eeb68824f75..d2d02fcbdb5 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -400,7 +400,7 @@ struct syscall_frame ULONG64 ss; /* 0090 */ ULONG64 rbp; /* 0098 */ struct syscall_frame *prev_frame; /* 00a0 */ - SYSTEM_SERVICE_TABLE *syscall_table; /* 00a8 */ + void *unused; /* 00a8 */ DWORD syscall_flags; /* 00b0 */ DWORD restore_flags; /* 00b4 */ DWORD align[2]; /* 00b8 */ @@ -1578,8 +1578,6 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, "movq 0x328(%r11),%r10\n\t" /* amd64_thread_data()->syscall_frame */ "movq (%r11),%rax\n\t" /* NtCurrentTeb()->Tib.ExceptionList */ "movq %rax,0x408(%rsp)\n\t" - "movq 0xa8(%r10),%rax\n\t" /* prev_frame->syscall_table */ - "movq %rax,0xa8(%rsp)\n\t" /* frame->syscall_table */ "movl 0xb0(%r10),%r14d\n\t" /* prev_frame->syscall_flags */ "movl %r14d,0xb0(%rsp)\n\t" /* frame->syscall_flags */ "movq %r10,0xa0(%rsp)\n\t" /* frame->prev_frame */ @@ -2510,7 +2508,6 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB frame->prev_frame = NULL; frame->restore_flags |= CONTEXT_INTEGER; frame->syscall_flags = syscall_flags; - frame->syscall_table = KeServiceDescriptorTable; pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); __wine_syscall_dispatcher_return( frame, 0 ); @@ -2674,7 +2671,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movl %eax,%ebx\n\t" "shrl $8,%ebx\n\t" "andl $0x30,%ebx\n\t" /* syscall table number */ - "movq 0xa8(%rcx),%rcx\n\t" /* frame->syscall_table */ + "leaq " __ASM_NAME("KeServiceDescriptorTable") "(%rip),%rcx\n\t" "leaq (%rcx,%rbx,2),%rbx\n\t" "andl $0xfff,%eax\n\t" /* syscall number */ "cmpq 16(%rbx),%rax\n\t" /* table->ServiceLimit */

1 0

Alexandre Julliard : ntdll: Directly access the syscall table variable on ARM64.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: ae291b1204f391b6b5d0c5b2ec12275ab0d1e456 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae291b1204f391b6b5d0c5b2ec1227… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 09:51:16 2023 +0100 ntdll: Directly access the syscall table variable on ARM64. --- dlls/ntdll/unix/signal_arm64.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index d9e35e32a51..e990d158537 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -137,7 +137,7 @@ struct syscall_frame ULONG cpsr; /* 108 */ ULONG restore_flags; /* 10c */ struct syscall_frame *prev_frame; /* 110 */ - SYSTEM_SERVICE_TABLE *syscall_table; /* 118 */ + void *unused; /* 118 */ ULONG64 align; /* 120 */ ULONG fpcr; /* 128 */ ULONG fpsr; /* 12c */ @@ -1132,9 +1132,8 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, "ldr x7, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ "sub x3, sp, #0x330\n\t" /* sizeof(struct syscall_frame) */ "str x3, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ - "ldr x8, [x7, #0x118]\n\t" /* prev_frame->syscall_table */ "mov sp, x1\n\t" /* stack */ - "stp x7, x8, [x3, #0x110]\n\t" /* frame->prev_frame, frame->syscall_table */ + "str x7, [x3, #0x110]\n\t" /* frame->prev_frame */ "br x5" ) @@ -1662,7 +1661,6 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB frame->prev_frame = NULL; frame->restore_flags |= CONTEXT_INTEGER; syscall_frame_fixup_for_fastpath( frame ); - frame->syscall_table = KeServiceDescriptorTable; pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); __wine_syscall_dispatcher_return( frame, 0 ); @@ -1736,7 +1734,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "mov sp, x10\n\t" "and x20, x8, #0xfff\n\t" /* syscall number */ "ubfx x21, x8, #12, #2\n\t" /* syscall table number */ - "ldr x16, [x10, #0x118]\n\t" /* frame->syscall_table */ + "adr x16, " __ASM_NAME("KeServiceDescriptorTable") "\n\t" "add x21, x16, x21, lsl #5\n\t" "ldr x16, [x21, #16]\n\t" /* table->ServiceLimit */ "cmp x20, x16\n\t"

1 0

Rémi Bernon : ntdll: Add comments to stack switches in dispatchers.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: fcdccb252f249880366bb50ef2c6091e63efbf04 URL: https://gitlab.winehq.org/wine/wine/-/commit/fcdccb252f249880366bb50ef2c609… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 6 16:22:31 2023 +0100 ntdll: Add comments to stack switches in dispatchers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52213 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54346 --- dlls/ntdll/unix/signal_arm.c | 7 +++++++ dlls/ntdll/unix/signal_arm64.c | 6 ++++++ dlls/ntdll/unix/signal_i386.c | 7 +++++++ dlls/ntdll/unix/signal_x86_64.c | 6 ++++++ 4 files changed, 26 insertions(+)

1 0

Rémi Bernon : ntdll: Remove unnecessary stack pointer CFI rules.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: e1f54247374a939c8276e85e113cc92c0d8f9467 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1f54247374a939c8276e85e113cc9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 22 00:06:33 2023 +0100 ntdll: Remove unnecessary stack pointer CFI rules. --- dlls/ntdll/unix/signal_i386.c | 8 -------- dlls/ntdll/unix/signal_x86_64.c | 7 ------- 2 files changed, 15 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 379e8a50022..9325a0a9ae8 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -2543,7 +2543,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_NAME("__wine_syscall_dispatcher_prolog_end") ":\n\t" "movl %esp,0x0c(%ecx)\n\t" /* frame->esp */ __ASM_CFI_CFA_IS_AT1(ecx, 0x0c) - __ASM_CFI_REG_IS_AT1(esp, ecx, 0x0c) "movw %cs,0x10(%ecx)\n\t" "movw %ss,0x12(%ecx)\n\t" "movw %ds,0x14(%ecx)\n\t" @@ -2561,7 +2560,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI_REG_IS_AT1(ebp, ecx, 0x34) "leal 0x34(%ecx),%ebp\n\t" __ASM_CFI_CFA_IS_AT1(ebp, 0x58) - __ASM_CFI_REG_IS_AT1(esp, ebp, 0x58) __ASM_CFI_REG_IS_AT1(eip, ebp, 0x54) __ASM_CFI_REG_IS_AT1(ebx, ebp, 0x6c) __ASM_CFI_REG_IS_AT1(edi, ebp, 0x78) @@ -2626,7 +2624,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ":\t" __ASM_CFI_CFA_IS_AT1(esp, 0x0c) - __ASM_CFI_REG_IS_AT1(esp, esp, 0x0c) __ASM_CFI_REG_IS_AT1(eip, esp, 0x08) __ASM_CFI_REG_IS_AT1(ebx, esp, 0x20) __ASM_CFI_REG_IS_AT1(edi, esp, 0x2c) @@ -2665,7 +2662,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI(".cfi_register %eip, %ecx\n\t") /* switch to user stack */ "movl 0x0c(%esp),%esp\n\t" /* frame->esp */ - __ASM_CFI(".cfi_same_value %esp\n\t") "pushl %ecx\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "ret\n" @@ -2681,7 +2677,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, /* switch to user stack */ "xchgl %ebx,%esp\n\t" __ASM_CFI(".cfi_def_cfa %esp, 0\n\t") - __ASM_CFI(".cfi_same_value %esp\n\t") __ASM_CFI_REG_IS_AT1(eip, ebx, 0x08) __ASM_CFI_REG_IS_AT1(ebx, ebx, 0x20) "pushl 0x04(%ebx)\n\t" /* frame->eflags */ @@ -2735,7 +2730,6 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, "leal 0x10(%esp),%edx\n\t" "movl %edx,0x0c(%ecx)\n\t" /* frame->esp */ __ASM_CFI_CFA_IS_AT1(ecx, 0x0c) - __ASM_CFI_REG_IS_AT1(esp, ecx, 0x0c) "movw %cs,0x10(%ecx)\n\t" "movw %ss,0x12(%ecx)\n\t" "movw %ds,0x14(%ecx)\n\t" @@ -2759,7 +2753,6 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, "call *(%eax,%edx,4)\n\t" "leal 16(%esp),%esp\n\t" __ASM_CFI_CFA_IS_AT1(esp, 0x0c) - __ASM_CFI_REG_IS_AT1(esp, esp, 0x0c) __ASM_CFI_REG_IS_AT1(eip, esp, 0x08) __ASM_CFI_REG_IS_AT1(ebx, esp, 0x20) __ASM_CFI_REG_IS_AT1(edi, esp, 0x2c) @@ -2771,7 +2764,6 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, __ASM_CFI(".cfi_register %eip, %ecx\n\t") /* switch to user stack */ "movl 0x0c(%esp),%esp\n\t" /* frame->esp */ - __ASM_CFI(".cfi_same_value %esp\n\t") "pushl %ecx\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") "ret" ) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index de2993faa5b..54125501ffb 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2607,7 +2607,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movw %cs,0x78(%rcx)\n\t" "movq %rsp,0x88(%rcx)\n\t" __ASM_CFI_CFA_IS_AT2(rcx, 0x88, 0x01) - __ASM_CFI_REG_IS_AT2(rsp, rcx, 0x88, 0x01) "movw %ss,0x90(%rcx)\n\t" "movq %rbp,0x98(%rcx)\n\t" __ASM_CFI_REG_IS_AT2(rbp, rcx, 0x98, 0x01) @@ -2640,7 +2639,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI(".cfi_remember_state\n\t") "3:\tleaq 0x98(%rcx),%rbp\n\t" __ASM_CFI_CFA_IS_AT1(rbp, 0x70) - __ASM_CFI_REG_IS_AT1(rsp, rbp, 0x70) __ASM_CFI_REG_IS_AT1(rip, rbp, 0x58) __ASM_CFI_REG_IS_AT2(rbx, rbp, 0xf0, 0x7e) __ASM_CFI_REG_IS_AT2(rsi, rbp, 0x88, 0x7f) @@ -2756,7 +2754,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, /* switch to user stack */ "movq 0x88(%rcx),%rsp\n\t" __ASM_CFI(".cfi_def_cfa rsp, 0\n\t") - __ASM_CFI(".cfi_same_value rsp\n\t") "movq 0x70(%rcx),%rcx\n\t" /* frame->rip */ __ASM_CFI(".cfi_register rip, rcx\n\t") "pushq %rcx\n\t" @@ -2768,7 +2765,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI(".cfi_remember_state\n\t") "1:\tleaq 0x70(%rcx),%rsp\n\t" __ASM_CFI_CFA_IS_AT1(rsp, 0x18) - __ASM_CFI_REG_IS_AT1(rsp, rsp, 0x18) __ASM_CFI_REG_IS_AT1(rip, rsp, 0x00) "testl $0x2,%edx\n\t" /* CONTEXT_INTEGER */ "jnz 1f\n\t" @@ -2786,7 +2782,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movq 0x10(%rcx),%rcx\n" "iretq\n" __ASM_CFI_CFA_IS_AT1(rbp, 0x70) - __ASM_CFI_REG_IS_AT1(rsp, rbp, 0x70) __ASM_CFI_REG_IS_AT1(rip, rbp, 0x58) __ASM_CFI_REG_IS_AT2(rbx, rbp, 0xf0, 0x7e) __ASM_CFI_REG_IS_AT2(rsi, rbp, 0x88, 0x7f) @@ -2842,7 +2837,6 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, __ASM_CFI_REG_IS_AT2(r15, rcx, 0xe8, 0x00) "movq %rsp,0x88(%rcx)\n\t" __ASM_CFI_CFA_IS_AT2(rcx, 0x88, 0x01) - __ASM_CFI_REG_IS_AT2(rsp, rcx, 0x88, 0x01) "movq %rbp,0x98(%rcx)\n\t" __ASM_CFI_REG_IS_AT2(rbp, rcx, 0x98, 0x01) "movdqa %xmm6,0x1c0(%rcx)\n\t" @@ -2903,7 +2897,6 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, __ASM_CFI(".cfi_same_value rsi\n\t") "movq 0x88(%rcx),%rsp\n\t" __ASM_CFI(".cfi_def_cfa rsp, 0\n\t") - __ASM_CFI(".cfi_same_value rsp\n\t") "pushq 0x70(%rcx)\n\t" /* frame->rip */ __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") "ret" )

1 0

Rémi Bernon : ntdll: Add a syscall_cfa member to the i386 syscall frame.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: 3faa6dde111b24f405bf97d70cd6d5145b23a040 URL: https://gitlab.winehq.org/wine/wine/-/commit/3faa6dde111b24f405bf97d70cd6d5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 6 16:22:31 2023 +0100 ntdll: Add a syscall_cfa member to the i386 syscall frame. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52213 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54346 --- dlls/ntdll/unix/signal_i386.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 9325a0a9ae8..2fb9e6ad897 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -455,7 +455,7 @@ struct syscall_frame UINT edi; /* 02c */ UINT esi; /* 030 */ UINT ebp; /* 034 */ - void *unused; /* 038 */ + void *syscall_cfa; /* 038 */ struct syscall_frame *prev_frame; /* 03c */ union /* 040 */ { @@ -1592,9 +1592,10 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, __ASM_CFI(".cfi_rel_offset %edi,-12\n\t") "movl 0x20(%ebp),%edx\n\t" /* teb */ "pushl 0(%edx)\n\t" /* teb->Tib.ExceptionList */ - "subl $0x384,%esp\n\t" /* sizeof(struct syscall_frame) + ebp */ + "subl $0x380,%esp\n\t" /* sizeof(struct syscall_frame) */ "andl $~63,%esp\n\t" - "movl %ebp,0x380(%esp)\n\t" + "leal 8(%ebp),%eax\n\t" + "movl %eax,0x38(%esp)\n\t" /* frame->syscall_cfa */ "movl 0x1f8(%edx),%ecx\n\t" /* x86_thread_data()->syscall_frame */ "movl (%ecx),%eax\n\t" /* frame->syscall_flags */ "movl %eax,(%esp)\n\t" @@ -1622,7 +1623,8 @@ __ASM_GLOBAL_FUNC( user_mode_callback_return, "movl 0x1f8(%edx),%eax\n\t" /* x86_thread_data()->syscall_frame */ "movl 0x3c(%eax),%ecx\n\t" /* frame->prev_frame */ "movl %ecx,0x1f8(%edx)\n\t" /* x86_thread_data()->syscall_frame */ - "movl 0x380(%eax),%ebp\n\t" /* call_user_mode_callback ebp */ + "movl 0x38(%eax),%ebp\n\t" /* frame->syscall_cfa */ + "subl $8,%ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") @@ -2415,10 +2417,10 @@ void signal_init_process(void) /*********************************************************************** * call_init_thunk */ -void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB *teb ) +void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB *teb, + struct syscall_frame *frame, void *syscall_cfa ) { struct x86_thread_data *thread_data = (struct x86_thread_data *)&teb->GdiTebBatch; - struct syscall_frame *frame = thread_data->syscall_frame; CONTEXT *ctx, context = { CONTEXT_ALL }; DWORD *stack; @@ -2460,6 +2462,7 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB frame->eip = (DWORD)pLdrInitializeThunk; frame->prev_frame = NULL; frame->syscall_flags = syscall_flags; + frame->syscall_cfa = syscall_cfa; frame->restore_flags |= LOWORD(CONTEXT_INTEGER); pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); @@ -2482,6 +2485,7 @@ __ASM_GLOBAL_FUNC( signal_start_thread, __ASM_CFI(".cfi_rel_offset %esi,-8\n\t") "pushl %edi\n\t" __ASM_CFI(".cfi_rel_offset %edi,-12\n\t") + "leal 8(%ebp),%edx\n\t" /* syscall_cfa */ /* store exit frame */ "movl 20(%ebp),%ecx\n\t" /* teb */ "movl %ebp,0x1f4(%ecx)\n\t" /* x86_thread_data()->exit_frame */ @@ -2493,7 +2497,9 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "andl $~63,%eax\n\t" "movl %eax,0x1f8(%ecx)\n" /* x86_thread_data()->syscall_frame */ /* switch to kernel stack */ - "1:\tmovl %eax,%esp\n\t" + "1:\tleal -8(%eax),%esp\n\t" + "pushl %edx\n\t" /* syscall_cfa */ + "pushl %eax\n\t" /* syscall_frame */ "pushl %ecx\n\t" /* teb */ "pushl 16(%ebp)\n\t" /* suspend */ "pushl 12(%ebp)\n\t" /* arg */

1 0