diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-23 17:35:38 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-23 17:35:38 -0300 |
| commit | cab4c7fa199fe98db2b298d64eb6cfa386dae939 (patch) | |
| tree | 4c18a7b0994bfa5cae6a88bbe038a2ab69a03a8a /tests | |
| parent | 1c193ac1f9cfe703d6a1c36795f309ba5d14bf6e (diff) | |
| parent | a05cc56124b4f1237f6355784de821e3290ddb44 (diff) | |
| download | ffmpeg-streaming-cab4c7fa199fe98db2b298d64eb6cfa386dae939.zip ffmpeg-streaming-cab4c7fa199fe98db2b298d64eb6cfa386dae939.tar.gz | |
Merge commit 'a05cc56124b4f1237f6355784de821e3290ddb44'
* commit 'a05cc56124b4f1237f6355784de821e3290ddb44':
checkasm: arm/aarch64: Fix the amount of space reserved for stack parameters
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/checkasm/aarch64/checkasm.S | 4 | ||||
| -rw-r--r-- | tests/checkasm/arm/checkasm.S | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/checkasm/aarch64/checkasm.S b/tests/checkasm/aarch64/checkasm.S index 6317d80..f0a671e 100644 --- a/tests/checkasm/aarch64/checkasm.S +++ b/tests/checkasm/aarch64/checkasm.S @@ -52,7 +52,7 @@ endconst // max number of args used by any asm function. #define MAX_ARGS 15 -#define ARG_STACK ((8*(MAX_ARGS - 7) + 15) & ~15) +#define ARG_STACK ((8*(MAX_ARGS - 8) + 15) & ~15) function checkasm_checked_call, export=1 stp x29, x30, [sp, #-16]! @@ -81,7 +81,7 @@ function checkasm_checked_call, export=1 sub sp, sp, #ARG_STACK .equ pos, 0 // the first stacked arg is copied to x7 -.rept MAX_ARGS-7 +.rept MAX_ARGS-8 ldr x9, [x29, #16 + 8 + pos] str x9, [sp, #pos] .equ pos, pos + 8 diff --git a/tests/checkasm/arm/checkasm.S b/tests/checkasm/arm/checkasm.S index e6b1650..2051b29 100644 --- a/tests/checkasm/arm/checkasm.S +++ b/tests/checkasm/arm/checkasm.S @@ -50,7 +50,7 @@ endconst @ max number of args used by any asm function. #define MAX_ARGS 15 -#define ARG_STACK 4*(MAX_ARGS - 2) +#define ARG_STACK 4*(MAX_ARGS - 4) @ align the used stack space to 8 to preserve the stack alignment #define ARG_STACK_A (((ARG_STACK + pushed + 7) & ~7) - pushed) @@ -74,7 +74,7 @@ function checkasm_checked_call_\variant, export=1 sub sp, sp, #ARG_STACK_A .equ pos, 0 -.rept MAX_ARGS-2 +.rept MAX_ARGS-4 ldr r12, [sp, #ARG_STACK_A + pushed + 8 + pos] str r12, [sp, #pos] .equ pos, pos + 4 |
