Merge commit '34d45b36164eee044cfe55d22488b2b65e387872'

[ffmpeg] / tests / checkasm / checkasm.h

diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h
index 69416e954b3f8db514a7792a7b794014cd2d66a3..bd1715633462f0bf7f26d492f6c23a50b1cab4ef 100644 (file)
--- a/tests/checkasm/checkasm.h
+++ b/tests/checkasm/checkasm.h
@@ -120,6 +120,19 @@ void checkasm_stack_clobber(uint64_t clobber, ...);
                                              (void *)checkasm_checked_call;
 #define call_new(...) checked_call(func_new, __VA_ARGS__)
 #endif
+#elif ARCH_ARM && HAVE_ARMV5TE_EXTERNAL
+/* Use a dummy argument, to offset the real parameters by 2, not only 1.
+ * This makes sure that potential 8-byte-alignment of parameters is kept the same
+ * even when the extra parameters have been removed. */
+void checkasm_checked_call_vfp(void *func, int dummy, ...);
+void checkasm_checked_call_novfp(void *func, int dummy, ...);
+extern void (*checkasm_checked_call)(void *func, int dummy, ...);
+#define declare_new(ret, ...) ret (*checked_call)(void *, int dummy, __VA_ARGS__) = (void *)checkasm_checked_call;
+#define call_new(...) checked_call(func_new, 0, __VA_ARGS__)
+#elif ARCH_AARCH64 && !defined(__APPLE__)
+void checkasm_checked_call(void *func, ...);
+#define declare_new(ret, ...) ret (*checked_call)(void *, __VA_ARGS__) = (void *)checkasm_checked_call;
+#define call_new(...) checked_call(func_new, __VA_ARGS__)
 #else
 #define declare_new(ret, ...)
 #define declare_new_emms(cpu_flags, ret, ...)
@@ -127,6 +140,10 @@ void checkasm_stack_clobber(uint64_t clobber, ...);
 #define call_new(...) ((func_type *)func_new)(__VA_ARGS__)
 #endif
 
+#ifndef declare_new_emms
+#define declare_new_emms(cpu_flags, ret, ...) declare_new(ret, __VA_ARGS__)
+#endif
+
 /* Benchmark the function */
 #ifdef AV_READ_TIME
 #define bench_new(...)\