[FFmpeg-cvslog] Merge commit 'a05cc56124b4f1237f6355784de821e3290ddb44'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Mar 23 17:35:38 2017 -0300| [cab4c7fa199fe98db2b298d64eb6cfa386dae939] | committer: James Almer

Merge commit 'a05cc56124b4f1237f6355784de821e3290ddb44'

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

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cab4c7fa199fe98db2b298d64eb6cfa386dae939
---

 tests/checkasm/aarch64/checkasm.S | 4 ++--
 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


======================================================================