RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '9c029f67ca82147ddfa83a1546ee1e109e11fbd4' 

* commit '9c029f67ca82147ddfa83a1546ee1e109e11fbd4':
  aarch64: use EXTERN_ASM consistently for exported symbols

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-20 23:13:06 +01:00
parent 1859b1de31 9c029f67ca
commit 490215cbd7
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/aarch64/h264idct_neon.S
View File

@ -106,8 +106,8 @@ function ff_h264_idct_add16_neon, export=1
mov w9, w3 // stride mov w9, w3 // stride
movrel x7, scan8 movrel x7, scan8
mov x10, #16 mov x10, #16
movrel x13, ff_h264_idct_dc_add_neon movrel x13, X(ff_h264_idct_dc_add_neon)
movrel x14, ff_h264_idct_add_neon movrel x14, X(ff_h264_idct_add_neon)
1: mov w2, w9 1: mov w2, w9
ldrb w3, [x7], #1 ldrb w3, [x7], #1
ldrsw x0, [x5], #4 ldrsw x0, [x5], #4
@ -133,8 +133,8 @@ function ff_h264_idct_add16intra_neon, export=1
mov w9, w3 // stride mov w9, w3 // stride
movrel x7, scan8 movrel x7, scan8
mov x10, #16 mov x10, #16
movrel x13, ff_h264_idct_dc_add_neon movrel x13, X(ff_h264_idct_dc_add_neon)
movrel x14, ff_h264_idct_add_neon movrel x14, X(ff_h264_idct_add_neon)
1: mov w2, w9 1: mov w2, w9
ldrb w3, [x7], #1 ldrb w3, [x7], #1
ldrsw x0, [x5], #4 ldrsw x0, [x5], #4
@ -160,8 +160,8 @@ function ff_h264_idct_add8_neon, export=1
add x5, x1, #16*4 // block_offset add x5, x1, #16*4 // block_offset
add x9, x2, #16*32 // block add x9, x2, #16*32 // block
mov w19, w3 // stride mov w19, w3 // stride
movrel x13, ff_h264_idct_dc_add_neon movrel x13, X(ff_h264_idct_dc_add_neon)
movrel x14, ff_h264_idct_add_neon movrel x14, X(ff_h264_idct_add_neon)
movrel x7, scan8+16 movrel x7, scan8+16
mov x10, #0 mov x10, #0
mov x11, #16 mov x11, #16
@ -374,8 +374,8 @@ function ff_h264_idct8_add4_neon, export=1
mov w2, w3 mov w2, w3
movrel x7, scan8 movrel x7, scan8
mov w10, #16 mov w10, #16
movrel x13, ff_h264_idct8_dc_add_neon movrel x13, X(ff_h264_idct8_dc_add_neon)
movrel x14, ff_h264_idct8_add_neon movrel x14, X(ff_h264_idct8_add_neon)
1: ldrb w9, [x7], #4 1: ldrb w9, [x7], #4
ldrsw x0, [x5], #16 ldrsw x0, [x5], #16
ldrb w9, [x4, w9, UXTW] ldrb w9, [x4, w9, UXTW]

9
libavutil/aarch64/asm.S
View File

@ -36,11 +36,14 @@ ELF .size \name, . - \name
.align \align .align \align
.if \export .if \export
.global EXTERN_ASM\name .global EXTERN_ASM\name
ELF .type EXTERN_ASM\name, %function
.func EXTERN_ASM\name
EXTERN_ASM\name: EXTERN_ASM\name:
.endif .else
ELF .type \name, %function ELF .type \name, %function
.func \name .func \name
\name: \name:
.endif
.endm .endm
.macro const name, align=2 .macro const name, align=2
@ -61,3 +64,7 @@ ELF .size \name, . - \name
ldr \rd, =\val ldr \rd, =\val
#endif #endif
.endm .endm
#define GLUE(a, b) a ## b
#define JOIN(a, b) GLUE(a, b)
#define X(s) JOIN(EXTERN_ASM, s)