Alexandre Julliard : ntdll: Reset the exit frame when switching back to it.
Alexandre Julliard
julliard at winehq.org
Fri Dec 15 14:46:28 CST 2017
Module: wine
Branch: master
Commit: c2f34d1b24b50dafdf979420067b0b5badbe5b0c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2f34d1b24b50dafdf979420067b0b5badbe5b0c
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Dec 15 12:36:16 2017 +0100
ntdll: Reset the exit frame when switching back to it.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/signal_i386.c | 32 ++++++++++++++++++--------------
dlls/ntdll/signal_x86_64.c | 31 +++++++++++++++++++------------
2 files changed, 37 insertions(+), 26 deletions(-)
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index 4be573e..07425e2 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -547,6 +547,7 @@ struct x86_thread_data
};
C_ASSERT( offsetof( TEB, SystemReserved2 ) + offsetof( struct x86_thread_data, gs ) == 0x1d8 );
+C_ASSERT( offsetof( TEB, SystemReserved2 ) + offsetof( struct x86_thread_data, exit_frame ) == 0x1f4 );
#ifdef __HAVE_VM86
C_ASSERT( offsetof( TEB, SystemReserved2 ) + offsetof( struct x86_thread_data, vm86 ) ==
offsetof( TEB, GdiTebBatch ) + offsetof( struct ntdll_thread_data, __vm86 ));
@@ -2849,7 +2850,7 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer,
extern void DECLSPEC_NORETURN start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend,
- void *relay, void **exit_frame );
+ void *relay );
__ASM_GLOBAL_FUNC( start_thread,
"pushl %ebp\n\t"
__ASM_CFI(".cfi_adjust_cfa_offset 4\n\t")
@@ -2863,8 +2864,7 @@ __ASM_GLOBAL_FUNC( start_thread,
"pushl %edi\n\t"
__ASM_CFI(".cfi_rel_offset %edi,-12\n\t")
/* store exit frame */
- "movl 24(%ebp),%eax\n\t"
- "movl %ebp,(%eax)\n\t"
+ "movl %ebp,%fs:0x1f4\n\t" /* x86_thread_data()->exit_frame */
/* build initial context on thread stack */
"movl %fs:4,%eax\n\t" /* NtCurrentTeb()->StackBase */
"leal -0x2dc(%eax),%esi\n\t" /* sizeof(context) + 16 */
@@ -2899,11 +2899,18 @@ __ASM_GLOBAL_FUNC( start_thread,
"movl %esi,(%esp)\n\t"
"call " __ASM_NAME("set_cpu_context") )
-extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), void *frame );
+extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int) );
__ASM_GLOBAL_FUNC( call_thread_exit_func,
- "movl 4(%esp),%eax\n\t"
+ /* fetch exit frame */
+ "movl %fs:0x1f4,%edx\n\t" /* x86_thread_data()->exit_frame */
+ "testl %edx,%edx\n\t"
+ "jnz 1f\n\t"
+ "jmp *%ecx\n\t"
+ /* switch to exit frame stack */
+ "1:\tmovl 4(%esp),%eax\n\t"
"movl 8(%esp),%ecx\n\t"
- "movl 12(%esp),%ebp\n\t"
+ "movl $0,%fs:0x1f4\n\t"
+ "movl %edx,%ebp\n\t"
__ASM_CFI(".cfi_def_cfa %ebp,4\n\t")
__ASM_CFI(".cfi_rel_offset %ebp,0\n\t")
__ASM_CFI(".cfi_rel_offset %ebx,-4\n\t")
@@ -2911,7 +2918,7 @@ __ASM_GLOBAL_FUNC( call_thread_exit_func,
__ASM_CFI(".cfi_rel_offset %edi,-12\n\t")
"leal -20(%ebp),%esp\n\t"
"pushl %eax\n\t"
- "call *%ecx" );
+ "call *%ecx" )
extern void call_thread_entry(void) DECLSPEC_HIDDEN;
__ASM_GLOBAL_FUNC( call_thread_entry,
@@ -2970,7 +2977,7 @@ void DECLSPEC_HIDDEN call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg )
*/
void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend )
{
- start_thread( entry, arg, suspend, call_thread_entry, &x86_thread_data()->exit_frame );
+ start_thread( entry, arg, suspend, call_thread_entry );
}
/**********************************************************************
@@ -2983,8 +2990,7 @@ void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend
*/
void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend )
{
- start_thread( entry, NtCurrentTeb()->Peb, suspend,
- kernel32_start_process, &x86_thread_data()->exit_frame );
+ start_thread( entry, NtCurrentTeb()->Peb, suspend, kernel32_start_process );
}
@@ -2993,8 +2999,7 @@ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend )
*/
void signal_exit_thread( int status )
{
- if (!x86_thread_data()->exit_frame) exit_thread( status );
- call_thread_exit_func( status, exit_thread, x86_thread_data()->exit_frame );
+ call_thread_exit_func( status, exit_thread );
}
/***********************************************************************
@@ -3002,8 +3007,7 @@ void signal_exit_thread( int status )
*/
void signal_exit_process( int status )
{
- if (!x86_thread_data()->exit_frame) exit( status );
- call_thread_exit_func( status, exit, x86_thread_data()->exit_frame );
+ call_thread_exit_func( status, exit );
}
/**********************************************************************
diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index 1f76640..60da3f3 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -321,6 +321,7 @@ struct amd64_thread_data
};
C_ASSERT( sizeof(struct amd64_thread_data) <= sizeof(((TEB *)0)->SystemReserved2) );
+C_ASSERT( offsetof( TEB, SystemReserved2 ) + offsetof( struct amd64_thread_data, exit_frame ) == 0x330 );
static inline struct amd64_thread_data *amd64_thread_data(void)
{
@@ -4074,7 +4075,7 @@ static void WINAPI call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg )
extern void DECLSPEC_NORETURN start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend,
- void *relay, void *stack, void **exit_frame );
+ void *relay );
__ASM_GLOBAL_FUNC( start_thread,
"subq $56,%rsp\n\t"
__ASM_CFI(".cfi_adjust_cfa_offset 56\n\t")
@@ -4091,8 +4092,10 @@ __ASM_GLOBAL_FUNC( start_thread,
"movq %r15,8(%rsp)\n\t"
__ASM_CFI(".cfi_rel_offset %r15,8\n\t")
/* store exit frame */
- "movq %rsp,(%r9)\n\t"
+ "movq %gs:0x30,%rax\n\t"
+ "movq %rsp,0x330(%rax)\n\t" /* amd64_thread_data()->exit_frame */
/* build initial context on thread stack */
+ "movq 8(%rax),%r8\n\t" /* NtCurrentTeb()->Tib.StackBase */
"leaq -0x500(%r8),%r10\n\t" /* sizeof(context) + 0x30 for function params */
"movq $0x001000b,0x30(%r10)\n\t" /* context->ContextFlags = CONTEXT_FULL */
"movw %cs,0x38(%r10)\n\t" /* context->SegCs */
@@ -4116,8 +4119,16 @@ __ASM_GLOBAL_FUNC( start_thread,
"movq %rsp,%rdi\n\t"
"call " __ASM_NAME("set_cpu_context") )
-extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), void *frame );
+extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int) );
__ASM_GLOBAL_FUNC( call_thread_exit_func,
+ /* fetch exit frame */
+ "movq %gs:0x30,%rax\n\t"
+ "movq 0x330(%rax),%rdx\n\t" /* amd64_thread_data()->exit_frame */
+ "testq %rdx,%rdx\n\t"
+ "jnz 1f\n\t"
+ "jmp *%rsi\n"
+ /* switch to exit frame stack */
+ "1:\tmovq $0,0x330(%rax)\n\t"
"movq %rdx,%rsp\n\t"
__ASM_CFI(".cfi_adjust_cfa_offset 56\n\t")
__ASM_CFI(".cfi_rel_offset %rbp,48\n\t")
@@ -4126,7 +4137,7 @@ __ASM_GLOBAL_FUNC( call_thread_exit_func,
__ASM_CFI(".cfi_rel_offset %r13,24\n\t")
__ASM_CFI(".cfi_rel_offset %r14,16\n\t")
__ASM_CFI(".cfi_rel_offset %r15,8\n\t")
- "call *%rsi" );
+ "call *%rsi" )
/***********************************************************************
@@ -4139,8 +4150,7 @@ __ASM_GLOBAL_FUNC( call_thread_exit_func,
*/
void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend )
{
- start_thread( entry, arg, suspend, call_thread_func,
- NtCurrentTeb()->Tib.StackBase, &amd64_thread_data()->exit_frame );
+ start_thread( entry, arg, suspend, call_thread_func );
}
@@ -4154,8 +4164,7 @@ void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend
*/
void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend )
{
- start_thread( entry, NtCurrentTeb()->Peb, suspend, kernel32_start_process,
- NtCurrentTeb()->Tib.StackBase, &amd64_thread_data()->exit_frame );
+ start_thread( entry, NtCurrentTeb()->Peb, suspend, kernel32_start_process );
}
@@ -4164,8 +4173,7 @@ void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend )
*/
void signal_exit_thread( int status )
{
- if (!amd64_thread_data()->exit_frame) exit_thread( status );
- call_thread_exit_func( status, exit_thread, amd64_thread_data()->exit_frame );
+ call_thread_exit_func( status, exit_thread );
}
/***********************************************************************
@@ -4173,8 +4181,7 @@ void signal_exit_thread( int status )
*/
void signal_exit_process( int status )
{
- if (!amd64_thread_data()->exit_frame) exit( status );
- call_thread_exit_func( status, exit, amd64_thread_data()->exit_frame );
+ call_thread_exit_func( status, exit );
}
/**********************************************************************
More information about the wine-cvs
mailing list