From: Martin Storsjö martin@martin.st
These no longer are needed, as none of the code in unix libraries is being unwound any more.
Signed-off-by: Martin Storsjö martin@martin.st --- dlls/ntdll/unix/signal_arm64.c | 98 +--------------------------------- 1 file changed, 2 insertions(+), 96 deletions(-)
diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index e9482e6f69c..782b448bf44 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -62,8 +62,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(seh);
-#include "dwarf.h" - /*********************************************************************** * signal context platform-specific definitions */ @@ -794,26 +792,12 @@ extern NTSTATUS call_user_mode_callback( ULONG64 user_sp, void **ret_ptr, ULONG void *func, TEB *teb ); __ASM_GLOBAL_FUNC( call_user_mode_callback, "stp x29, x30, [sp,#-0xc0]!\n\t" - __ASM_CFI(".cfi_def_cfa_offset 0xc0\n\t") - __ASM_CFI(".cfi_offset 29,-0xc0\n\t") - __ASM_CFI(".cfi_offset 30,-0xb8\n\t") "mov x29, sp\n\t" - __ASM_CFI(".cfi_def_cfa_register 29\n\t") "stp x19, x20, [x29, #0x10]\n\t" - __ASM_CFI(".cfi_rel_offset 19,0x10\n\t") - __ASM_CFI(".cfi_rel_offset 20,0x18\n\t") "stp x21, x22, [x29, #0x20]\n\t" - __ASM_CFI(".cfi_rel_offset 21,0x20\n\t") - __ASM_CFI(".cfi_rel_offset 22,0x28\n\t") "stp x23, x24, [x29, #0x30]\n\t" - __ASM_CFI(".cfi_rel_offset 23,0x30\n\t") - __ASM_CFI(".cfi_rel_offset 24,0x38\n\t") "stp x25, x26, [x29, #0x40]\n\t" - __ASM_CFI(".cfi_rel_offset 25,0x40\n\t") - __ASM_CFI(".cfi_rel_offset 26,0x48\n\t") "stp x27, x28, [x29, #0x50]\n\t" - __ASM_CFI(".cfi_rel_offset 27,0x50\n\t") - __ASM_CFI(".cfi_rel_offset 28,0x58\n\t") "stp d8, d9, [x29, #0x60]\n\t" "stp d10, d11, [x29, #0x70]\n\t" "stp d12, d13, [x29, #0x80]\n\t" @@ -846,39 +830,16 @@ __ASM_GLOBAL_FUNC( user_mode_callback_return, "ldp x5, x29, [x4,#0x110]\n\t" /* prev_frame,syscall_cfa */ "str x5, [x3, #0x2f0]\n\t" /* arm64_thread_data()->syscall_frame */ "sub x29, x29, #0xc0\n\t" - __ASM_CFI(".cfi_def_cfa_register 29\n\t") - __ASM_CFI(".cfi_rel_offset 29,0x00\n\t") - __ASM_CFI(".cfi_rel_offset 30,0x08\n\t") - __ASM_CFI(".cfi_rel_offset 19,0x10\n\t") - __ASM_CFI(".cfi_rel_offset 20,0x18\n\t") - __ASM_CFI(".cfi_rel_offset 21,0x20\n\t") - __ASM_CFI(".cfi_rel_offset 22,0x28\n\t") - __ASM_CFI(".cfi_rel_offset 23,0x30\n\t") - __ASM_CFI(".cfi_rel_offset 24,0x38\n\t") - __ASM_CFI(".cfi_rel_offset 25,0x40\n\t") - __ASM_CFI(".cfi_rel_offset 26,0x48\n\t") - __ASM_CFI(".cfi_rel_offset 27,0x50\n\t") - __ASM_CFI(".cfi_rel_offset 28,0x58\n\t") "ldp x5, x6, [x29, #0xb0]\n\t" "str x6, [x3]\n\t" /* teb->Tib.ExceptionList */ "msr fpcr, x5\n\t" "lsr x5, x5, #32\n\t" "msr fpsr, x5\n\t" "ldp x19, x20, [x29, #0x10]\n\t" - __ASM_CFI(".cfi_same_value 19\n\t") - __ASM_CFI(".cfi_same_value 20\n\t") "ldp x21, x22, [x29, #0x20]\n\t" - __ASM_CFI(".cfi_same_value 21\n\t") - __ASM_CFI(".cfi_same_value 22\n\t") "ldp x23, x24, [x29, #0x30]\n\t" - __ASM_CFI(".cfi_same_value 23\n\t") - __ASM_CFI(".cfi_same_value 24\n\t") "ldp x25, x26, [x29, #0x40]\n\t" - __ASM_CFI(".cfi_same_value 25\n\t") - __ASM_CFI(".cfi_same_value 26\n\t") "ldp x27, x28, [x29, #0x50]\n\t" - __ASM_CFI(".cfi_same_value 27\n\t") - __ASM_CFI(".cfi_same_value 28\n\t") "ldp d8, d9, [x29, #0x60]\n\t" "ldp d10, d11, [x29, #0x70]\n\t" "ldp d12, d13, [x29, #0x80]\n\t" @@ -901,19 +862,6 @@ __ASM_GLOBAL_FUNC( user_mode_abort_thread, "sub x29, x1, #0xc0\n\t" /* switch to kernel stack */ "mov sp, x29\n\t" - __ASM_CFI(".cfi_def_cfa 29,0xc0\n\t") - __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") "bl " __ASM_NAME("abort_thread") )
@@ -1428,26 +1376,12 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB */ __ASM_GLOBAL_FUNC( signal_start_thread, "stp x29, x30, [sp,#-0xc0]!\n\t" - __ASM_CFI(".cfi_def_cfa_offset 0xc0\n\t") - __ASM_CFI(".cfi_offset 29,-0xc0\n\t") - __ASM_CFI(".cfi_offset 30,-0xb8\n\t") "mov x29, sp\n\t" - __ASM_CFI(".cfi_def_cfa_register 29\n\t") "stp x19, x20, [x29, #0x10]\n\t" - __ASM_CFI(".cfi_rel_offset 19,0x10\n\t") - __ASM_CFI(".cfi_rel_offset 20,0x18\n\t") "stp x21, x22, [x29, #0x20]\n\t" - __ASM_CFI(".cfi_rel_offset 21,0x20\n\t") - __ASM_CFI(".cfi_rel_offset 22,0x28\n\t") "stp x23, x24, [x29, #0x30]\n\t" - __ASM_CFI(".cfi_rel_offset 23,0x30\n\t") - __ASM_CFI(".cfi_rel_offset 24,0x38\n\t") "stp x25, x26, [x29, #0x40]\n\t" - __ASM_CFI(".cfi_rel_offset 25,0x40\n\t") - __ASM_CFI(".cfi_rel_offset 26,0x48\n\t") "stp x27, x28, [x29, #0x50]\n\t" - __ASM_CFI(".cfi_rel_offset 27,0x50\n\t") - __ASM_CFI(".cfi_rel_offset 28,0x58\n\t") "add x5, x29, #0xc0\n\t" /* syscall_cfa */ /* set syscall frame */ "ldr x4, [x3, #0x2f0]\n\t" /* arm64_thread_data()->syscall_frame */ @@ -1497,20 +1431,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "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") + /* we're now on the kernel stack */ "and x20, x8, #0xfff\n\t" /* syscall number */ "ubfx x21, x8, #12, #2\n\t" /* syscall table number */ "ldr x16, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_table */ @@ -1533,7 +1454,6 @@ __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 */ @@ -1616,26 +1536,12 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, "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") + /* we're now on the kernel stack */ "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" - __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 */