From 172af208520108c9b20bf1cdd62d8775cff7cd2b Mon Sep 17 00:00:00 2001 From: James Almer Date: Wed, 8 Jun 2016 19:37:08 -0300 Subject: [PATCH] x86/showcqt: use three operand format for some instructions Fixes failures with yasm 1.1.0 and older Signed-off-by: James Almer --- libavfilter/x86/avf_showcqt.asm | 8 ++++---- libavutil/x86/x86util.asm | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavfilter/x86/avf_showcqt.asm b/libavfilter/x86/avf_showcqt.asm index f6b3fef0bb..659afeb3e6 100644 --- a/libavfilter/x86/avf_showcqt.asm +++ b/libavfilter/x86/avf_showcqt.asm @@ -72,8 +72,8 @@ endstruc %macro CQT_SEPARATE 6 ; a_re, a_im, b_re, b_im, tmp, tmp2 addps m%5, m%4, m%2 subps m%6, m%3, m%1 - addps m%1, m%3 - subps m%2, m%4 + addps m%1, m%1, m%3 + subps m%2, m%2, m%4 HADDPS m%5, m%6, m%3 HADDPS m%1, m%2, m%3 HADDPS m%1, m%5, m%2 @@ -90,7 +90,7 @@ cglobal showcqt_cqt_calc, 5, 10, 12, dst, src, coeffs, len, fft_len, x, coeffs_v align 16 .loop_k: mov xd, [coeffsq + Coeffs.len] - xorps m0, m0 + xorps m0, m0, m0 movaps m1, m0 movaps m2, m0 mov coeffs_lend, [coeffsq + Coeffs.len + Coeffs.sizeof] @@ -155,7 +155,7 @@ cglobal showcqt_cqt_calc, 4, 7, 8, dst, src, coeffs, len, x, coeffs_val, i align 16 .loop_k: mov xd, [coeffsq + Coeffs.len] - xorps m0, m0 + xorps m0, m0, m0 movaps m1, m0 movaps m2, m0 movaps m3, m0 diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm index 50b7b50535..e7493f4883 100644 --- a/libavutil/x86/x86util.asm +++ b/libavutil/x86/x86util.asm @@ -359,7 +359,7 @@ %macro HADDPS 3 ; dst, src, tmp %if cpuflag(sse3) - haddps %1, %2 + haddps %1, %1, %2 %else movaps %3, %1 shufps %1, %2, q2020