ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Implement RtlRaiseException in assembly to fix continuing from exceptions. 

If the handlers returned ExceptionContinueExecution and we restore
the stored context, make sure it's a context that ends up returning
from the RtlRaiseException function.

This matches how it's done on x86_64.

Signed-off-by: Martin Storsjo <martin@martin.st>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Martin Storsjo 2020-05-28 11:14:47 +03:00 committed by Alexandre Julliard
parent 763f15ccde
commit e0c8c4c3cd
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/ntdll/signal_arm64.c
View File

@ -2097,14 +2097,29 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL
/*********************************************************************** /***********************************************************************
* RtlRaiseException (NTDLL.@) * RtlRaiseException (NTDLL.@)
*/ */
void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) __ASM_STDCALL_FUNC( RtlRaiseException, 4,
{ "sub sp, sp, #0x3b0\n\t" /* 0x390 (context) + 0x20 */
CONTEXT context; "stp x29, x30, [sp]\n\t"
__ASM_CFI(".cfi_def_cfa x29, 944\n\t")
RtlCaptureContext( &context ); __ASM_CFI(".cfi_offset x30, -936\n\t")
rec->ExceptionAddress = (LPVOID)context.Pc; __ASM_CFI(".cfi_offset x29, -944\n\t")
RtlRaiseStatus( NtRaiseException( rec, &context, TRUE )); "mov x29, sp\n\t"
} "str x0, [sp, #0x10]\n\t"
"add x0, sp, #0x20\n\t"
"bl " __ASM_NAME("RtlCaptureContext") "\n\t"
"add x1, sp, #0x20\n\t" /* context pointer */
"add x2, sp, #0x3b0\n\t" /* orig stack pointer */
"str x2, [x1, #0x100]\n\t" /* context->Sp */
"ldr x0, [sp, #0x10]\n\t" /* original first parameter */
"str x0, [x1, #0x08]\n\t" /* context->X0 */
"ldp x4, x5, [sp]\n\t" /* frame pointer, return address */
"stp x4, x5, [x1, #0xf0]\n\t" /* context->Fp, Lr */
"str x5, [x1, #0x108]\n\t" /* context->Pc */
"str x5, [x1, #0x108]\n\t" /* context->Pc */
"str x5, [x0, #0x10]\n\t" /* rec->ExceptionAddress */
"mov x2, #1\n\t"
"bl " __ASM_NAME("NtRaiseException") "\n\t"
"bl " __ASM_NAME("RtlRaiseStatus") /* does not return */ );
/************************************************************************* /*************************************************************************
* RtlCaptureStackBackTrace (NTDLL.@) * RtlCaptureStackBackTrace (NTDLL.@)