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

arm: Add X() around all references to extern symbols

Browse Source 
Don't rely on the fact that an unprefixed label currently exists.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2014-02-07 12:00:31 +02:00
parent 5351964a2b
commit 5bcbb516f2
8 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/arm/fmtconvert_neon.S
View File

@ -70,7 +70,7 @@ function ff_float_to_int16_interleave_neon, export=1
cmp r3, #2 cmp r3, #2
itt lt itt lt
ldrlt r1, [r1] ldrlt r1, [r1]
blt ff_float_to_int16_neon blt X(ff_float_to_int16_neon)
bne 4f bne 4f
ldr r3, [r1] ldr r3, [r1]

16
libavcodec/arm/h264idct_neon.S
View File

@ -113,8 +113,8 @@ function ff_h264_idct_add16_neon, export=1
movne lr, #0 movne lr, #0
cmp lr, #0 cmp lr, #0
ite ne ite ne
adrne lr, ff_h264_idct_dc_add_neon + CONFIG_THUMB adrne lr, X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB
adreq lr, ff_h264_idct_add_neon + CONFIG_THUMB adreq lr, X(ff_h264_idct_add_neon) + CONFIG_THUMB
blx lr blx lr
2: subs ip, ip, #1 2: subs ip, ip, #1
add r1, r1, #32 add r1, r1, #32
@ -138,8 +138,8 @@ function ff_h264_idct_add16intra_neon, export=1
cmp r8, #0 cmp r8, #0
ldrsh r8, [r1] ldrsh r8, [r1]
iteet ne iteet ne
adrne lr, ff_h264_idct_add_neon + CONFIG_THUMB adrne lr, X(ff_h264_idct_add_neon) + CONFIG_THUMB
adreq lr, ff_h264_idct_dc_add_neon + CONFIG_THUMB adreq lr, X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB
cmpeq r8, #0 cmpeq r8, #0
blxne lr blxne lr
subs ip, ip, #1 subs ip, ip, #1
@ -166,8 +166,8 @@ function ff_h264_idct_add8_neon, export=1
cmp r8, #0 cmp r8, #0
ldrsh r8, [r1] ldrsh r8, [r1]
iteet ne iteet ne
adrne lr, ff_h264_idct_add_neon + CONFIG_THUMB adrne lr, X(ff_h264_idct_add_neon) + CONFIG_THUMB
adreq lr, ff_h264_idct_dc_add_neon + CONFIG_THUMB adreq lr, X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB
cmpeq r8, #0 cmpeq r8, #0
blxne lr blxne lr
add r12, r12, #1 add r12, r12, #1
@ -388,8 +388,8 @@ function ff_h264_idct8_add4_neon, export=1
movne lr, #0 movne lr, #0
cmp lr, #0 cmp lr, #0
ite ne ite ne
adrne lr, ff_h264_idct8_dc_add_neon + CONFIG_THUMB adrne lr, X(ff_h264_idct8_dc_add_neon) + CONFIG_THUMB
adreq lr, ff_h264_idct8_add_neon + CONFIG_THUMB adreq lr, X(ff_h264_idct8_add_neon) + CONFIG_THUMB
blx lr blx lr
2: subs r12, r12, #4 2: subs r12, r12, #4
add r1, r1, #128 add r1, r1, #128

4
libavcodec/arm/hpeldsp_armv6.S
View File

@ -23,11 +23,11 @@
.macro call_2x_pixels type, subp .macro call_2x_pixels type, subp
function ff_\type\()_pixels16\subp\()_armv6, export=1 function ff_\type\()_pixels16\subp\()_armv6, export=1
push {r0-r3, lr} push {r0-r3, lr}
bl ff_\type\()_pixels8\subp\()_armv6 bl X(ff_\type\()_pixels8\subp\()_armv6)
pop {r0-r3, lr} pop {r0-r3, lr}
add r0, r0, #8 add r0, r0, #8
add r1, r1, #8 add r1, r1, #8
b ff_\type\()_pixels8\subp\()_armv6 b X(ff_\type\()_pixels8\subp\()_armv6)
endfunc endfunc
.endm .endm

2
libavcodec/arm/mdct_neon.S
View File

@ -129,7 +129,7 @@ function ff_imdct_calc_neon, export=1
lsl r4, r4, r3 lsl r4, r4, r3
add r1, r1, r4 add r1, r1, r4
bl ff_imdct_half_neon bl X(ff_imdct_half_neon)
add r0, r5, r4, lsl #2 add r0, r5, r4, lsl #2
add r1, r5, r4, lsl #1 add r1, r5, r4, lsl #1

2
libavcodec/arm/mpegvideo_neon.S
View File

@ -100,7 +100,7 @@ function ff_dct_unquantize_h263_intra_neon, export=1
smulbb r4, r4, r6 smulbb r4, r4, r6
2: lsl r0, r3, #1 2: lsl r0, r3, #1
add r3, r12, #1 add r3, r12, #1
bl ff_dct_unquantize_h263_neon bl X(ff_dct_unquantize_h263_neon)
vmov.16 d0[0], r4 vmov.16 d0[0], r4
vst1.16 {d0[0]}, [r5] vst1.16 {d0[0]}, [r5]
pop {r4-r6,pc} pop {r4-r6,pc}

2
libavcodec/arm/videodsp_armv5te.S
View File

@ -26,6 +26,6 @@ function ff_prefetch_arm, export=1
subs r2, r2, #1 subs r2, r2, #1
pld [r0] pld [r0]
add r0, r0, r1 add r0, r0, r1
bne ff_prefetch_arm bne X(ff_prefetch_arm)
bx lr bx lr
endfunc endfunc

16
libavcodec/arm/vp8dsp_armv6.S
View File

@ -359,14 +359,14 @@ endfunc
function ff_vp8_idct_dc_add4uv_armv6, export=1 function ff_vp8_idct_dc_add4uv_armv6, export=1
push {r4, lr} push {r4, lr}
bl ff_vp8_idct_dc_add_armv6 bl X(ff_vp8_idct_dc_add_armv6)
add r0, r0, #4 add r0, r0, #4
bl ff_vp8_idct_dc_add_armv6 bl X(ff_vp8_idct_dc_add_armv6)
add r0, r0, r2, lsl #2 add r0, r0, r2, lsl #2
sub r0, r0, #4 sub r0, r0, #4
bl ff_vp8_idct_dc_add_armv6 bl X(ff_vp8_idct_dc_add_armv6)
add r0, r0, #4 add r0, r0, #4
bl ff_vp8_idct_dc_add_armv6 bl X(ff_vp8_idct_dc_add_armv6)
pop {r4, pc} pop {r4, pc}
endfunc endfunc
@ -375,13 +375,13 @@ endfunc
function ff_vp8_idct_dc_add4y_armv6, export=1 function ff_vp8_idct_dc_add4y_armv6, export=1
push {r4, lr} push {r4, lr}
bl ff_vp8_idct_dc_add_armv6 bl X(ff_vp8_idct_dc_add_armv6)
add r0, r0, #4 add r0, r0, #4
bl ff_vp8_idct_dc_add_armv6 bl X(ff_vp8_idct_dc_add_armv6)
add r0, r0, #4 add r0, r0, #4
bl ff_vp8_idct_dc_add_armv6 bl X(ff_vp8_idct_dc_add_armv6)
add r0, r0, #4 add r0, r0, #4
bl ff_vp8_idct_dc_add_armv6 bl X(ff_vp8_idct_dc_add_armv6)
pop {r4, pc} pop {r4, pc}
endfunc endfunc

4
libavresample/arm/audio_convert_neon.S
View File

@ -133,8 +133,8 @@ function ff_conv_fltp_to_s16_neon, export=1
cmp r3, #2 cmp r3, #2
itt lt itt lt
ldrlt r1, [r1] ldrlt r1, [r1]
blt ff_conv_flt_to_s16_neon blt X(ff_conv_flt_to_s16_neon)
beq ff_conv_fltp_to_s16_2ch_neon beq X(ff_conv_fltp_to_s16_2ch_neon)
push {r4-r8, lr} push {r4-r8, lr}
cmp r3, #4 cmp r3, #4