generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

config.asm: change %ifdef directives to %if directives.

Browse Source 
This allows combining multiple conditionals in a single statement.
This commit is contained in:
Ronald S. Bultje
2012-01-23 17:45:58 +08:00
parent 08628b6afb
commit 3b15a6d742
27 changed files with 208 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libavcodec/x86/fft_mmx.asm
View File

@@ -30,7 +30,7 @@
%include "x86inc.asm"
%ifdef ARCH_X86_64
%if ARCH_X86_64
%define pointer resq
%else
%define pointer resd
@@ -73,7 +73,7 @@ cextern cos_ %+ i
%assign i i<<1
%endrep
%ifdef ARCH_X86_64
%if ARCH_X86_64
%define pointer dq
%else
%define pointer dd
@@ -299,7 +299,7 @@ IF%1 mova Z(1), m5
INIT_YMM
%ifdef HAVE_AVX
%if HAVE_AVX
align 16
fft8_avx:
mova m0, Z(0)
@@ -534,7 +534,7 @@ DEFINE_ARGS z, w, n, o1, o3
INIT_YMM
%ifdef HAVE_AVX
%if HAVE_AVX
%macro INTERL_AVX 5
vunpckhps %3, %2, %1
vunpcklps %2, %2, %1
@@ -638,7 +638,7 @@ cglobal fft_dispatch%3%2, 2,5,8, z, nbits
RET
%endmacro ; DECL_FFT
%ifdef HAVE_AVX
%if HAVE_AVX
INIT_YMM
DECL_FFT 6, _avx
DECL_FFT 6, _avx, _interleave
@@ -750,7 +750,7 @@ INIT_XMM
%macro DECL_IMDCT 2
cglobal imdct_half%1, 3,7,8; FFTContext *s, FFTSample *output, const FFTSample *input
%ifdef ARCH_X86_64
%if ARCH_X86_64
%define rrevtab r10
%define rtcos r11
%define rtsin r12
@@ -769,24 +769,24 @@ cglobal imdct_half%1, 3,7,8; FFTContext *s, FFTSample *output, const FFTSample *
mov rtsin, [r0+FFTContext.tsin]
add rtcos, r3
add rtsin, r3
%ifndef ARCH_X86_64
%if ARCH_X86_64 == 0
push rtcos
push rtsin
%endif
shr r3, 1
mov rrevtab, [r0+FFTContext.revtab]
add rrevtab, r3
%ifndef ARCH_X86_64
%if ARCH_X86_64 == 0
push rrevtab
%endif
sub r3, 4
%ifdef ARCH_X86_64
%if ARCH_X86_64
xor r4, r4
sub r4, r3
%endif
.pre:
%ifndef ARCH_X86_64
%if ARCH_X86_64 == 0
;unspill
xor r4, r4
sub r4, r3
@@ -795,7 +795,7 @@ cglobal imdct_half%1, 3,7,8; FFTContext *s, FFTSample *output, const FFTSample *
%endif
PREROTATER r4, r3, r2, rtcos, rtsin
%ifdef ARCH_X86_64
%if ARCH_X86_64
movzx r5, word [rrevtab+r4-4]
movzx r6, word [rrevtab+r4-2]
movzx r13, word [rrevtab+r3]
@@ -829,7 +829,7 @@ cglobal imdct_half%1, 3,7,8; FFTContext *s, FFTSample *output, const FFTSample *
mov r0d, [r5+FFTContext.mdctsize]
add r6, r0
shr r0, 1
%ifndef ARCH_X86_64
%if ARCH_X86_64 == 0
%define rtcos r2
%define rtsin r3
mov rtcos, [esp+8]
@@ -839,7 +839,7 @@ cglobal imdct_half%1, 3,7,8; FFTContext *s, FFTSample *output, const FFTSample *
mov r1, -mmsize
sub r1, r0
%2 r0, r1, r6, rtcos, rtsin
%ifdef ARCH_X86_64
%if ARCH_X86_64
pop r14
pop r13
pop r12
@@ -856,6 +856,6 @@ DECL_IMDCT _sse, POSROTATESHUF
INIT_YMM
%ifdef HAVE_AVX
%if HAVE_AVX
DECL_IMDCT _avx, POSROTATESHUF_AVX
%endif