Commit 1daa78799942c83c905f8d7c5439952e9ffec3bc
2016-08-10T14:31:09
Merge pull request #270 from frida/fix/aarch64-warnings Fix aarch64 warnings
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
diff --git a/src/aarch64/ffi.c b/src/aarch64/ffi.c
index cf33abc..2d92f96 100644
--- a/src/aarch64/ffi.c
+++ b/src/aarch64/ffi.c
@@ -55,6 +55,14 @@ struct call_context
UINT64 x[N_X_ARG_REG];
};
+#if FFI_EXEC_TRAMPOLINE_TABLE
+
+#ifdef __MACH__
+#include <mach/vm_param.h>
+#endif
+
+#else
+
#if defined (__clang__) && defined (__APPLE__)
extern void sys_icache_invalidate (void *start, size_t len);
#endif
@@ -71,12 +79,6 @@ ffi_clear_cache (void *start, void *end)
#endif
}
-#if FFI_EXEC_TRAMPOLINE_TABLE
-
-#ifdef __MACH__
-#include <mach/vm_param.h>
-#endif
-
#endif
/* A subroutine of is_vfp_type. Given a structure type, return the type code
@@ -316,7 +318,7 @@ extend_integer_type (void *source, int type)
static void
extend_hfa_type (void *dest, void *src, int h)
{
- int f = h - AARCH64_RET_S4;
+ ssize_t f = h - AARCH64_RET_S4;
void *x0;
asm volatile (