Merge pull request #116 from frida/fix/darwin-aarch64-variadic

Fix handling of variadic calls on Darwin/AArch64

diff --git a/src/aarch64/sysv.S b/src/aarch64/sysv.S
index 7273b73..169eab8 100644 (file)
--- a/src/aarch64/sysv.S
+++ b/src/aarch64/sysv.S
@@ -47,6 +47,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 #ifdef __ELF__
         .type CNAME(ffi_call_SYSV), #function
 #endif
+#ifdef __APPLE__
+        .align 2
+#endif
 
 /* ffi_call_SYSV()
 
@@ -241,6 +244,9 @@ CNAME(ffi_call_SYSV):
 
         .text
         .globl CNAME(ffi_closure_SYSV)
+#ifdef __APPLE__
+        .align 2
+#endif
         .cfi_startproc
 CNAME(ffi_closure_SYSV):
         stp     x29, x30, [sp, #-16]!

diff --git a/src/x86/ffi.c b/src/x86/ffi.c
index 72bed06..bcfc153 100644 (file)
--- a/src/x86/ffi.c
+++ b/src/x86/ffi.c
@@ -746,7 +746,7 @@ ffi_prep_raw_closure_loc (ffi_raw_closure* closure,
     }
   else if (cif->abi == FFI_THISCALL)
     {
-      FFI_INIT_TRAMPOLINE_RAW_THISCALL (&closure->tramp[0], &ffi_closure_raw_THISCALL, codeloc);
+      FFI_INIT_TRAMPOLINE_RAW_THISCALL (&closure->tramp[0], &ffi_closure_raw_THISCALL, codeloc, cif->bytes);
     }
 #endif
   closure->cif  = cif;