virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

arm: Mangle external symbols properly in new vfp assembly files

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2013-07-22 12:24:43 +03:00
parent ff30d12159
commit 69e6702c01
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/arm/dcadsp_vfp.S
View File

@ -463,7 +463,7 @@ NOVFP ldr a1, [fp, #-8*4]
VFP stmia sp, {WINDOW, OUT, BUF} VFP stmia sp, {WINDOW, OUT, BUF}
NOVFP stmia sp, {WINDOW, OUT, BUF, SCALEINT} NOVFP stmia sp, {WINDOW, OUT, BUF, SCALEINT}
VFP vldr SCALE, [sp, #3*4] VFP vldr SCALE, [sp, #3*4]
bl ff_synth_filter_float_vfp bl X(ff_synth_filter_float_vfp)
add OUT, OUT, #32*4 add OUT, OUT, #32*4
add BUF, BUF, #32*4 add BUF, BUF, #32*4
subs COUNT, COUNT, #1 subs COUNT, COUNT, #1

4
libavcodec/arm/mdct_vfp.S
View File

@ -151,7 +151,7 @@ function ff_imdct_half_vfp, export=1
ldr ip, [CONTEXT, #5*4] @ mdct_bits ldr ip, [CONTEXT, #5*4] @ mdct_bits
teq ip, #6 teq ip, #6
it ne it ne
bne ff_imdct_half_c @ only case currently accelerated is the one used by DCA bne X(ff_imdct_half_c) @ only case currently accelerated is the one used by DCA
.set n, 1<<6 .set n, 1<<6
.set n2, n/2 .set n2, n/2
@ -175,7 +175,7 @@ function ff_imdct_half_vfp, export=1
fmxr FPSCR, OLDFPSCR fmxr FPSCR, OLDFPSCR
mov a1, OUT mov a1, OUT
bl ff_fft16_vfp bl X(ff_fft16_vfp)
ldr lr, =0x03030000 @ RunFast mode, short vectors of length 4, stride 1 ldr lr, =0x03030000 @ RunFast mode, short vectors of length 4, stride 1
fmxr FPSCR, lr fmxr FPSCR, lr

2
libavcodec/arm/synth_filter_vfp.S
View File

@ -132,7 +132,7 @@ function ff_synth_filter_float_vfp, export=1
str lr, [P_SB_OFF] @ rotate offset, modulo buffer size, ready for next call str lr, [P_SB_OFF] @ rotate offset, modulo buffer size, ready for next call
ldr a3, [sp, #(16+6+2)*4] @ fetch in from stack, to pass to imdct_half ldr a3, [sp, #(16+6+2)*4] @ fetch in from stack, to pass to imdct_half
VFP vmov s16, SCALE @ imdct_half is free to corrupt s0, but it contains one of our arguments in hardfp case VFP vmov s16, SCALE @ imdct_half is free to corrupt s0, but it contains one of our arguments in hardfp case
bl ff_imdct_half_vfp bl X(ff_imdct_half_vfp)
VFP vmov SCALE, s16 VFP vmov SCALE, s16
fmrx OLDFPSCR, FPSCR fmrx OLDFPSCR, FPSCR