Move to global_asm, naked functions are too unstable

Author: roblabla

unwind/src/glue/aarch64.rs

@@ -3,16 +3,16 @@ use registers::{Registers, DwarfRegisterAArch64};
 
 #[allow(improper_ctypes)] // trampoline just forwards the ptr
 extern "C" {
-    #[cfg(not(feature = "nightly"))]
     pub fn unwind_trampoline(payload: *mut UnwindPayload);
-    #[cfg(not(feature = "nightly"))]
     fn unwind_lander(regs: *const LandingRegisters);
 }
 
 #[cfg(feature = "nightly")]
-#[naked]
-pub unsafe extern fn unwind_trampoline(_payload: *mut UnwindPayload) {
-    asm!("
+global_asm! {
+r#"
+.global unwind_trampoline
+unwind_trampoline:
+.cfi_startproc
      mov x1, sp
      sub sp, sp, 0xA0
      .cfi_adjust_cfa_offset 0xA0
@@ -34,14 +34,10 @@ pub unsafe extern fn unwind_trampoline(_payload: *mut UnwindPayload) {
      add sp, sp, 0xA0
      .cfi_adjust_cfa_offset -0xA0
      ret
-     ");
-    ::std::hint::unreachable_unchecked();
-}
+.cfi_endproc
 
-#[cfg(feature = "nightly")]
-#[naked]
-unsafe extern fn unwind_lander(_regs: *const LandingRegisters) {
-    asm!("
+.global unwind_lander
+unwind_lander:
      ldp x2,  x3,  [x0, #0x010]
      ldp x4,  x5,  [x0, #0x020]
      ldp x6,  x7,  [x0, #0x030]
@@ -78,8 +74,7 @@ unsafe extern fn unwind_lander(_regs: *const LandingRegisters) {
 
      ldp x0,  x1,  [x0, #0x000]
      ret x30 // HYPERSPACE JUMP :D
-     ");
-    ::std::hint::unreachable_unchecked();
+"#
 }
 
 #[repr(C)]

unwind/src/glue/x86_64.rs

@@ -3,25 +3,12 @@ use registers::{Registers, DwarfRegister};
 
 #[allow(improper_ctypes)] // trampoline just forwards the ptr
 extern "C" {
-    #[cfg(not(feature = "nightly"))]
     pub fn unwind_trampoline(payload: *mut UnwindPayload);
-    #[cfg(not(feature = "nightly"))]
     fn unwind_lander(regs: *const LandingRegisters);
 }
 
 #[cfg(feature = "nightly")]
-#[naked]
-pub unsafe extern fn unwind_trampoline(_payload: *mut UnwindPayload) {
-    asm!(include_str!("x86_64_trampoline.S"));
-    ::std::hint::unreachable_unchecked();
-}
-
-#[cfg(feature = "nightly")]
-#[naked]
-unsafe extern fn unwind_lander(_regs: *const LandingRegisters) {
-    asm!(include_str!("x86_64_lander.S"));
-    ::std::hint::unreachable_unchecked();
-}
+global_asm!(include_str!("x86_64_helper.S"));
 
 #[repr(C)]
 struct LandingRegisters {

unwind/src/glue/x86_64_helper.S

@@ -1,9 +1,41 @@
 .global unwind_trampoline
 unwind_trampoline:
 .cfi_startproc
-.include "x86_64_trampoline.S"
+movq %rsp, %rsi
+.cfi_def_cfa rsi, 8
+pushq %rbp
+.cfi_offset rbp, -16
+pushq %rbx
+pushq %r12
+pushq %r13
+pushq %r14
+pushq %r15
+movq %rsp, %rdx
+subq $0x08, %rsp
+.cfi_def_cfa rsp, 0x40
+call unwind_recorder
+addq $0x38, %rsp
+.cfi_def_cfa rsp, 8
+ret
 .cfi_endproc
 
 .global unwind_lander
 unwind_lander:
-.include "x86_64_lander.S"
+movq %rdi, %rsp
+popq %rax
+popq %rbx
+popq %rcx
+popq %rdx
+popq %rdi
+popq %rsi
+popq %rbp
+popq %r8
+popq %r9
+popq %r10
+popq %r11
+popq %r12
+popq %r13
+popq %r14
+popq %r15
+movq 0(%rsp), %rsp
+ret /* HYPERSPACE JUMP :D */

unwind/src/glue/x86_64_lander.S

@@ -1,4 +1,4 @@
-#![cfg_attr(feature = "nightly", feature(asm, naked_functions))]
+#![cfg_attr(feature = "nightly", feature(global_asm))]
 
 extern crate gimli;
 extern crate libc;