Module: wine Branch: master Commit: e1d624a06f7b1748bbaa94f2861fdf138ac85b8e URL: https://gitlab.winehq.org/wine/wine/-/commit/e1d624a06f7b1748bbaa94f2861fdf1...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Mar 7 10:33:46 2024 +0100
ntdll: Export longjmp.
---
dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_arm.c | 19 ++++++++++++++++++ dlls/ntdll/signal_arm64.c | 19 ++++++++++++++++++ dlls/ntdll/signal_arm64ec.c | 20 ++++++++++++++++++ dlls/ntdll/signal_x86_64.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ tools/winebuild/import.c | 1 + 6 files changed, 109 insertions(+)
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6fb91e8c9f1..2c5a69a410c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1630,6 +1630,7 @@ @ cdecl isxdigit(long) @ cdecl labs(long) abs @ cdecl log(double) +@ cdecl -arch=!i386 longjmp(ptr long) NTDLL_longjmp @ cdecl mbstowcs(ptr str long) @ cdecl memchr(ptr long long) @ cdecl memcmp(ptr ptr long) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index dd259322368..b59384c986c 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -732,6 +732,25 @@ __ASM_GLOBAL_FUNC( NTDLL__setjmpex, "bx lr" )
+/******************************************************************* + * longjmp (NTDLL.@) + */ +void __cdecl NTDLL_longjmp( _JUMP_BUFFER *buf, int retval ) +{ + EXCEPTION_RECORD rec; + + if (!retval) retval = 1; + + rec.ExceptionCode = STATUS_LONGJUMP; + rec.ExceptionFlags = 0; + rec.ExceptionRecord = NULL; + rec.ExceptionAddress = NULL; + rec.NumberParameters = 1; + rec.ExceptionInformation[0] = (DWORD_PTR)buf; + RtlUnwind( (void *)buf->Frame, (void *)buf->Pc, &rec, IntToPtr(retval) ); +} + + /*********************************************************************** * RtlUserThreadStart (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index c53d3382207..3ad0a7daa97 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -852,6 +852,25 @@ __ASM_GLOBAL_FUNC( NTDLL__setjmpex, "ret" )
+/******************************************************************* + * longjmp (NTDLL.@) + */ +void __cdecl NTDLL_longjmp( _JUMP_BUFFER *buf, int retval ) +{ + EXCEPTION_RECORD rec; + + if (!retval) retval = 1; + + rec.ExceptionCode = STATUS_LONGJUMP; + rec.ExceptionFlags = 0; + rec.ExceptionRecord = NULL; + rec.ExceptionAddress = NULL; + rec.NumberParameters = 1; + rec.ExceptionInformation[0] = (DWORD_PTR)buf; + RtlUnwind( (void *)buf->Frame, (void *)buf->Lr, &rec, IntToPtr(retval) ); +} + + /*********************************************************************** * RtlUserThreadStart (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index f56931a9e4b..c307714e56e 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -22,6 +22,7 @@
#include <stdlib.h> #include <stdarg.h> +#include <setjmp.h>
#include "ntstatus.h" #define WIN32_NO_STATUS @@ -2019,6 +2020,25 @@ void __attribute((naked)) RtlRaiseException( EXCEPTION_RECORD *rec ) }
+/******************************************************************* + * longjmp (NTDLL.@) + */ +void __cdecl NTDLL_longjmp( _JUMP_BUFFER *buf, int retval ) +{ + EXCEPTION_RECORD rec; + + if (!retval) retval = 1; + + rec.ExceptionCode = STATUS_LONGJUMP; + rec.ExceptionFlags = 0; + rec.ExceptionRecord = NULL; + rec.ExceptionAddress = NULL; + rec.NumberParameters = 1; + rec.ExceptionInformation[0] = (DWORD_PTR)buf; + RtlUnwind( (void *)buf->Frame, (void *)buf->Rip, &rec, IntToPtr(retval) ); +} + + /*********************************************************************** * RtlUserThreadStart (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 6e88877ee78..b49ec23860f 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1058,6 +1058,55 @@ __ASM_GLOBAL_FUNC( NTDLL__setjmpex, "retq" )
+void __cdecl DECLSPEC_NORETURN longjmp_regs( _JUMP_BUFFER *buf, int retval ); +__ASM_GLOBAL_FUNC( longjmp_regs, + __ASM_SEH(".seh_endprologue\n\t") + "movq %rdx,%rax\n\t" /* retval */ + "movq 0x8(%rcx),%rbx\n\t" /* jmp_buf->Rbx */ + "movq 0x18(%rcx),%rbp\n\t" /* jmp_buf->Rbp */ + "movq 0x20(%rcx),%rsi\n\t" /* jmp_buf->Rsi */ + "movq 0x28(%rcx),%rdi\n\t" /* jmp_buf->Rdi */ + "movq 0x30(%rcx),%r12\n\t" /* jmp_buf->R12 */ + "movq 0x38(%rcx),%r13\n\t" /* jmp_buf->R13 */ + "movq 0x40(%rcx),%r14\n\t" /* jmp_buf->R14 */ + "movq 0x48(%rcx),%r15\n\t" /* jmp_buf->R15 */ + "movq 0x50(%rcx),%rdx\n\t" /* jmp_buf->Rip */ + "ldmxcsr 0x58(%rcx)\n\t" /* jmp_buf->MxCsr */ + "fnclex\n\t" + "fldcw 0x5c(%rcx)\n\t" /* jmp_buf->FpCsr */ + "movdqa 0x60(%rcx),%xmm6\n\t" /* jmp_buf->Xmm6 */ + "movdqa 0x70(%rcx),%xmm7\n\t" /* jmp_buf->Xmm7 */ + "movdqa 0x80(%rcx),%xmm8\n\t" /* jmp_buf->Xmm8 */ + "movdqa 0x90(%rcx),%xmm9\n\t" /* jmp_buf->Xmm9 */ + "movdqa 0xa0(%rcx),%xmm10\n\t" /* jmp_buf->Xmm10 */ + "movdqa 0xb0(%rcx),%xmm11\n\t" /* jmp_buf->Xmm11 */ + "movdqa 0xc0(%rcx),%xmm12\n\t" /* jmp_buf->Xmm12 */ + "movdqa 0xd0(%rcx),%xmm13\n\t" /* jmp_buf->Xmm13 */ + "movdqa 0xe0(%rcx),%xmm14\n\t" /* jmp_buf->Xmm14 */ + "movdqa 0xf0(%rcx),%xmm15\n\t" /* jmp_buf->Xmm15 */ + "movq 0x10(%rcx),%rsp\n\t" /* jmp_buf->Rsp */ + "jmp *%rdx" ) + +/******************************************************************* + * longjmp (MSVCRT.@) + */ +void __cdecl NTDLL_longjmp( _JUMP_BUFFER *buf, int retval ) +{ + EXCEPTION_RECORD rec; + + if (!retval) retval = 1; + if (!buf->Frame) longjmp_regs( buf, retval ); + + rec.ExceptionCode = STATUS_LONGJUMP; + rec.ExceptionFlags = 0; + rec.ExceptionRecord = NULL; + rec.ExceptionAddress = NULL; + rec.NumberParameters = 1; + rec.ExceptionInformation[0] = (DWORD_PTR)buf; + RtlUnwind( (void *)buf->Frame, (void *)buf->Rip, &rec, IntToPtr(retval) ); +} + + /*********************************************************************** * RtlUserThreadStart (NTDLL.@) */ diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index eb9f0205eb5..9cefb2afdfe 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -62,6 +62,7 @@ static const char *stdc_names[] = "isxdigit", "labs", "log", + "longjmp", "mbstowcs", "memchr", "memcmp",