@@ -22,17 +22,15 @@ use wasmtime_asm_macros::asm_func;
2222
2323cfg_if:: cfg_if! {
2424 if #[ cfg( target_os = "macos" ) ] {
25- macro_rules! cfi_window_save { ( ) => ( "" ) ; }
26- macro_rules! pacia1716 { ( ) => ( "" ) ; }
27- macro_rules! paciasp { ( ) => ( "" ) ; }
28- macro_rules! autiasp { ( ) => ( "" ) ; }
25+ macro_rules! paci1716 { ( ) => ( "pacib1716\n " ) ; }
26+ macro_rules! pacisp { ( ) => ( "pacibsp\n " ) ; }
27+ macro_rules! autisp { ( ) => ( "autibsp\n " ) ; }
2928 macro_rules! sym_adrp { ( $s: tt) => ( concat!( "_" , $s, "@PAGE" ) ) ; }
3029 macro_rules! sym_add { ( $s: tt) => ( concat!( "_" , $s, "@PAGEOFF" ) ) ; }
3130 } else {
32- macro_rules! cfi_window_save { ( ) => ( ".cfi_window_save\n " ) ; }
33- macro_rules! pacia1716 { ( ) => ( "pacia1716\n " ) ; }
34- macro_rules! paciasp { ( ) => ( "paciasp\n " ) ; }
35- macro_rules! autiasp { ( ) => ( "autiasp\n " ) ; }
31+ macro_rules! paci1716 { ( ) => ( "pacia1716\n " ) ; }
32+ macro_rules! pacisp { ( ) => ( "paciasp\n " ) ; }
33+ macro_rules! autisp { ( ) => ( "autiasp\n " ) ; }
3634 macro_rules! sym_adrp { ( $s: tt) => ( concat!( $s, "" ) ) ; }
3735 macro_rules! sym_add { ( $s: tt) => ( concat!( ":lo12:" , $s) ) ; }
3836 }
@@ -44,9 +42,9 @@ asm_func!(
4442 "
4543 .cfi_startproc
4644 " ,
47- paciasp!( ) ,
48- cfi_window_save!( ) ,
45+ pacisp!( ) ,
4946 "
47+ .cfi_window_save
5048 // Save all callee-saved registers on the stack since we're
5149 // assuming they're clobbered as a result of the stack switch.
5250 stp x29, x30, [sp, -16]!
@@ -81,9 +79,9 @@ asm_func!(
8179 ldp x20, x19, [sp], 16
8280 ldp x29, x30, [sp], 16
8381 " ,
84- autiasp!( ) ,
85- cfi_window_save!( ) ,
82+ autisp!( ) ,
8683 "
84+ .cfi_window_save
8785 ret
8886 .cfi_endproc
8987 " ,
@@ -121,7 +119,7 @@ asm_func!(
121119 adrp x17, " , sym_adrp!( "wasmtime_fiber_start" ) , "
122120 add x17, x17, " , sym_add!( "wasmtime_fiber_start" ) , "
123121 " ,
124- pacia1716 !( ) ,
122+ paci1716 !( ) ,
125123 "
126124 str x17, [x16, -0x8] // x17 => lr
127125 str x0, [x16, -0x18] // x0 => x19
@@ -151,9 +149,7 @@ asm_func!(
151149 0x23, 0xa0, 0x1 /* DW_OP_plus_uconst 0xa0 */
152150 .cfi_rel_offset x29, -0x10
153151 .cfi_rel_offset x30, -0x08
154- " ,
155- cfi_window_save!( ) ,
156- "
152+ .cfi_window_save
157153 .cfi_rel_offset x19, -0x18
158154 .cfi_rel_offset x20, -0x20
159155 .cfi_rel_offset x21, -0x28
0 commit comments