ntdll: Fix handling of the save_lrpair unwind opcode.

The register offset should be multiplied by 2, and the second register is always Lr. Signed-off-by: Martin Storsjo <martin@martin.st> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Fix handling of the save_lrpair unwind opcode.
8477f61b · Martin Storsjo · Alexandre Julliard · ad7fcd2c · 8477f61b
Commit 8477f61b authored May 28, 2020 by Martin Storsjo Committed by Alexandre Julliard May 28, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

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

No files found.
--- a/dlls/ntdll/signal_arm64.c
+++ b/dlls/ntdll/signal_arm64.c
@@ -1467,7 +1467,10 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, CONTEXT *context,
        else if (*ptr < 0xd6)  /* save_reg_x */
            restore_regs( 19 + ((val >> 5) & 0xf), 1, -(val & 0x1f) - 1, context, ptrs );
        else if (*ptr < 0xd8)  /* save_lrpair */
-            restore_regs( 19 + ((val >> 6) & 0x7), 2, val & 0x3f, context, ptrs );
+        {
+            restore_regs( 19 + 2 * ((val >> 6) & 0x7), 1, val & 0x3f, context, ptrs );
+            restore_regs( 30, 1, (val & 0x3f) + 1, context, ptrs );
+        }
        else if (*ptr < 0xda)  /* save_fregp */
            restore_fpregs( 8 + ((val >> 6) & 0x7), save_next, val & 0x3f, context, ptrs );
        else if (*ptr < 0xdc)  /* save_fregp_x */