From 39d2bb9aaa35018bd474feb42aefced7c4e278d2 Mon Sep 17 00:00:00 2001 From: Douglas Katzman Date: Sun, 30 Jun 2024 23:17:37 -0400 Subject: [PATCH] Remove cfi directives (undoing revs 1e0743dc, 5ec78a31, etc) Presumptive fix for lp#2071545 though I couldn't confirm --- src/runtime/x86-64-assem.S | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/runtime/x86-64-assem.S b/src/runtime/x86-64-assem.S index 3b2943ea3..414791556 100644 --- a/src/runtime/x86-64-assem.S +++ b/src/runtime/x86-64-assem.S @@ -121,7 +121,6 @@ GNAME(funcall1_switching_stack): * anyway */ .align align_16byte,0x90 - .cfi_startproc GNAME(call_into_lisp_first_time_): GNAME(lspmain): # so much easier to type 'b lspmain' in gdb push %rbp # Save old frame pointer. @@ -157,8 +156,6 @@ Lstack: push %r15 mov %rax,%r15 #endif - .cfi_def_cfa rbp, 16 - .cfi_offset rbp, -16 /* FIXME x86 saves FPU state here */ push %rbx # these regs are callee-saved according to C push %r12 # so must be preserved and restored when @@ -195,15 +192,6 @@ Lzero: push %rbp # Dummy for return address push %rbp # fp in save location S1 mov %rsp,%rbp # The current sp marks start of new frame. -#ifndef LISP_FEATURE_DARWIN - # This call frame info is valid but it makes macOS print a warning - # that I'm tired of seeing. I can't even remember why this helps. - # Inform unwinder that the new frame has not been entered yet. - # The CFA is what it was (old RBP+16) before the preceding mov. - # This sequence encodes DW_CFA_def_cfa_expression - # DW_OP_breg6 (rbp): 0 / DW_OP_deref / DW_OP_lit16 / DW_OP_plus - .cfi_escape 0x0f, 5, 0x76, 0, 6, 0x40, 0x22 -#endif Lcall: LOAD_PIC_VAR(gc_card_mark, CARD_TABLE_REG) call *CLOSURE_FUN_OFFSET(%rax) @@ -232,7 +220,6 @@ LsingleValue: leave #endif ret - .cfi_endproc SIZE(GNAME(call_into_lisp_)) .text