From 1d2420981aa004f051a0869c005776084f7d2a44 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Tue, 17 Jan 2017 17:04:19 +0100 Subject: [PATCH] arm/aarch64: Correctly prefix integral function symbols --- common/aarch64/mc-a.S | 8 ++++---- common/aarch64/mc-c.c | 16 ++++++++-------- common/arm/mc-a.S | 8 ++++---- common/arm/mc-c.c | 16 ++++++++-------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/common/aarch64/mc-a.S b/common/aarch64/mc-a.S index a9f0bc99..1d4c8fda 100644 --- a/common/aarch64/mc-a.S +++ b/common/aarch64/mc-a.S @@ -1431,7 +1431,7 @@ endfunc add v0.8h, v0.8h, v5.8h .endm -function integral_init4h_neon, export=1 +function x264_integral_init4h_neon, export=1 sub x3, x0, x2, lsl #1 ld1 {v6.8b,v7.8b}, [x1], #16 1: @@ -1466,7 +1466,7 @@ endfunc add v0.8h, v0.8h, \s\().8h .endm -function integral_init8h_neon, export=1 +function x264_integral_init8h_neon, export=1 sub x3, x0, x2, lsl #1 ld1 {v16.8b,v17.8b}, [x1], #16 1: @@ -1483,7 +1483,7 @@ function integral_init8h_neon, export=1 ret endfunc -function integral_init4v_neon, export=1 +function x264_integral_init4v_neon, export=1 mov x3, x0 add x4, x0, x2, lsl #3 add x8, x0, x2, lsl #4 @@ -1518,7 +1518,7 @@ function integral_init4v_neon, export=1 ret endfunc -function integral_init8v_neon, export=1 +function x264_integral_init8v_neon, export=1 add x2, x0, x1, lsl #4 sub x1, x1, #8 ands x3, x1, #16 - 1 diff --git a/common/aarch64/mc-c.c b/common/aarch64/mc-c.c index 85de15c3..f94aa5e5 100644 --- a/common/aarch64/mc-c.c +++ b/common/aarch64/mc-c.c @@ -94,10 +94,10 @@ void x264_mc_copy_w8_neon ( uint8_t *, intptr_t, uint8_t *, intptr_t, int ); void x264_mc_copy_w16_neon( uint8_t *, intptr_t, uint8_t *, intptr_t, int ); void x264_mc_chroma_neon( uint8_t *, uint8_t *, intptr_t, uint8_t *, intptr_t, int, int, int, int ); -void integral_init4h_neon( uint16_t *, uint8_t *, intptr_t ); -void integral_init4v_neon( uint16_t *, uint16_t *, intptr_t ); -void integral_init8h_neon( uint16_t *, uint8_t *, intptr_t ); -void integral_init8v_neon( uint16_t *, intptr_t ); +void x264_integral_init4h_neon( uint16_t *, uint8_t *, intptr_t ); +void x264_integral_init4v_neon( uint16_t *, uint16_t *, intptr_t ); +void x264_integral_init8h_neon( uint16_t *, uint8_t *, intptr_t ); +void x264_integral_init8v_neon( uint16_t *, intptr_t ); void x264_frame_init_lowres_core_neon( uint8_t *, uint8_t *, uint8_t *, uint8_t *, uint8_t *, intptr_t, intptr_t, int, int ); void x264_mbtree_propagate_cost_neon( int16_t *, uint16_t *, uint16_t *, uint16_t *, uint16_t *, float *, int ); @@ -265,10 +265,10 @@ void x264_mc_init_aarch64( int cpu, x264_mc_functions_t *pf ) pf->hpel_filter = x264_hpel_filter_neon; pf->frame_init_lowres_core = x264_frame_init_lowres_core_neon; - pf->integral_init4h = integral_init4h_neon; - pf->integral_init8h = integral_init8h_neon; - pf->integral_init4v = integral_init4v_neon; - pf->integral_init8v = integral_init8v_neon; + pf->integral_init4h = x264_integral_init4h_neon; + pf->integral_init8h = x264_integral_init8h_neon; + pf->integral_init4v = x264_integral_init4v_neon; + pf->integral_init8v = x264_integral_init8v_neon; pf->mbtree_propagate_cost = x264_mbtree_propagate_cost_neon; pf->mbtree_propagate_list = x264_mbtree_propagate_list_neon; diff --git a/common/arm/mc-a.S b/common/arm/mc-a.S index f5d7163d..e8d3d030 100644 --- a/common/arm/mc-a.S +++ b/common/arm/mc-a.S @@ -1652,7 +1652,7 @@ endfunc vadd.u16 q0, q0, q2 .endm -function integral_init4h_neon +function x264_integral_init4h_neon sub r3, r0, r2, lsl #1 vld1.8 {d6, d7}, [r1, :128]! 1: @@ -1687,7 +1687,7 @@ endfunc vadd.u16 q0, q0, \s .endm -function integral_init8h_neon +function x264_integral_init8h_neon sub r3, r0, r2, lsl #1 vld1.8 {d16, d17}, [r1, :128]! 1: @@ -1704,7 +1704,7 @@ function integral_init8h_neon bx lr endfunc -function integral_init4v_neon +function x264_integral_init4v_neon push {r4-r5} mov r3, r0 add r4, r0, r2, lsl #3 @@ -1743,7 +1743,7 @@ function integral_init4v_neon bx lr endfunc -function integral_init8v_neon +function x264_integral_init8v_neon add r2, r0, r1, lsl #4 sub r1, r1, #8 ands r3, r1, #16 - 1 diff --git a/common/arm/mc-c.c b/common/arm/mc-c.c index 8e59cb1a..ab472291 100644 --- a/common/arm/mc-c.c +++ b/common/arm/mc-c.c @@ -102,10 +102,10 @@ void x264_hpel_filter_v_neon( uint8_t *, uint8_t *, int16_t *, intptr_t, int ); void x264_hpel_filter_c_neon( uint8_t *, int16_t *, int ); void x264_hpel_filter_h_neon( uint8_t *, uint8_t *, int ); -void integral_init4h_neon( uint16_t *, uint8_t *, intptr_t ); -void integral_init4v_neon( uint16_t *, uint16_t *, intptr_t ); -void integral_init8h_neon( uint16_t *, uint8_t *, intptr_t ); -void integral_init8v_neon( uint16_t *, intptr_t ); +void x264_integral_init4h_neon( uint16_t *, uint8_t *, intptr_t ); +void x264_integral_init4v_neon( uint16_t *, uint16_t *, intptr_t ); +void x264_integral_init8h_neon( uint16_t *, uint8_t *, intptr_t ); +void x264_integral_init8v_neon( uint16_t *, intptr_t ); void x264_mbtree_propagate_cost_neon( int16_t *, uint16_t *, uint16_t *, uint16_t *, uint16_t *, float *, int ); @@ -291,10 +291,10 @@ void x264_mc_init_arm( int cpu, x264_mc_functions_t *pf ) pf->hpel_filter = hpel_filter_neon; pf->frame_init_lowres_core = x264_frame_init_lowres_core_neon; - pf->integral_init4h = integral_init4h_neon; - pf->integral_init8h = integral_init8h_neon; - pf->integral_init4v = integral_init4v_neon; - pf->integral_init8v = integral_init8v_neon; + pf->integral_init4h = x264_integral_init4h_neon; + pf->integral_init8h = x264_integral_init8h_neon; + pf->integral_init4v = x264_integral_init4v_neon; + pf->integral_init8v = x264_integral_init8v_neon; pf->mbtree_propagate_cost = x264_mbtree_propagate_cost_neon; pf->mbtree_propagate_list = x264_mbtree_propagate_list_neon; -- 2.40.0