ntdll: Trust libunwind's returned pc value on arm64.

Use this instead of manually copying LR to PC. With GNU libunwind, both registers are equal after unw_step. With the LLVM libunwind (which Apple uses), the return address isn't reflected at all in LR, only in UNW_REG_IP. Signed-off-by: Martin Storsjo <martin@martin.st> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Trust libunwind's returned pc value on arm64.
cffd06ea · Martin Storsjo · Alexandre Julliard · 849d08b0 · cffd06ea
Commit cffd06ea authored Aug 14, 2020 by Martin Storsjo Committed by Alexandre Julliard Aug 18, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/dlls/ntdll/unix/signal_arm64.c
+++ b/dlls/ntdll/unix/signal_arm64.c
@@ -230,7 +230,7 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON
    unw_get_reg( &cursor, UNW_AARCH64_X29, (unw_word_t *)&context->u.s.Fp );
    unw_get_reg( &cursor, UNW_AARCH64_X30, (unw_word_t *)&context->u.s.Lr );
    unw_get_reg( &cursor, UNW_AARCH64_SP,  (unw_word_t *)&context->Sp );
-    context->Pc = context->u.s.Lr;
+    unw_get_reg( &cursor, UNW_REG_IP,      (unw_word_t *)&context->Pc );
    context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL;

    TRACE( "next function pc=%016lx%s\n", context->Pc, rc ? "" : " (last frame)" );