From b280c6202b28b371a8d96850194fd69d7ad5dcc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Sun, 16 Nov 2014 12:46:51 +0200 Subject: [PATCH] arm: fft_vfp: Unify the behaviour in ff_fft_calc_vfp between arm/thumb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Don't include the function pointer table in the code segment in arm mode. This shouldn't have any significant performance effect. It does end up as a few more instructions than before, for ARM, but only at the entry to this function, not within the fft functions themselves. Signed-off-by: Martin Storsjö --- libavcodec/arm/fft_vfp.S | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/libavcodec/arm/fft_vfp.S b/libavcodec/arm/fft_vfp.S index 91b833bdca..9c7b54e79e 100644 --- a/libavcodec/arm/fft_vfp.S +++ b/libavcodec/arm/fft_vfp.S @@ -30,14 +30,10 @@ function ff_fft_calc_vfp, export=1 ldr ip, [a1, #0] @ nbits mov a1, a2 -A ldr pc, [pc, ip, lsl #2] -A .word 0 -A .word 0 -A .word 0 -T movrel a2, (fft_tab_vfp - 8) -T ldr pc, [a2, ip, lsl #2] -T endfunc -T const fft_tab_vfp + movrel a2, (fft_tab_vfp - 8) + ldr pc, [a2, ip, lsl #2] +endfunc +const fft_tab_vfp .word fft4_vfp .word fft8_vfp .word X(ff_fft16_vfp) @ this one alone is exported @@ -53,8 +49,7 @@ T const fft_tab_vfp .word fft16384_vfp .word fft32768_vfp .word fft65536_vfp -A endfunc -T endconst +endconst function fft4_vfp vldr d0, [a1, #0*2*4] @ s0,s1 = z[0]