ntdll: Subtract an offset from pc if dispatch->ControlPcIsUnwound on arm.

This fixes unwinding from functions ending with a call to a function that won't return. This matches what is done on the PE side in the call to lookup_function_info. Signed-off-by: Martin Storsjö <martin@martin.st> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Subtract an offset from pc if dispatch->ControlPcIsUnwound on arm.
1fb4ce83 · Martin Storsjö · Alexandre Julliard · d00c8977 · 1fb4ce83
Commit 1fb4ce83 authored Nov 15, 2021 by Martin Storsjö Committed by Alexandre Julliard Nov 15, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

signal_arm.c dlls/ntdll/unix/signal_arm.c +1 -1

No files found.
--- a/dlls/ntdll/unix/signal_arm.c
+++ b/dlls/ntdll/unix/signal_arm.c
@@ -229,7 +229,7 @@ extern void raise_func_trampoline( EXCEPTION_RECORD *rec, CONTEXT *context, void
 NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context )
 {
 #ifdef HAVE_LIBUNWIND
-    DWORD ip = context->Pc;
+    DWORD ip = context->Pc - (dispatch->ControlPcIsUnwound ? 2 : 0);
    unw_context_t unw_context;
    unw_cursor_t cursor;
    unw_proc_info_t info;