Wine-commits

Download

wine-commits@list.winehq.org

June 2021

1 participants
811 discussions

Alexandre Julliard : ntdll: Get rid of raise_func_trampoline() on x86-64.
by Alexandre Julliard 01 Jun '21

01 Jun '21

Module: wine Branch: master Commit: aa26f96622ee23459ae2a9fbbe40216b733b242a URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa26f96622ee23459ae2a9fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 1 17:34:30 2021 +0200 ntdll: Get rid of raise_func_trampoline() on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 4f28d498cc2..75a49a753f2 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1865,11 +1865,6 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) } -extern void CDECL raise_func_trampoline( void *dispatcher ) DECLSPEC_HIDDEN; - -__ASM_GLOBAL_FUNC( raise_func_trampoline, - "jmpq *%r8\n\t") - /*********************************************************************** * setup_raise_exception */ @@ -1934,8 +1929,7 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec } } - RIP_sig(sigcontext) = (ULONG_PTR)raise_func_trampoline; - R8_sig(sigcontext) = (ULONG_PTR)pKiUserExceptionDispatcher; + RIP_sig(sigcontext) = (ULONG_PTR)pKiUserExceptionDispatcher; RSP_sig(sigcontext) = (ULONG_PTR)stack; /* clear single-step, direction, and align check flag */ EFL_sig(sigcontext) &= ~(0x100|0x400|0x40000);

1 0

Jump to page: