RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'a05cc56124b4f1237f6355784de821e3290ddb44' 

* commit 'a05cc56124b4f1237f6355784de821e3290ddb44':
  checkasm: arm/aarch64: Fix the amount of space reserved for stack parameters

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-03-23 17:35:38 -03:00
parent 1c193ac1f9 a05cc56124
commit cab4c7fa19
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/checkasm/aarch64/checkasm.S
View File

@ -52,7 +52,7 @@ endconst
// max number of args used by any asm function. // max number of args used by any asm function.
#define MAX_ARGS 15 #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 function checkasm_checked_call, export=1
stp x29, x30, [sp, #-16]! stp x29, x30, [sp, #-16]!
@ -81,7 +81,7 @@ function checkasm_checked_call, export=1
sub sp, sp, #ARG_STACK sub sp, sp, #ARG_STACK
.equ pos, 0 .equ pos, 0
// the first stacked arg is copied to x7 // the first stacked arg is copied to x7
.rept MAX_ARGS-7 .rept MAX_ARGS-8
ldr x9, [x29, #16 + 8 + pos] ldr x9, [x29, #16 + 8 + pos]
str x9, [sp, #pos] str x9, [sp, #pos]
.equ pos, pos + 8 .equ pos, pos + 8

4
tests/checkasm/arm/checkasm.S
View File

@ -50,7 +50,7 @@ endconst
@ max number of args used by any asm function. @ max number of args used by any asm function.
#define MAX_ARGS 15 #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 @ align the used stack space to 8 to preserve the stack alignment
#define ARG_STACK_A (((ARG_STACK + pushed + 7) & ~7) - pushed) #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 sub sp, sp, #ARG_STACK_A
.equ pos, 0 .equ pos, 0
.rept MAX_ARGS-2 .rept MAX_ARGS-4
ldr r12, [sp, #ARG_STACK_A + pushed + 8 + pos] ldr r12, [sp, #ARG_STACK_A + pushed + 8 + pos]
str r12, [sp, #pos] str r12, [sp, #pos]
.equ pos, pos + 4 .equ pos, pos + 4