Skip to content

W
wine-winehq
Commit c74f41e4 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

ntdll: Connect syscall frames across user callbacks on ARM64.

parent a5745ba9
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 2 deletions
dlls/ntdll/unix/dwarf.h
View file @ c74f41e4
......@@ -1050,7 +1050,19 @@ static void apply_frame_state( CONTEXT *context, struct frame_state *state,
#elif defined(__aarch64__)
#define DW_OP_x19 DW_OP_breg19
#define DW_OP_x20 DW_OP_breg20
#define DW_OP_x21 DW_OP_breg21
#define DW_OP_x22 DW_OP_breg22
#define DW_OP_x23 DW_OP_breg23
#define DW_OP_x24 DW_OP_breg24
#define DW_OP_x25 DW_OP_breg25
#define DW_OP_x26 DW_OP_breg26
#define DW_OP_x27 DW_OP_breg27
#define DW_OP_x28 DW_OP_breg28
#define DW_OP_x29 DW_OP_breg29
#define DW_OP_x30 DW_OP_breg30
#define DW_OP_sp DW_OP_breg31
#define DW_REG_x19 19
#define DW_REG_x20 20
......
dlls/ntdll/unix/signal_arm64.c
View file @ c74f41e4
......@@ -1790,8 +1790,23 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
"stp q26, q27, [x10, #0x2d0]\n\t"
"stp q28, q29, [x10, #0x2f0]\n\t"
"stp q30, q31, [x10, #0x310]\n\t"
"mov x22, x10\n\t"
/* switch to kernel stack */
"mov sp, x10\n\t"
/* we're now on the kernel stack, stitch unwind info with previous frame */
__ASM_CFI_CFA_IS_AT2(x22, 0x98, 0x02) /* frame->syscall_cfa */
__ASM_CFI(".cfi_offset 29, -0xc0\n\t")
__ASM_CFI(".cfi_offset 30, -0xb8\n\t")
__ASM_CFI(".cfi_offset 19, -0xb0\n\t")
__ASM_CFI(".cfi_offset 20, -0xa8\n\t")
__ASM_CFI(".cfi_offset 21, -0xa0\n\t")
__ASM_CFI(".cfi_offset 22, -0x98\n\t")
__ASM_CFI(".cfi_offset 23, -0x90\n\t")
__ASM_CFI(".cfi_offset 24, -0x88\n\t")
__ASM_CFI(".cfi_offset 25, -0x80\n\t")
__ASM_CFI(".cfi_offset 26, -0x78\n\t")
__ASM_CFI(".cfi_offset 27, -0x70\n\t")
__ASM_CFI(".cfi_offset 28, -0x68\n\t")
"and x20, x8, #0xfff\n\t" /* syscall number */
"ubfx x21, x8, #12, #2\n\t" /* syscall table number */
"adr x16, " __ASM_NAME("KeServiceDescriptorTable") "\n\t"
......@@ -1799,7 +1814,6 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
"ldr x16, [x21, #16]\n\t" /* table->ServiceLimit */
"cmp x20, x16\n\t"
"bcs 4f\n\t"
"mov x22, sp\n\t"
"ldr x16, [x21, #24]\n\t" /* table->ArgumentTable */
"ldrb w9, [x16, x20]\n\t"
"subs x9, x9, #64\n\t"
......@@ -1815,6 +1829,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
"ldr x16, [x16, x20, lsl 3]\n\t"
"blr x16\n\t"
"mov sp, x22\n"
__ASM_CFI_CFA_IS_AT2(sp, 0x98, 0x02) /* frame->syscall_cfa */
__ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ":\n\t"
"ldr w16, [sp, #0x10c]\n\t" /* frame->restore_flags */
"tbz x16, #1, 2f\n\t" /* CONTEXT_INTEGER */
......@@ -1894,14 +1909,30 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher,
"stp x30, x9, [x10, #0xf0]\n\t"
"mrs x9, NZCV\n\t"
"stp x30, x9, [x10, #0x100]\n\t"
"mov x19, x10\n\t"
/* switch to kernel stack */
"mov sp, x10\n\t"
/* we're now on the kernel stack, stitch unwind info with previous frame */
__ASM_CFI_CFA_IS_AT2(x19, 0x98, 0x02) /* frame->syscall_cfa */
__ASM_CFI(".cfi_offset 29, -0xc0\n\t")
__ASM_CFI(".cfi_offset 30, -0xb8\n\t")
__ASM_CFI(".cfi_offset 19, -0xb0\n\t")
__ASM_CFI(".cfi_offset 20, -0xa8\n\t")
__ASM_CFI(".cfi_offset 21, -0xa0\n\t")
__ASM_CFI(".cfi_offset 22, -0x98\n\t")
__ASM_CFI(".cfi_offset 23, -0x90\n\t")
__ASM_CFI(".cfi_offset 24, -0x88\n\t")
__ASM_CFI(".cfi_offset 25, -0x80\n\t")
__ASM_CFI(".cfi_offset 26, -0x78\n\t")
__ASM_CFI(".cfi_offset 27, -0x70\n\t")
__ASM_CFI(".cfi_offset 28, -0x68\n\t")
"ldr x16, [x0, x1, lsl 3]\n\t"
"mov x0, x2\n\t" /* args */
"blr x16\n\t"
"ldr w16, [sp, #0x10c]\n\t" /* frame->restore_flags */
"cbnz w16, " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") "\n\t"
"ldr x18, [sp, #0x90]\n\t"
__ASM_CFI_CFA_IS_AT2(sp, 0x98, 0x02) /* frame->syscall_cfa */
"ldp x18, x19, [sp, #0x90]\n\t"
"ldp x16, x17, [sp, #0xf8]\n\t"
/* switch to user stack */
"mov sp, x16\n\t"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment