RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-18 12:56:56 +00:00
Code Issues Projects Releases Wiki Activity

aarch64: Use .data.rel.ro for const data with relocations

Browse Source 
This reverts commit c00365b46d
in addition to using a different section.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2014-11-16 12:52:21 +02:00
parent f963f80399
commit 780cd20b00
3 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libavcodec/aarch64/fft_neon.S
View File

@ -376,8 +376,7 @@ function ff_fft_calc_neon, export=1
ld1 {v30.16b}, [x10] ld1 {v30.16b}, [x10]
mov x7, #-8 mov x7, #-8
movrel x12, pmmp movrel x12, pmmp
ldr x4, [x3, x2, lsl #3] ldr x3, [x3, x2, lsl #3]
add x3, x3, x4
movrel x13, mppm movrel x13, mppm
movrel x14, X(ff_cos_16) movrel x14, X(ff_cos_16)
ld1 {v31.16b}, [x11] ld1 {v31.16b}, [x11]
@ -416,22 +415,22 @@ function ff_fft_permute_neon, export=1
ret ret
endfunc endfunc
const fft_tab_neon const fft_tab_neon, relocate=1
.quad fft4_neon - fft_tab_neon .quad fft4_neon
.quad fft8_neon - fft_tab_neon .quad fft8_neon
.quad fft16_neon - fft_tab_neon .quad fft16_neon
.quad fft32_neon - fft_tab_neon .quad fft32_neon
.quad fft64_neon - fft_tab_neon .quad fft64_neon
.quad fft128_neon - fft_tab_neon .quad fft128_neon
.quad fft256_neon - fft_tab_neon .quad fft256_neon
.quad fft512_neon - fft_tab_neon .quad fft512_neon
.quad fft1024_neon - fft_tab_neon .quad fft1024_neon
.quad fft2048_neon - fft_tab_neon .quad fft2048_neon
.quad fft4096_neon - fft_tab_neon .quad fft4096_neon
.quad fft8192_neon - fft_tab_neon .quad fft8192_neon
.quad fft16384_neon - fft_tab_neon .quad fft16384_neon
.quad fft32768_neon - fft_tab_neon .quad fft32768_neon
.quad fft65536_neon - fft_tab_neon .quad fft65536_neon
endconst endconst
const pmmp, align=4 const pmmp, align=4

20
libavcodec/aarch64/opus_imdct_neon.S
View File

@ -438,8 +438,8 @@ function fft_b15_calc_neon
uzp1 v12.4s, v4.4s, v5.4s // exp[11 - 14].re uzp1 v12.4s, v4.4s, v5.4s // exp[11 - 14].re
uzp2 v13.4s, v4.4s, v5.4s // exp[11 - 14].im uzp2 v13.4s, v4.4s, v5.4s // exp[11 - 14].im
zip1 v14.4s, v6.4s, v7.4s // exp[5,10].re/exp[5,10].im zip1 v14.4s, v6.4s, v7.4s // exp[5,10].re/exp[5,10].im
ldr x6, [x5, x3, lsl #3] add x5, x5, x3, lsl #3
add x5, x5, x6 ldr x5, [x5]
mov x10, x0 mov x10, x0
blr x5 blr x5
ldp x20, x30, [sp] ldp x20, x30, [sp]
@ -451,14 +451,14 @@ function fft_b15_calc_neon
ret ret
endfunc endfunc
const fft_tab_neon const fft_tab_neon, relocate=1
.quad fft15_neon - fft_tab_neon .quad fft15_neon
.quad fft30_neon - fft_tab_neon .quad fft30_neon
.quad fft60_neon - fft_tab_neon .quad fft60_neon
.quad fft120_neon - fft_tab_neon .quad fft120_neon
.quad fft240_neon - fft_tab_neon .quad fft240_neon
.quad fft480_neon - fft_tab_neon .quad fft480_neon
.quad fft960_neon - fft_tab_neon .quad fft960_neon
endconst endconst
function ff_celt_imdct_half_neon, export=1 function ff_celt_imdct_half_neon, export=1

10
libavutil/aarch64/asm.S
View File

@ -52,12 +52,18 @@ FUNC .func \name
.endif .endif
.endm .endm
.macro const name, align=2 .macro const name, align=2, relocate=0
.macro endconst .macro endconst
ELF .size \name, . - \name ELF .size \name, . - \name
.purgem endconst .purgem endconst
.endm .endm
#ifndef __MACH__ #if HAVE_SECTION_DATA_REL_RO
.if \relocate
.section .data.rel.ro
.else
.section .rodata
.endif
#elif !defined(__MACH__)
.section .rodata .section .rodata
#else #else
.const_data .const_data