diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-23 17:36:53 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-23 17:36:53 -0300 |
| commit | a2d34cc51ba1e3c19928f1c5aedd7a2990593c47 (patch) | |
| tree | 41405f986c9ce565f6ab48a226e3bdb417ea7ffd | |
| parent | cab4c7fa199fe98db2b298d64eb6cfa386dae939 (diff) | |
| parent | f1b3e131385176c3c9d9783b25047856a0dcebf6 (diff) | |
Merge commit 'f1b3e131385176c3c9d9783b25047856a0dcebf6'
* commit 'f1b3e131385176c3c9d9783b25047856a0dcebf6':
checkasm: aarch64: Clobber the stack before calling functions
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | tests/checkasm/aarch64/checkasm.S | 13 | ||||
| -rw-r--r-- | tests/checkasm/checkasm.h | 6 |
2 files changed, 18 insertions, 1 deletions
diff --git a/tests/checkasm/aarch64/checkasm.S b/tests/checkasm/aarch64/checkasm.S index f0a671e58d..8e4f8c35e4 100644 --- a/tests/checkasm/aarch64/checkasm.S +++ b/tests/checkasm/aarch64/checkasm.S @@ -52,6 +52,19 @@ endconst // max number of args used by any asm function. #define MAX_ARGS 15 +#define CLOBBER_STACK ((8*MAX_ARGS + 15) & ~15) + +function checkasm_stack_clobber, export=1 + mov x29, sp + mov x2, #CLOBBER_STACK +1: + stp x0, x1, [sp, #-16]! + subs x2, x2, #16 + b.gt 1b + mov sp, x29 + ret +endfunc + #define ARG_STACK ((8*(MAX_ARGS - 8) + 15) & ~15) function checkasm_checked_call, export=1 diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h index 18f65e33cf..b3fa83a93e 100644 --- a/tests/checkasm/checkasm.h +++ b/tests/checkasm/checkasm.h @@ -139,9 +139,13 @@ 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_stack_clobber(uint64_t clobber, ...); 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__) +#define CLOB (UINT64_C(0xdeadbeefdeadbeef)) +#define call_new(...) (checkasm_stack_clobber(CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,\ + CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB,CLOB),\ + checked_call(func_new, __VA_ARGS__)) #else #define declare_new(ret, ...) #define declare_new_emms(cpu_flags, ret, ...) |