diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-12-12 20:00:22 +0100 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-12-12 21:30:49 +0200 |
| commit | 140367aff9284a913aaf207f949cb7b116e1b197 (patch) | |
| tree | 020819261c6493cb0448b81d7aa00c7a2bbaa0fe /libavutil/x86 | |
| parent | 29d2595ad70eaa3ca4ce0fc1e4738ac7cc49497f (diff) | |
| download | ffmpeg-140367aff9284a913aaf207f949cb7b116e1b197.tar.gz | |
x86inc: fix stack alignment on win64
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavutil/x86')
| -rw-r--r-- | libavutil/x86/x86inc.asm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index 483ae7b048..de0f22c2dc 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -428,7 +428,7 @@ DECLARE_REG 14, R15, 120 %assign %%i xmm_regs_used %rep (xmm_regs_used-6) %assign %%i %%i-1 - movdqa [rsp + (%%i-6)*16 + stack_size], xmm %+ %%i + movdqa [rsp + (%%i-6)*16 + stack_size + (~stack_offset&8)], xmm %+ %%i %endrep %endmacro @@ -436,8 +436,7 @@ DECLARE_REG 14, R15, 120 %assign xmm_regs_used %1 ASSERT xmm_regs_used <= 16 %if xmm_regs_used > 6 - %assign stack_size_padded (xmm_regs_used-6)*16+16-gprsize-(stack_offset&15) - SUB rsp, stack_size_padded + SUB rsp, (xmm_regs_used-6)*16+16 WIN64_PUSH_XMM %endif %endmacro @@ -447,8 +446,11 @@ DECLARE_REG 14, R15, 120 %assign %%i xmm_regs_used %rep (xmm_regs_used-6) %assign %%i %%i-1 - movdqa xmm %+ %%i, [%1 + (%%i-6)*16+stack_size] + movdqa xmm %+ %%i, [%1 + (%%i-6)*16+stack_size+(~stack_offset&8)] %endrep + %if stack_size_padded == 0 + add %1, (xmm_regs_used-6)*16+16 + %endif %endif %if stack_size_padded > 0 %if stack_size > 0 && (mmsize == 32 || HAVE_ALIGNED_STACK == 0) |