arm: Mangle external symbols properly in new vfp assembly files

Martin Storsjö committed 13 years ago

Commit 69e67021 parent ff30d123 files · +4 −4Browse files

Showing the changes to libavcodec (3 of 3 files). Show all

Unified · Split

3 files

libavcodec/arm/dcadsp_vfp.S +1 −1
libavcodec/arm/mdct_vfp.S +2 −2
libavcodec/arm/synth_filter_vfp.S +1 −1

libavcodec/arm/dcadsp_vfp.S+1−1

@@ -463,7 +463,7 @@ NOVFP ldr a1, [fp, #-8*4] · 462 unmodified lines
463	VFP stmia sp, {WINDOW, OUT, BUF}	463	VFP stmia sp, {WINDOW, OUT, BUF}
464	NOVFP stmia sp, {WINDOW, OUT, BUF, SCALEINT}	464	NOVFP stmia sp, {WINDOW, OUT, BUF, SCALEINT}
465	VFP vldr SCALE, [sp, #3*4]	465	VFP vldr SCALE, [sp, #3*4]
466	bl ff_synth_filter_float_vfp	466	bl X(ff_synth_filter_float_vfp)
467	add OUT, OUT, #32*4	467	add OUT, OUT, #32*4
468	add BUF, BUF, #32*4	468	add BUF, BUF, #32*4
469	subs COUNT, COUNT, #1	469	subs COUNT, COUNT, #1

libavcodec/arm/mdct_vfp.S+2−2

@@ -151,7 +151,7 @@ function ff_imdct_half_vfp, export=1 · 150 unmodified lines
151	ldr ip, [CONTEXT, #5*4] @ mdct_bits	151	ldr ip, [CONTEXT, #5*4] @ mdct_bits
152	teq ip, #6	152	teq ip, #6
153	it ne	153	it ne
154	bne ff_imdct_half_c @ only case currently accelerated is the one used by DCA	154	bne X(ff_imdct_half_c) @ only case currently accelerated is the one used by DCA
155		155
156	.set n, 1<<6	156	.set n, 1<<6
157	.set n2, n/2	157	.set n2, n/2
@@ -175,7 +175,7 @@ function ff_imdct_half_vfp, export=1 · 17 unmodified lines
175		175
176	fmxr FPSCR, OLDFPSCR	176	fmxr FPSCR, OLDFPSCR
177	mov a1, OUT	177	mov a1, OUT
178	bl ff_fft16_vfp	178	bl X(ff_fft16_vfp)
179	ldr lr, =0x03030000 @ RunFast mode, short vectors of length 4, stride 1	179	ldr lr, =0x03030000 @ RunFast mode, short vectors of length 4, stride 1
180	fmxr FPSCR, lr	180	fmxr FPSCR, lr
181		181

libavcodec/arm/synth_filter_vfp.S+1−1

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