From 0f7e4665ae6f3850c681b29e6318ed4e556d70fb Mon Sep 17 00:00:00 2001 From: Alpha Lam Date: Wed, 23 May 2012 15:52:34 -0700 Subject: [PATCH] Make libvpx Chromium build friendly Add PRIVATE macro for adding private_extern directive for yasm to hide global symbols. This is only enabled if -DCHROMIUM is used with YASM. Also fixed a small problem with rtcd_defs.sh to guard TEMPORAL_DENOISING. Change-Id: I9027fce3ebddcf20078293e4b86b396f21da7857 --- vp8/common/rtcd_defs.sh | 6 +++-- vp8/common/x86/dequantize_mmx.asm | 4 +-- vp8/common/x86/idctllm_mmx.asm | 4 +-- vp8/common/x86/idctllm_sse2.asm | 8 +++--- vp8/common/x86/iwalsh_mmx.asm | 2 +- vp8/common/x86/iwalsh_sse2.asm | 2 +- vp8/common/x86/loopfilter_block_sse2.asm | 4 +-- vp8/common/x86/loopfilter_mmx.asm | 12 ++++----- vp8/common/x86/loopfilter_sse2.asm | 20 +++++++------- vp8/common/x86/mfqe_sse2.asm | 6 ++--- vp8/common/x86/postproc_mmx.asm | 6 ++--- vp8/common/x86/postproc_sse2.asm | 8 +++--- vp8/common/x86/recon_mmx.asm | 6 ++--- vp8/common/x86/recon_sse2.asm | 30 ++++++++++----------- vp8/common/x86/sad_mmx.asm | 10 +++---- vp8/common/x86/sad_sse2.asm | 12 ++++----- vp8/common/x86/sad_sse3.asm | 24 ++++++++--------- vp8/common/x86/sad_sse4.asm | 10 +++---- vp8/common/x86/sad_ssse3.asm | 4 +-- vp8/common/x86/subpixel_mmx.asm | 10 +++---- vp8/common/x86/subpixel_sse2.asm | 20 +++++++------- vp8/common/x86/subpixel_ssse3.asm | 16 ++++++------ vp8/common/x86/variance_impl_mmx.asm | 12 ++++----- vp8/common/x86/variance_impl_sse2.asm | 20 +++++++------- vp8/common/x86/variance_impl_ssse3.asm | 2 +- vp8/encoder/x86/dct_mmx.asm | 2 +- vp8/encoder/x86/dct_sse2.asm | 4 +-- vp8/encoder/x86/encodeopt.asm | 12 ++++----- vp8/encoder/x86/fwalsh_sse2.asm | 2 +- vp8/encoder/x86/quantize_mmx.asm | 2 +- vp8/encoder/x86/quantize_sse2.asm | 4 +-- vp8/encoder/x86/quantize_sse4.asm | 2 +- vp8/encoder/x86/quantize_ssse3.asm | 2 +- vp8/encoder/x86/ssim_opt.asm | 4 +-- vp8/encoder/x86/subtract_mmx.asm | 6 ++--- vp8/encoder/x86/subtract_sse2.asm | 6 ++--- vp8/encoder/x86/temporal_filter_apply_sse2.asm | 2 +- vpx_ports/emms.asm | 6 ++--- vpx_ports/x86_abi_support.asm | 36 +++++++++++++++++++++++++- 39 files changed, 192 insertions(+), 156 deletions(-) diff --git a/vp8/common/rtcd_defs.sh b/vp8/common/rtcd_defs.sh index 76f8d5a..e315fcd 100644 --- a/vp8/common/rtcd_defs.sh +++ b/vp8/common/rtcd_defs.sh @@ -504,8 +504,10 @@ specialize vp8_yv12_copy_partial_frame neon # # Denoiser filter # -prototype void vp8_denoiser_filter "struct yv12_buffer_config* mc_running_avg, struct yv12_buffer_config* running_avg, struct macroblock* signal, unsigned int motion_magnitude2, int y_offset, int uv_offset" -specialize vp8_denoiser_filter sse2 +if [ "$CONFIG_TEMPORAL_DENOISING" = "yes" ]; then + prototype void vp8_denoiser_filter "struct yv12_buffer_config* mc_running_avg, struct yv12_buffer_config* running_avg, struct macroblock* signal, unsigned int motion_magnitude2, int y_offset, int uv_offset" + specialize vp8_denoiser_filter sse2 +fi # End of encoder only functions fi diff --git a/vp8/common/x86/dequantize_mmx.asm b/vp8/common/x86/dequantize_mmx.asm index de9eba8..4e551f0 100644 --- a/vp8/common/x86/dequantize_mmx.asm +++ b/vp8/common/x86/dequantize_mmx.asm @@ -13,7 +13,7 @@ ;void vp8_dequantize_b_impl_mmx(short *sq, short *dq, short *q) -global sym(vp8_dequantize_b_impl_mmx) +global sym(vp8_dequantize_b_impl_mmx) PRIVATE sym(vp8_dequantize_b_impl_mmx): push rbp mov rbp, rsp @@ -55,7 +55,7 @@ sym(vp8_dequantize_b_impl_mmx): ;short *dq, 1 ;unsigned char *dest, 2 ;int stride) 3 -global sym(vp8_dequant_idct_add_mmx) +global sym(vp8_dequant_idct_add_mmx) PRIVATE sym(vp8_dequant_idct_add_mmx): push rbp mov rbp, rsp diff --git a/vp8/common/x86/idctllm_mmx.asm b/vp8/common/x86/idctllm_mmx.asm index 0c9c205..96fa2c6 100644 --- a/vp8/common/x86/idctllm_mmx.asm +++ b/vp8/common/x86/idctllm_mmx.asm @@ -34,7 +34,7 @@ ;void vp8_short_idct4x4llm_mmx(short *input, unsigned char *pred, ;int pitch, unsigned char *dest,int stride) -global sym(vp8_short_idct4x4llm_mmx) +global sym(vp8_short_idct4x4llm_mmx) PRIVATE sym(vp8_short_idct4x4llm_mmx): push rbp mov rbp, rsp @@ -224,7 +224,7 @@ sym(vp8_short_idct4x4llm_mmx): ;int pred_stride, ;unsigned char *dst_ptr, ;int stride) -global sym(vp8_dc_only_idct_add_mmx) +global sym(vp8_dc_only_idct_add_mmx) PRIVATE sym(vp8_dc_only_idct_add_mmx): push rbp mov rbp, rsp diff --git a/vp8/common/x86/idctllm_sse2.asm b/vp8/common/x86/idctllm_sse2.asm index abeb0b6..bf8e2c4 100644 --- a/vp8/common/x86/idctllm_sse2.asm +++ b/vp8/common/x86/idctllm_sse2.asm @@ -19,7 +19,7 @@ ; int dst_stride - 3 ; ) -global sym(vp8_idct_dequant_0_2x_sse2) +global sym(vp8_idct_dequant_0_2x_sse2) PRIVATE sym(vp8_idct_dequant_0_2x_sse2): push rbp mov rbp, rsp @@ -101,7 +101,7 @@ sym(vp8_idct_dequant_0_2x_sse2): ; unsigned char *dst - 2 ; int dst_stride - 3 ; ) -global sym(vp8_idct_dequant_full_2x_sse2) +global sym(vp8_idct_dequant_full_2x_sse2) PRIVATE sym(vp8_idct_dequant_full_2x_sse2): push rbp mov rbp, rsp @@ -358,7 +358,7 @@ sym(vp8_idct_dequant_full_2x_sse2): ; int dst_stride - 3 ; short *dc - 4 ; ) -global sym(vp8_idct_dequant_dc_0_2x_sse2) +global sym(vp8_idct_dequant_dc_0_2x_sse2) PRIVATE sym(vp8_idct_dequant_dc_0_2x_sse2): push rbp mov rbp, rsp @@ -434,7 +434,7 @@ sym(vp8_idct_dequant_dc_0_2x_sse2): ; int dst_stride - 3 ; short *dc - 4 ; ) -global sym(vp8_idct_dequant_dc_full_2x_sse2) +global sym(vp8_idct_dequant_dc_full_2x_sse2) PRIVATE sym(vp8_idct_dequant_dc_full_2x_sse2): push rbp mov rbp, rsp diff --git a/vp8/common/x86/iwalsh_mmx.asm b/vp8/common/x86/iwalsh_mmx.asm index 6582687..4aac094 100644 --- a/vp8/common/x86/iwalsh_mmx.asm +++ b/vp8/common/x86/iwalsh_mmx.asm @@ -12,7 +12,7 @@ %include "vpx_ports/x86_abi_support.asm" ;void vp8_short_inv_walsh4x4_mmx(short *input, short *output) -global sym(vp8_short_inv_walsh4x4_mmx) +global sym(vp8_short_inv_walsh4x4_mmx) PRIVATE sym(vp8_short_inv_walsh4x4_mmx): push rbp mov rbp, rsp diff --git a/vp8/common/x86/iwalsh_sse2.asm b/vp8/common/x86/iwalsh_sse2.asm index 51cb5e2..06e86a8 100644 --- a/vp8/common/x86/iwalsh_sse2.asm +++ b/vp8/common/x86/iwalsh_sse2.asm @@ -12,7 +12,7 @@ %include "vpx_ports/x86_abi_support.asm" ;void vp8_short_inv_walsh4x4_sse2(short *input, short *output) -global sym(vp8_short_inv_walsh4x4_sse2) +global sym(vp8_short_inv_walsh4x4_sse2) PRIVATE sym(vp8_short_inv_walsh4x4_sse2): push rbp mov rbp, rsp diff --git a/vp8/common/x86/loopfilter_block_sse2.asm b/vp8/common/x86/loopfilter_block_sse2.asm index 4918eb5..1c445ef 100644 --- a/vp8/common/x86/loopfilter_block_sse2.asm +++ b/vp8/common/x86/loopfilter_block_sse2.asm @@ -133,7 +133,7 @@ ; const char *limit, ; const char *thresh ;) -global sym(vp8_loop_filter_bh_y_sse2) +global sym(vp8_loop_filter_bh_y_sse2) PRIVATE sym(vp8_loop_filter_bh_y_sse2): %ifidn __OUTPUT_FORMAT__,x64 @@ -273,7 +273,7 @@ LF_FILTER xmm0, xmm1, xmm3, xmm8, xmm4, xmm2 ; const char *thresh ;) -global sym(vp8_loop_filter_bv_y_sse2) +global sym(vp8_loop_filter_bv_y_sse2) PRIVATE sym(vp8_loop_filter_bv_y_sse2): %ifidn __OUTPUT_FORMAT__,x64 diff --git a/vp8/common/x86/loopfilter_mmx.asm b/vp8/common/x86/loopfilter_mmx.asm index 697a5de..f388d24 100644 --- a/vp8/common/x86/loopfilter_mmx.asm +++ b/vp8/common/x86/loopfilter_mmx.asm @@ -21,7 +21,7 @@ ; const char *thresh, ; int count ;) -global sym(vp8_loop_filter_horizontal_edge_mmx) +global sym(vp8_loop_filter_horizontal_edge_mmx) PRIVATE sym(vp8_loop_filter_horizontal_edge_mmx): push rbp mov rbp, rsp @@ -233,7 +233,7 @@ sym(vp8_loop_filter_horizontal_edge_mmx): ; const char *thresh, ; int count ;) -global sym(vp8_loop_filter_vertical_edge_mmx) +global sym(vp8_loop_filter_vertical_edge_mmx) PRIVATE sym(vp8_loop_filter_vertical_edge_mmx): push rbp mov rbp, rsp @@ -603,7 +603,7 @@ sym(vp8_loop_filter_vertical_edge_mmx): ; const char *thresh, ; int count ;) -global sym(vp8_mbloop_filter_horizontal_edge_mmx) +global sym(vp8_mbloop_filter_horizontal_edge_mmx) PRIVATE sym(vp8_mbloop_filter_horizontal_edge_mmx): push rbp mov rbp, rsp @@ -920,7 +920,7 @@ sym(vp8_mbloop_filter_horizontal_edge_mmx): ; const char *thresh, ; int count ;) -global sym(vp8_mbloop_filter_vertical_edge_mmx) +global sym(vp8_mbloop_filter_vertical_edge_mmx) PRIVATE sym(vp8_mbloop_filter_vertical_edge_mmx): push rbp mov rbp, rsp @@ -1384,7 +1384,7 @@ sym(vp8_mbloop_filter_vertical_edge_mmx): ; int src_pixel_step, ; const char *blimit ;) -global sym(vp8_loop_filter_simple_horizontal_edge_mmx) +global sym(vp8_loop_filter_simple_horizontal_edge_mmx) PRIVATE sym(vp8_loop_filter_simple_horizontal_edge_mmx): push rbp mov rbp, rsp @@ -1500,7 +1500,7 @@ sym(vp8_loop_filter_simple_horizontal_edge_mmx): ; int src_pixel_step, ; const char *blimit ;) -global sym(vp8_loop_filter_simple_vertical_edge_mmx) +global sym(vp8_loop_filter_simple_vertical_edge_mmx) PRIVATE sym(vp8_loop_filter_simple_vertical_edge_mmx): push rbp mov rbp, rsp diff --git a/vp8/common/x86/loopfilter_sse2.asm b/vp8/common/x86/loopfilter_sse2.asm index 9944c33..a66753b 100644 --- a/vp8/common/x86/loopfilter_sse2.asm +++ b/vp8/common/x86/loopfilter_sse2.asm @@ -286,7 +286,7 @@ ; const char *limit, ; const char *thresh, ;) -global sym(vp8_loop_filter_horizontal_edge_sse2) +global sym(vp8_loop_filter_horizontal_edge_sse2) PRIVATE sym(vp8_loop_filter_horizontal_edge_sse2): push rbp mov rbp, rsp @@ -334,7 +334,7 @@ sym(vp8_loop_filter_horizontal_edge_sse2): ; const char *thresh, ; int count ;) -global sym(vp8_loop_filter_horizontal_edge_uv_sse2) +global sym(vp8_loop_filter_horizontal_edge_uv_sse2) PRIVATE sym(vp8_loop_filter_horizontal_edge_uv_sse2): push rbp mov rbp, rsp @@ -561,7 +561,7 @@ sym(vp8_loop_filter_horizontal_edge_uv_sse2): ; const char *limit, ; const char *thresh, ;) -global sym(vp8_mbloop_filter_horizontal_edge_sse2) +global sym(vp8_mbloop_filter_horizontal_edge_sse2) PRIVATE sym(vp8_mbloop_filter_horizontal_edge_sse2): push rbp mov rbp, rsp @@ -607,7 +607,7 @@ sym(vp8_mbloop_filter_horizontal_edge_sse2): ; const char *thresh, ; unsigned char *v ;) -global sym(vp8_mbloop_filter_horizontal_edge_uv_sse2) +global sym(vp8_mbloop_filter_horizontal_edge_uv_sse2) PRIVATE sym(vp8_mbloop_filter_horizontal_edge_uv_sse2): push rbp mov rbp, rsp @@ -928,7 +928,7 @@ sym(vp8_mbloop_filter_horizontal_edge_uv_sse2): ; const char *limit, ; const char *thresh, ;) -global sym(vp8_loop_filter_vertical_edge_sse2) +global sym(vp8_loop_filter_vertical_edge_sse2) PRIVATE sym(vp8_loop_filter_vertical_edge_sse2): push rbp mov rbp, rsp @@ -993,7 +993,7 @@ sym(vp8_loop_filter_vertical_edge_sse2): ; const char *thresh, ; unsigned char *v ;) -global sym(vp8_loop_filter_vertical_edge_uv_sse2) +global sym(vp8_loop_filter_vertical_edge_uv_sse2) PRIVATE sym(vp8_loop_filter_vertical_edge_uv_sse2): push rbp mov rbp, rsp @@ -1142,7 +1142,7 @@ sym(vp8_loop_filter_vertical_edge_uv_sse2): ; const char *limit, ; const char *thresh, ;) -global sym(vp8_mbloop_filter_vertical_edge_sse2) +global sym(vp8_mbloop_filter_vertical_edge_sse2) PRIVATE sym(vp8_mbloop_filter_vertical_edge_sse2): push rbp mov rbp, rsp @@ -1209,7 +1209,7 @@ sym(vp8_mbloop_filter_vertical_edge_sse2): ; const char *thresh, ; unsigned char *v ;) -global sym(vp8_mbloop_filter_vertical_edge_uv_sse2) +global sym(vp8_mbloop_filter_vertical_edge_uv_sse2) PRIVATE sym(vp8_mbloop_filter_vertical_edge_uv_sse2): push rbp mov rbp, rsp @@ -1269,7 +1269,7 @@ sym(vp8_mbloop_filter_vertical_edge_uv_sse2): ; int src_pixel_step, ; const char *blimit, ;) -global sym(vp8_loop_filter_simple_horizontal_edge_sse2) +global sym(vp8_loop_filter_simple_horizontal_edge_sse2) PRIVATE sym(vp8_loop_filter_simple_horizontal_edge_sse2): push rbp mov rbp, rsp @@ -1374,7 +1374,7 @@ sym(vp8_loop_filter_simple_horizontal_edge_sse2): ; int src_pixel_step, ; const char *blimit, ;) -global sym(vp8_loop_filter_simple_vertical_edge_sse2) +global sym(vp8_loop_filter_simple_vertical_edge_sse2) PRIVATE sym(vp8_loop_filter_simple_vertical_edge_sse2): push rbp ; save old base pointer value. mov rbp, rsp ; set new base pointer value. diff --git a/vp8/common/x86/mfqe_sse2.asm b/vp8/common/x86/mfqe_sse2.asm index 10d21f3..c1d2174 100644 --- a/vp8/common/x86/mfqe_sse2.asm +++ b/vp8/common/x86/mfqe_sse2.asm @@ -19,7 +19,7 @@ ; int dst_stride, ; int src_weight ;) -global sym(vp8_filter_by_weight16x16_sse2) +global sym(vp8_filter_by_weight16x16_sse2) PRIVATE sym(vp8_filter_by_weight16x16_sse2): push rbp mov rbp, rsp @@ -97,7 +97,7 @@ sym(vp8_filter_by_weight16x16_sse2): ; int dst_stride, ; int src_weight ;) -global sym(vp8_filter_by_weight8x8_sse2) +global sym(vp8_filter_by_weight8x8_sse2) PRIVATE sym(vp8_filter_by_weight8x8_sse2): push rbp mov rbp, rsp @@ -165,7 +165,7 @@ sym(vp8_filter_by_weight8x8_sse2): ; unsigned int *variance, 4 ; unsigned int *sad, 5 ;) -global sym(vp8_variance_and_sad_16x16_sse2) +global sym(vp8_variance_and_sad_16x16_sse2) PRIVATE sym(vp8_variance_and_sad_16x16_sse2): push rbp mov rbp, rsp diff --git a/vp8/common/x86/postproc_mmx.asm b/vp8/common/x86/postproc_mmx.asm index d24f740..534f296 100644 --- a/vp8/common/x86/postproc_mmx.asm +++ b/vp8/common/x86/postproc_mmx.asm @@ -24,7 +24,7 @@ ; int cols, ; int flimit ;) -global sym(vp8_post_proc_down_and_across_mmx) +global sym(vp8_post_proc_down_and_across_mmx) PRIVATE sym(vp8_post_proc_down_and_across_mmx): push rbp mov rbp, rsp @@ -282,7 +282,7 @@ sym(vp8_post_proc_down_and_across_mmx): ;void vp8_mbpost_proc_down_mmx(unsigned char *dst, ; int pitch, int rows, int cols,int flimit) extern sym(vp8_rv) -global sym(vp8_mbpost_proc_down_mmx) +global sym(vp8_mbpost_proc_down_mmx) PRIVATE sym(vp8_mbpost_proc_down_mmx): push rbp mov rbp, rsp @@ -510,7 +510,7 @@ sym(vp8_mbpost_proc_down_mmx): ; unsigned char bothclamp[16], ; unsigned int Width, unsigned int Height, int Pitch) extern sym(rand) -global sym(vp8_plane_add_noise_mmx) +global sym(vp8_plane_add_noise_mmx) PRIVATE sym(vp8_plane_add_noise_mmx): push rbp mov rbp, rsp diff --git a/vp8/common/x86/postproc_sse2.asm b/vp8/common/x86/postproc_sse2.asm index 966aafd..bf36b0d 100644 --- a/vp8/common/x86/postproc_sse2.asm +++ b/vp8/common/x86/postproc_sse2.asm @@ -21,7 +21,7 @@ ; int cols, ; int flimit ;) -global sym(vp8_post_proc_down_and_across_xmm) +global sym(vp8_post_proc_down_and_across_xmm) PRIVATE sym(vp8_post_proc_down_and_across_xmm): push rbp mov rbp, rsp @@ -269,7 +269,7 @@ sym(vp8_post_proc_down_and_across_xmm): ;void vp8_mbpost_proc_down_xmm(unsigned char *dst, ; int pitch, int rows, int cols,int flimit) extern sym(vp8_rv) -global sym(vp8_mbpost_proc_down_xmm) +global sym(vp8_mbpost_proc_down_xmm) PRIVATE sym(vp8_mbpost_proc_down_xmm): push rbp mov rbp, rsp @@ -497,7 +497,7 @@ sym(vp8_mbpost_proc_down_xmm): ;void vp8_mbpost_proc_across_ip_xmm(unsigned char *src, ; int pitch, int rows, int cols,int flimit) -global sym(vp8_mbpost_proc_across_ip_xmm) +global sym(vp8_mbpost_proc_across_ip_xmm) PRIVATE sym(vp8_mbpost_proc_across_ip_xmm): push rbp mov rbp, rsp @@ -694,7 +694,7 @@ sym(vp8_mbpost_proc_across_ip_xmm): ; unsigned char bothclamp[16], ; unsigned int Width, unsigned int Height, int Pitch) extern sym(rand) -global sym(vp8_plane_add_noise_wmt) +global sym(vp8_plane_add_noise_wmt) PRIVATE sym(vp8_plane_add_noise_wmt): push rbp mov rbp, rsp diff --git a/vp8/common/x86/recon_mmx.asm b/vp8/common/x86/recon_mmx.asm index 19c0faf..15e9871 100644 --- a/vp8/common/x86/recon_mmx.asm +++ b/vp8/common/x86/recon_mmx.asm @@ -18,7 +18,7 @@ ; unsigned char *dst, ; int dst_stride ; ) -global sym(vp8_copy_mem8x8_mmx) +global sym(vp8_copy_mem8x8_mmx) PRIVATE sym(vp8_copy_mem8x8_mmx): push rbp mov rbp, rsp @@ -81,7 +81,7 @@ sym(vp8_copy_mem8x8_mmx): ; unsigned char *dst, ; int dst_stride ; ) -global sym(vp8_copy_mem8x4_mmx) +global sym(vp8_copy_mem8x4_mmx) PRIVATE sym(vp8_copy_mem8x4_mmx): push rbp mov rbp, rsp @@ -125,7 +125,7 @@ sym(vp8_copy_mem8x4_mmx): ; unsigned char *dst, ; int dst_stride ; ) -global sym(vp8_copy_mem16x16_mmx) +global sym(vp8_copy_mem16x16_mmx) PRIVATE sym(vp8_copy_mem16x16_mmx): push rbp mov rbp, rsp diff --git a/vp8/common/x86/recon_sse2.asm b/vp8/common/x86/recon_sse2.asm index 7b6e3cf..fe77450 100644 --- a/vp8/common/x86/recon_sse2.asm +++ b/vp8/common/x86/recon_sse2.asm @@ -17,7 +17,7 @@ ; unsigned char *dst, ; int dst_stride ; ) -global sym(vp8_copy_mem16x16_sse2) +global sym(vp8_copy_mem16x16_sse2) PRIVATE sym(vp8_copy_mem16x16_sse2): push rbp mov rbp, rsp @@ -123,7 +123,7 @@ sym(vp8_copy_mem16x16_sse2): ; unsigned char *left, ; int left_stride, ; ) -global sym(vp8_intra_pred_uv_dc_mmx2) +global sym(vp8_intra_pred_uv_dc_mmx2) PRIVATE sym(vp8_intra_pred_uv_dc_mmx2): push rbp mov rbp, rsp @@ -196,7 +196,7 @@ sym(vp8_intra_pred_uv_dc_mmx2): ; unsigned char *left, ; int left_stride, ; ) -global sym(vp8_intra_pred_uv_dctop_mmx2) +global sym(vp8_intra_pred_uv_dctop_mmx2) PRIVATE sym(vp8_intra_pred_uv_dctop_mmx2): push rbp mov rbp, rsp @@ -250,7 +250,7 @@ sym(vp8_intra_pred_uv_dctop_mmx2): ; unsigned char *left, ; int left_stride, ; ) -global sym(vp8_intra_pred_uv_dcleft_mmx2) +global sym(vp8_intra_pred_uv_dcleft_mmx2) PRIVATE sym(vp8_intra_pred_uv_dcleft_mmx2): push rbp mov rbp, rsp @@ -317,7 +317,7 @@ sym(vp8_intra_pred_uv_dcleft_mmx2): ; unsigned char *left, ; int left_stride, ; ) -global sym(vp8_intra_pred_uv_dc128_mmx) +global sym(vp8_intra_pred_uv_dc128_mmx) PRIVATE sym(vp8_intra_pred_uv_dc128_mmx): push rbp mov rbp, rsp @@ -357,7 +357,7 @@ sym(vp8_intra_pred_uv_dc128_mmx): ; int left_stride, ; ) %macro vp8_intra_pred_uv_tm 1 -global sym(vp8_intra_pred_uv_tm_%1) +global sym(vp8_intra_pred_uv_tm_%1) PRIVATE sym(vp8_intra_pred_uv_tm_%1): push rbp mov rbp, rsp @@ -437,7 +437,7 @@ vp8_intra_pred_uv_tm ssse3 ; unsigned char *left, ; int left_stride, ; ) -global sym(vp8_intra_pred_uv_ve_mmx) +global sym(vp8_intra_pred_uv_ve_mmx) PRIVATE sym(vp8_intra_pred_uv_ve_mmx): push rbp mov rbp, rsp @@ -479,7 +479,7 @@ sym(vp8_intra_pred_uv_ve_mmx): ; int left_stride ; ) %macro vp8_intra_pred_uv_ho 1 -global sym(vp8_intra_pred_uv_ho_%1) +global sym(vp8_intra_pred_uv_ho_%1) PRIVATE sym(vp8_intra_pred_uv_ho_%1): push rbp mov rbp, rsp @@ -577,7 +577,7 @@ vp8_intra_pred_uv_ho ssse3 ; unsigned char *left, ; int left_stride ; ) -global sym(vp8_intra_pred_y_dc_sse2) +global sym(vp8_intra_pred_y_dc_sse2) PRIVATE sym(vp8_intra_pred_y_dc_sse2): push rbp mov rbp, rsp @@ -683,7 +683,7 @@ sym(vp8_intra_pred_y_dc_sse2): ; unsigned char *left, ; int left_stride ; ) -global sym(vp8_intra_pred_y_dctop_sse2) +global sym(vp8_intra_pred_y_dctop_sse2) PRIVATE sym(vp8_intra_pred_y_dctop_sse2): push rbp mov rbp, rsp @@ -745,7 +745,7 @@ sym(vp8_intra_pred_y_dctop_sse2): ; unsigned char *left, ; int left_stride ; ) -global sym(vp8_intra_pred_y_dcleft_sse2) +global sym(vp8_intra_pred_y_dcleft_sse2) PRIVATE sym(vp8_intra_pred_y_dcleft_sse2): push rbp mov rbp, rsp @@ -838,7 +838,7 @@ sym(vp8_intra_pred_y_dcleft_sse2): ; unsigned char *left, ; int left_stride ; ) -global sym(vp8_intra_pred_y_dc128_sse2) +global sym(vp8_intra_pred_y_dc128_sse2) PRIVATE sym(vp8_intra_pred_y_dc128_sse2): push rbp mov rbp, rsp @@ -885,7 +885,7 @@ sym(vp8_intra_pred_y_dc128_sse2): ; int left_stride ; ) %macro vp8_intra_pred_y_tm 1 -global sym(vp8_intra_pred_y_tm_%1) +global sym(vp8_intra_pred_y_tm_%1) PRIVATE sym(vp8_intra_pred_y_tm_%1): push rbp mov rbp, rsp @@ -972,7 +972,7 @@ vp8_intra_pred_y_tm ssse3 ; unsigned char *left, ; int left_stride ; ) -global sym(vp8_intra_pred_y_ve_sse2) +global sym(vp8_intra_pred_y_ve_sse2) PRIVATE sym(vp8_intra_pred_y_ve_sse2): push rbp mov rbp, rsp @@ -1020,7 +1020,7 @@ sym(vp8_intra_pred_y_ve_sse2): ; unsigned char *left, ; int left_stride, ; ) -global sym(vp8_intra_pred_y_ho_sse2) +global sym(vp8_intra_pred_y_ho_sse2) PRIVATE sym(vp8_intra_pred_y_ho_sse2): push rbp mov rbp, rsp diff --git a/vp8/common/x86/sad_mmx.asm b/vp8/common/x86/sad_mmx.asm index 407b399..592112f 100644 --- a/vp8/common/x86/sad_mmx.asm +++ b/vp8/common/x86/sad_mmx.asm @@ -11,11 +11,11 @@ %include "vpx_ports/x86_abi_support.asm" -global sym(vp8_sad16x16_mmx) -global sym(vp8_sad8x16_mmx) -global sym(vp8_sad8x8_mmx) -global sym(vp8_sad4x4_mmx) -global sym(vp8_sad16x8_mmx) +global sym(vp8_sad16x16_mmx) PRIVATE +global sym(vp8_sad8x16_mmx) PRIVATE +global sym(vp8_sad8x8_mmx) PRIVATE +global sym(vp8_sad4x4_mmx) PRIVATE +global sym(vp8_sad16x8_mmx) PRIVATE ;unsigned int vp8_sad16x16_mmx( ; unsigned char *src_ptr, diff --git a/vp8/common/x86/sad_sse2.asm b/vp8/common/x86/sad_sse2.asm index 0b01d7b..290e676 100644 --- a/vp8/common/x86/sad_sse2.asm +++ b/vp8/common/x86/sad_sse2.asm @@ -16,7 +16,7 @@ ; int src_stride, ; unsigned char *ref_ptr, ; int ref_stride) -global sym(vp8_sad16x16_wmt) +global sym(vp8_sad16x16_wmt) PRIVATE sym(vp8_sad16x16_wmt): push rbp mov rbp, rsp @@ -90,7 +90,7 @@ sym(vp8_sad16x16_wmt): ; unsigned char *ref_ptr, ; int ref_stride, ; int max_sad) -global sym(vp8_sad8x16_wmt) +global sym(vp8_sad8x16_wmt) PRIVATE sym(vp8_sad8x16_wmt): push rbp mov rbp, rsp @@ -153,7 +153,7 @@ sym(vp8_sad8x16_wmt): ; int src_stride, ; unsigned char *ref_ptr, ; int ref_stride) -global sym(vp8_sad8x8_wmt) +global sym(vp8_sad8x8_wmt) PRIVATE sym(vp8_sad8x8_wmt): push rbp mov rbp, rsp @@ -206,7 +206,7 @@ sym(vp8_sad8x8_wmt): ; int src_stride, ; unsigned char *ref_ptr, ; int ref_stride) -global sym(vp8_sad4x4_wmt) +global sym(vp8_sad4x4_wmt) PRIVATE sym(vp8_sad4x4_wmt): push rbp mov rbp, rsp @@ -261,7 +261,7 @@ sym(vp8_sad4x4_wmt): ; int src_stride, ; unsigned char *ref_ptr, ; int ref_stride) -global sym(vp8_sad16x8_wmt) +global sym(vp8_sad16x8_wmt) PRIVATE sym(vp8_sad16x8_wmt): push rbp mov rbp, rsp @@ -335,7 +335,7 @@ sym(vp8_sad16x8_wmt): ; unsigned char *dst_ptr, ; int dst_stride, ; int height); -global sym(vp8_copy32xn_sse2) +global sym(vp8_copy32xn_sse2) PRIVATE sym(vp8_copy32xn_sse2): push rbp mov rbp, rsp diff --git a/vp8/common/x86/sad_sse3.asm b/vp8/common/x86/sad_sse3.asm index c2af3c8..f90a589 100644 --- a/vp8/common/x86/sad_sse3.asm +++ b/vp8/common/x86/sad_sse3.asm @@ -380,7 +380,7 @@ ; unsigned char *ref_ptr, ; int ref_stride, ; int *results) -global sym(vp8_sad16x16x3_sse3) +global sym(vp8_sad16x16x3_sse3) PRIVATE sym(vp8_sad16x16x3_sse3): STACK_FRAME_CREATE_X3 @@ -422,7 +422,7 @@ sym(vp8_sad16x16x3_sse3): ; unsigned char *ref_ptr, ; int ref_stride, ; int *results) -global sym(vp8_sad16x8x3_sse3) +global sym(vp8_sad16x8x3_sse3) PRIVATE sym(vp8_sad16x8x3_sse3): STACK_FRAME_CREATE_X3 @@ -460,7 +460,7 @@ sym(vp8_sad16x8x3_sse3): ; unsigned char *ref_ptr, ; int ref_stride, ; int *results) -global sym(vp8_sad8x16x3_sse3) +global sym(vp8_sad8x16x3_sse3) PRIVATE sym(vp8_sad8x16x3_sse3): STACK_FRAME_CREATE_X3 @@ -489,7 +489,7 @@ sym(vp8_sad8x16x3_sse3): ; unsigned char *ref_ptr, ; int ref_stride, ; int *results) -global sym(vp8_sad8x8x3_sse3) +global sym(vp8_sad8x8x3_sse3) PRIVATE sym(vp8_sad8x8x3_sse3): STACK_FRAME_CREATE_X3 @@ -514,7 +514,7 @@ sym(vp8_sad8x8x3_sse3): ; unsigned char *ref_ptr, ; int ref_stride, ; int *results) -global sym(vp8_sad4x4x3_sse3) +global sym(vp8_sad4x4x3_sse3) PRIVATE sym(vp8_sad4x4x3_sse3): STACK_FRAME_CREATE_X3 @@ -589,7 +589,7 @@ sym(vp8_sad4x4x3_sse3): ; int ref_stride, ; int max_sad) ;%define lddqu movdqu -global sym(vp8_sad16x16_sse3) +global sym(vp8_sad16x16_sse3) PRIVATE sym(vp8_sad16x16_sse3): STACK_FRAME_CREATE_X3 @@ -642,7 +642,7 @@ sym(vp8_sad16x16_sse3): ; unsigned char *dst_ptr, ; int dst_stride, ; int height); -global sym(vp8_copy32xn_sse3) +global sym(vp8_copy32xn_sse3) PRIVATE sym(vp8_copy32xn_sse3): STACK_FRAME_CREATE_X3 @@ -703,7 +703,7 @@ sym(vp8_copy32xn_sse3): ; unsigned char *ref_ptr_base, ; int ref_stride, ; int *results) -global sym(vp8_sad16x16x4d_sse3) +global sym(vp8_sad16x16x4d_sse3) PRIVATE sym(vp8_sad16x16x4d_sse3): STACK_FRAME_CREATE_X4 @@ -754,7 +754,7 @@ sym(vp8_sad16x16x4d_sse3): ; unsigned char *ref_ptr_base, ; int ref_stride, ; int *results) -global sym(vp8_sad16x8x4d_sse3) +global sym(vp8_sad16x8x4d_sse3) PRIVATE sym(vp8_sad16x8x4d_sse3): STACK_FRAME_CREATE_X4 @@ -801,7 +801,7 @@ sym(vp8_sad16x8x4d_sse3): ; unsigned char *ref_ptr, ; int ref_stride, ; int *results) -global sym(vp8_sad8x16x4d_sse3) +global sym(vp8_sad8x16x4d_sse3) PRIVATE sym(vp8_sad8x16x4d_sse3): STACK_FRAME_CREATE_X4 @@ -834,7 +834,7 @@ sym(vp8_sad8x16x4d_sse3): ; unsigned char *ref_ptr, ; int ref_stride, ; int *results) -global sym(vp8_sad8x8x4d_sse3) +global sym(vp8_sad8x8x4d_sse3) PRIVATE sym(vp8_sad8x8x4d_sse3): STACK_FRAME_CREATE_X4 @@ -863,7 +863,7 @@ sym(vp8_sad8x8x4d_sse3): ; unsigned char *ref_ptr, ; int ref_stride, ; int *results) -global sym(vp8_sad4x4x4d_sse3) +global sym(vp8_sad4x4x4d_sse3) PRIVATE sym(vp8_sad4x4x4d_sse3): STACK_FRAME_CREATE_X4 diff --git a/vp8/common/x86/sad_sse4.asm b/vp8/common/x86/sad_sse4.asm index 03ecec4..f7fccd7 100644 --- a/vp8/common/x86/sad_sse4.asm +++ b/vp8/common/x86/sad_sse4.asm @@ -161,7 +161,7 @@ ; const unsigned char *ref_ptr, ; int ref_stride, ; unsigned short *sad_array); -global sym(vp8_sad16x16x8_sse4) +global sym(vp8_sad16x16x8_sse4) PRIVATE sym(vp8_sad16x16x8_sse4): push rbp mov rbp, rsp @@ -203,7 +203,7 @@ sym(vp8_sad16x16x8_sse4): ; int ref_stride, ; unsigned short *sad_array ;); -global sym(vp8_sad16x8x8_sse4) +global sym(vp8_sad16x8x8_sse4) PRIVATE sym(vp8_sad16x8x8_sse4): push rbp mov rbp, rsp @@ -241,7 +241,7 @@ sym(vp8_sad16x8x8_sse4): ; int ref_stride, ; unsigned short *sad_array ;); -global sym(vp8_sad8x8x8_sse4) +global sym(vp8_sad8x8x8_sse4) PRIVATE sym(vp8_sad8x8x8_sse4): push rbp mov rbp, rsp @@ -279,7 +279,7 @@ sym(vp8_sad8x8x8_sse4): ; int ref_stride, ; unsigned short *sad_array ;); -global sym(vp8_sad8x16x8_sse4) +global sym(vp8_sad8x16x8_sse4) PRIVATE sym(vp8_sad8x16x8_sse4): push rbp mov rbp, rsp @@ -320,7 +320,7 @@ sym(vp8_sad8x16x8_sse4): ; int ref_stride, ; unsigned short *sad_array ;); -global sym(vp8_sad4x4x8_sse4) +global sym(vp8_sad4x4x8_sse4) PRIVATE sym(vp8_sad4x4x8_sse4): push rbp mov rbp, rsp diff --git a/vp8/common/x86/sad_ssse3.asm b/vp8/common/x86/sad_ssse3.asm index 95b6c89..278fc06 100644 --- a/vp8/common/x86/sad_ssse3.asm +++ b/vp8/common/x86/sad_ssse3.asm @@ -152,7 +152,7 @@ ; unsigned char *ref_ptr, ; int ref_stride, ; int *results) -global sym(vp8_sad16x16x3_ssse3) +global sym(vp8_sad16x16x3_ssse3) PRIVATE sym(vp8_sad16x16x3_ssse3): push rbp mov rbp, rsp @@ -265,7 +265,7 @@ sym(vp8_sad16x16x3_ssse3): ; unsigned char *ref_ptr, ; int ref_stride, ; int *results) -global sym(vp8_sad16x8x3_ssse3) +global sym(vp8_sad16x8x3_ssse3) PRIVATE sym(vp8_sad16x8x3_ssse3): push rbp mov rbp, rsp diff --git a/vp8/common/x86/subpixel_mmx.asm b/vp8/common/x86/subpixel_mmx.asm index 5528fd0..47dd452 100644 --- a/vp8/common/x86/subpixel_mmx.asm +++ b/vp8/common/x86/subpixel_mmx.asm @@ -28,7 +28,7 @@ extern sym(vp8_bilinear_filters_x86_8) ; unsigned int output_width, ; short * vp8_filter ;) -global sym(vp8_filter_block1d_h6_mmx) +global sym(vp8_filter_block1d_h6_mmx) PRIVATE sym(vp8_filter_block1d_h6_mmx): push rbp mov rbp, rsp @@ -125,7 +125,7 @@ sym(vp8_filter_block1d_h6_mmx): ; unsigned int output_width, ; short * vp8_filter ;) -global sym(vp8_filter_block1dc_v6_mmx) +global sym(vp8_filter_block1dc_v6_mmx) PRIVATE sym(vp8_filter_block1dc_v6_mmx): push rbp mov rbp, rsp @@ -213,7 +213,7 @@ sym(vp8_filter_block1dc_v6_mmx): ; unsigned char *dst_ptr, ; int dst_pitch ;) -global sym(vp8_bilinear_predict8x8_mmx) +global sym(vp8_bilinear_predict8x8_mmx) PRIVATE sym(vp8_bilinear_predict8x8_mmx): push rbp mov rbp, rsp @@ -370,7 +370,7 @@ sym(vp8_bilinear_predict8x8_mmx): ; unsigned char *dst_ptr, ; int dst_pitch ;) -global sym(vp8_bilinear_predict8x4_mmx) +global sym(vp8_bilinear_predict8x4_mmx) PRIVATE sym(vp8_bilinear_predict8x4_mmx): push rbp mov rbp, rsp @@ -525,7 +525,7 @@ sym(vp8_bilinear_predict8x4_mmx): ; unsigned char *dst_ptr, ; int dst_pitch ;) -global sym(vp8_bilinear_predict4x4_mmx) +global sym(vp8_bilinear_predict4x4_mmx) PRIVATE sym(vp8_bilinear_predict4x4_mmx): push rbp mov rbp, rsp diff --git a/vp8/common/x86/subpixel_sse2.asm b/vp8/common/x86/subpixel_sse2.asm index cb550af..69f8d10 100644 --- a/vp8/common/x86/subpixel_sse2.asm +++ b/vp8/common/x86/subpixel_sse2.asm @@ -33,7 +33,7 @@ extern sym(vp8_bilinear_filters_x86_8) ; unsigned int output_width, ; short *vp8_filter ;) -global sym(vp8_filter_block1d8_h6_sse2) +global sym(vp8_filter_block1d8_h6_sse2) PRIVATE sym(vp8_filter_block1d8_h6_sse2): push rbp mov rbp, rsp @@ -153,7 +153,7 @@ sym(vp8_filter_block1d8_h6_sse2): ; even number. This function handles 8 pixels in horizontal direction, calculating ONE ; rows each iteration to take advantage of the 128 bits operations. ;*************************************************************************************/ -global sym(vp8_filter_block1d16_h6_sse2) +global sym(vp8_filter_block1d16_h6_sse2) PRIVATE sym(vp8_filter_block1d16_h6_sse2): push rbp mov rbp, rsp @@ -329,7 +329,7 @@ sym(vp8_filter_block1d16_h6_sse2): ; Notes: filter_block1d8_v6 applies a 6 tap filter vertically to the input pixels. The ; input pixel array has output_height rows. ;*************************************************************************************/ -global sym(vp8_filter_block1d8_v6_sse2) +global sym(vp8_filter_block1d8_v6_sse2) PRIVATE sym(vp8_filter_block1d8_v6_sse2): push rbp mov rbp, rsp @@ -424,7 +424,7 @@ sym(vp8_filter_block1d8_v6_sse2): ; Notes: filter_block1d16_v6 applies a 6 tap filter vertically to the input pixels. The ; input pixel array has output_height rows. ;*************************************************************************************/ -global sym(vp8_filter_block1d16_v6_sse2) +global sym(vp8_filter_block1d16_v6_sse2) PRIVATE sym(vp8_filter_block1d16_v6_sse2): push rbp mov rbp, rsp @@ -534,7 +534,7 @@ sym(vp8_filter_block1d16_v6_sse2): ; const short *vp8_filter ;) ; First-pass filter only when yoffset==0 -global sym(vp8_filter_block1d8_h6_only_sse2) +global sym(vp8_filter_block1d8_h6_only_sse2) PRIVATE sym(vp8_filter_block1d8_h6_only_sse2): push rbp mov rbp, rsp @@ -647,7 +647,7 @@ sym(vp8_filter_block1d8_h6_only_sse2): ; const short *vp8_filter ;) ; First-pass filter only when yoffset==0 -global sym(vp8_filter_block1d16_h6_only_sse2) +global sym(vp8_filter_block1d16_h6_only_sse2) PRIVATE sym(vp8_filter_block1d16_h6_only_sse2): push rbp mov rbp, rsp @@ -812,7 +812,7 @@ sym(vp8_filter_block1d16_h6_only_sse2): ; const short *vp8_filter ;) ; Second-pass filter only when xoffset==0 -global sym(vp8_filter_block1d8_v6_only_sse2) +global sym(vp8_filter_block1d8_v6_only_sse2) PRIVATE sym(vp8_filter_block1d8_v6_only_sse2): push rbp mov rbp, rsp @@ -904,7 +904,7 @@ sym(vp8_filter_block1d8_v6_only_sse2): ; unsigned int output_height, ; unsigned int output_width ;) -global sym(vp8_unpack_block1d16_h6_sse2) +global sym(vp8_unpack_block1d16_h6_sse2) PRIVATE sym(vp8_unpack_block1d16_h6_sse2): push rbp mov rbp, rsp @@ -963,7 +963,7 @@ sym(vp8_unpack_block1d16_h6_sse2): ; int dst_pitch ;) extern sym(vp8_bilinear_filters_x86_8) -global sym(vp8_bilinear_predict16x16_sse2) +global sym(vp8_bilinear_predict16x16_sse2) PRIVATE sym(vp8_bilinear_predict16x16_sse2): push rbp mov rbp, rsp @@ -1231,7 +1231,7 @@ sym(vp8_bilinear_predict16x16_sse2): ; unsigned char *dst_ptr, ; int dst_pitch ;) -global sym(vp8_bilinear_predict8x8_sse2) +global sym(vp8_bilinear_predict8x8_sse2) PRIVATE sym(vp8_bilinear_predict8x8_sse2): push rbp mov rbp, rsp diff --git a/vp8/common/x86/subpixel_ssse3.asm b/vp8/common/x86/subpixel_ssse3.asm index 6bca82b..13bcaf6 100644 --- a/vp8/common/x86/subpixel_ssse3.asm +++ b/vp8/common/x86/subpixel_ssse3.asm @@ -34,7 +34,7 @@ ; unsigned int output_height, ; unsigned int vp8_filter_index ;) -global sym(vp8_filter_block1d8_h6_ssse3) +global sym(vp8_filter_block1d8_h6_ssse3) PRIVATE sym(vp8_filter_block1d8_h6_ssse3): push rbp mov rbp, rsp @@ -177,7 +177,7 @@ vp8_filter_block1d8_h4_ssse3: ; unsigned int output_height, ; unsigned int vp8_filter_index ;) -global sym(vp8_filter_block1d16_h6_ssse3) +global sym(vp8_filter_block1d16_h6_ssse3) PRIVATE sym(vp8_filter_block1d16_h6_ssse3): push rbp mov rbp, rsp @@ -284,7 +284,7 @@ sym(vp8_filter_block1d16_h6_ssse3): ; unsigned int output_height, ; unsigned int vp8_filter_index ;) -global sym(vp8_filter_block1d4_h6_ssse3) +global sym(vp8_filter_block1d4_h6_ssse3) PRIVATE sym(vp8_filter_block1d4_h6_ssse3): push rbp mov rbp, rsp @@ -413,7 +413,7 @@ sym(vp8_filter_block1d4_h6_ssse3): ; unsigned int output_height, ; unsigned int vp8_filter_index ;) -global sym(vp8_filter_block1d16_v6_ssse3) +global sym(vp8_filter_block1d16_v6_ssse3) PRIVATE sym(vp8_filter_block1d16_v6_ssse3): push rbp mov rbp, rsp @@ -601,7 +601,7 @@ sym(vp8_filter_block1d16_v6_ssse3): ; unsigned int output_height, ; unsigned int vp8_filter_index ;) -global sym(vp8_filter_block1d8_v6_ssse3) +global sym(vp8_filter_block1d8_v6_ssse3) PRIVATE sym(vp8_filter_block1d8_v6_ssse3): push rbp mov rbp, rsp @@ -741,7 +741,7 @@ sym(vp8_filter_block1d8_v6_ssse3): ; unsigned int output_height, ; unsigned int vp8_filter_index ;) -global sym(vp8_filter_block1d4_v6_ssse3) +global sym(vp8_filter_block1d4_v6_ssse3) PRIVATE sym(vp8_filter_block1d4_v6_ssse3): push rbp mov rbp, rsp @@ -880,7 +880,7 @@ sym(vp8_filter_block1d4_v6_ssse3): ; unsigned char *dst_ptr, ; int dst_pitch ;) -global sym(vp8_bilinear_predict16x16_ssse3) +global sym(vp8_bilinear_predict16x16_ssse3) PRIVATE sym(vp8_bilinear_predict16x16_ssse3): push rbp mov rbp, rsp @@ -1143,7 +1143,7 @@ sym(vp8_bilinear_predict16x16_ssse3): ; unsigned char *dst_ptr, ; int dst_pitch ;) -global sym(vp8_bilinear_predict8x8_ssse3) +global sym(vp8_bilinear_predict8x8_ssse3) PRIVATE sym(vp8_bilinear_predict8x8_ssse3): push rbp mov rbp, rsp diff --git a/vp8/common/x86/variance_impl_mmx.asm b/vp8/common/x86/variance_impl_mmx.asm index 2be8bbe..d9120d0 100644 --- a/vp8/common/x86/variance_impl_mmx.asm +++ b/vp8/common/x86/variance_impl_mmx.asm @@ -12,7 +12,7 @@ %include "vpx_ports/x86_abi_support.asm" ;unsigned int vp8_get_mb_ss_mmx( short *src_ptr ) -global sym(vp8_get_mb_ss_mmx) +global sym(vp8_get_mb_ss_mmx) PRIVATE sym(vp8_get_mb_ss_mmx): push rbp mov rbp, rsp @@ -72,7 +72,7 @@ sym(vp8_get_mb_ss_mmx): ; unsigned int *SSE, ; int *Sum ;) -global sym(vp8_get8x8var_mmx) +global sym(vp8_get8x8var_mmx) PRIVATE sym(vp8_get8x8var_mmx): push rbp mov rbp, rsp @@ -320,7 +320,7 @@ sym(vp8_get8x8var_mmx): ; unsigned int *SSE, ; int *Sum ;) -global sym(vp8_get4x4var_mmx) +global sym(vp8_get4x4var_mmx) PRIVATE sym(vp8_get4x4var_mmx): push rbp mov rbp, rsp @@ -433,7 +433,7 @@ sym(vp8_get4x4var_mmx): ; unsigned char *ref_ptr, ; int recon_stride ;) -global sym(vp8_get4x4sse_cs_mmx) +global sym(vp8_get4x4sse_cs_mmx) PRIVATE sym(vp8_get4x4sse_cs_mmx): push rbp mov rbp, rsp @@ -522,7 +522,7 @@ sym(vp8_get4x4sse_cs_mmx): ; int *sum, ; unsigned int *sumsquared ;) -global sym(vp8_filter_block2d_bil4x4_var_mmx) +global sym(vp8_filter_block2d_bil4x4_var_mmx) PRIVATE sym(vp8_filter_block2d_bil4x4_var_mmx): push rbp mov rbp, rsp @@ -667,7 +667,7 @@ sym(vp8_filter_block2d_bil4x4_var_mmx): ; int *sum, ; unsigned int *sumsquared ;) -global sym(vp8_filter_block2d_bil_var_mmx) +global sym(vp8_filter_block2d_bil_var_mmx) PRIVATE sym(vp8_filter_block2d_bil_var_mmx): push rbp mov rbp, rsp diff --git a/vp8/common/x86/variance_impl_sse2.asm b/vp8/common/x86/variance_impl_sse2.asm index 7629220..761433c 100644 --- a/vp8/common/x86/variance_impl_sse2.asm +++ b/vp8/common/x86/variance_impl_sse2.asm @@ -17,7 +17,7 @@ ;( ; short *src_ptr ;) -global sym(vp8_get_mb_ss_sse2) +global sym(vp8_get_mb_ss_sse2) PRIVATE sym(vp8_get_mb_ss_sse2): push rbp mov rbp, rsp @@ -80,7 +80,7 @@ sym(vp8_get_mb_ss_sse2): ; unsigned int * SSE, ; int * Sum ;) -global sym(vp8_get16x16var_sse2) +global sym(vp8_get16x16var_sse2) PRIVATE sym(vp8_get16x16var_sse2): push rbp mov rbp, rsp @@ -224,7 +224,7 @@ sym(vp8_get16x16var_sse2): ; unsigned int * SSE, ; int * Sum ;) -global sym(vp8_get8x8var_sse2) +global sym(vp8_get8x8var_sse2) PRIVATE sym(vp8_get8x8var_sse2): push rbp mov rbp, rsp @@ -413,7 +413,7 @@ sym(vp8_get8x8var_sse2): ; unsigned int *sumsquared;; ; ;) -global sym(vp8_filter_block2d_bil_var_sse2) +global sym(vp8_filter_block2d_bil_var_sse2) PRIVATE sym(vp8_filter_block2d_bil_var_sse2): push rbp mov rbp, rsp @@ -690,7 +690,7 @@ filter_block2d_bil_variance: ; int *sum, ; unsigned int *sumsquared ;) -global sym(vp8_half_horiz_vert_variance8x_h_sse2) +global sym(vp8_half_horiz_vert_variance8x_h_sse2) PRIVATE sym(vp8_half_horiz_vert_variance8x_h_sse2): push rbp mov rbp, rsp @@ -812,7 +812,7 @@ vp8_half_horiz_vert_variance8x_h_1: ; int *sum, ; unsigned int *sumsquared ;) -global sym(vp8_half_horiz_vert_variance16x_h_sse2) +global sym(vp8_half_horiz_vert_variance16x_h_sse2) PRIVATE sym(vp8_half_horiz_vert_variance16x_h_sse2): push rbp mov rbp, rsp @@ -928,7 +928,7 @@ vp8_half_horiz_vert_variance16x_h_1: ; int *sum, ; unsigned int *sumsquared ;) -global sym(vp8_half_vert_variance8x_h_sse2) +global sym(vp8_half_vert_variance8x_h_sse2) PRIVATE sym(vp8_half_vert_variance8x_h_sse2): push rbp mov rbp, rsp @@ -1035,7 +1035,7 @@ vp8_half_vert_variance8x_h_1: ; int *sum, ; unsigned int *sumsquared ;) -global sym(vp8_half_vert_variance16x_h_sse2) +global sym(vp8_half_vert_variance16x_h_sse2) PRIVATE sym(vp8_half_vert_variance16x_h_sse2): push rbp mov rbp, rsp @@ -1143,7 +1143,7 @@ vp8_half_vert_variance16x_h_1: ; int *sum, ; unsigned int *sumsquared ;) -global sym(vp8_half_horiz_variance8x_h_sse2) +global sym(vp8_half_horiz_variance8x_h_sse2) PRIVATE sym(vp8_half_horiz_variance8x_h_sse2): push rbp mov rbp, rsp @@ -1248,7 +1248,7 @@ vp8_half_horiz_variance8x_h_1: ; int *sum, ; unsigned int *sumsquared ;) -global sym(vp8_half_horiz_variance16x_h_sse2) +global sym(vp8_half_horiz_variance16x_h_sse2) PRIVATE sym(vp8_half_horiz_variance16x_h_sse2): push rbp mov rbp, rsp diff --git a/vp8/common/x86/variance_impl_ssse3.asm b/vp8/common/x86/variance_impl_ssse3.asm index 97e8b0e..686b4a9 100644 --- a/vp8/common/x86/variance_impl_ssse3.asm +++ b/vp8/common/x86/variance_impl_ssse3.asm @@ -29,7 +29,7 @@ ;) ;Note: The filter coefficient at offset=0 is 128. Since the second register ;for Pmaddubsw is signed bytes, we must calculate zero offset seperately. -global sym(vp8_filter_block2d_bil_var_ssse3) +global sym(vp8_filter_block2d_bil_var_ssse3) PRIVATE sym(vp8_filter_block2d_bil_var_ssse3): push rbp mov rbp, rsp diff --git a/vp8/encoder/x86/dct_mmx.asm b/vp8/encoder/x86/dct_mmx.asm index f07b030..6f188cb 100644 --- a/vp8/encoder/x86/dct_mmx.asm +++ b/vp8/encoder/x86/dct_mmx.asm @@ -12,7 +12,7 @@ %include "vpx_ports/x86_abi_support.asm" ;void vp8_short_fdct4x4_mmx(short *input, short *output, int pitch) -global sym(vp8_short_fdct4x4_mmx) +global sym(vp8_short_fdct4x4_mmx) PRIVATE sym(vp8_short_fdct4x4_mmx): push rbp mov rbp, rsp diff --git a/vp8/encoder/x86/dct_sse2.asm b/vp8/encoder/x86/dct_sse2.asm index 3d52a5d..d880ce0 100644 --- a/vp8/encoder/x86/dct_sse2.asm +++ b/vp8/encoder/x86/dct_sse2.asm @@ -61,7 +61,7 @@ %endmacro ;void vp8_short_fdct4x4_sse2(short *input, short *output, int pitch) -global sym(vp8_short_fdct4x4_sse2) +global sym(vp8_short_fdct4x4_sse2) PRIVATE sym(vp8_short_fdct4x4_sse2): STACK_FRAME_CREATE @@ -166,7 +166,7 @@ sym(vp8_short_fdct4x4_sse2): STACK_FRAME_DESTROY ;void vp8_short_fdct8x4_sse2(short *input, short *output, int pitch) -global sym(vp8_short_fdct8x4_sse2) +global sym(vp8_short_fdct8x4_sse2) PRIVATE sym(vp8_short_fdct8x4_sse2): STACK_FRAME_CREATE diff --git a/vp8/encoder/x86/encodeopt.asm b/vp8/encoder/x86/encodeopt.asm index 7ec7d60..fe26b18 100644 --- a/vp8/encoder/x86/encodeopt.asm +++ b/vp8/encoder/x86/encodeopt.asm @@ -12,7 +12,7 @@ %include "vpx_ports/x86_abi_support.asm" ;int vp8_block_error_xmm(short *coeff_ptr, short *dcoef_ptr) -global sym(vp8_block_error_xmm) +global sym(vp8_block_error_xmm) PRIVATE sym(vp8_block_error_xmm): push rbp mov rbp, rsp @@ -60,7 +60,7 @@ sym(vp8_block_error_xmm): ret ;int vp8_block_error_mmx(short *coeff_ptr, short *dcoef_ptr) -global sym(vp8_block_error_mmx) +global sym(vp8_block_error_mmx) PRIVATE sym(vp8_block_error_mmx): push rbp mov rbp, rsp @@ -126,7 +126,7 @@ sym(vp8_block_error_mmx): ;int vp8_mbblock_error_mmx_impl(short *coeff_ptr, short *dcoef_ptr, int dc); -global sym(vp8_mbblock_error_mmx_impl) +global sym(vp8_mbblock_error_mmx_impl) PRIVATE sym(vp8_mbblock_error_mmx_impl): push rbp mov rbp, rsp @@ -203,7 +203,7 @@ sym(vp8_mbblock_error_mmx_impl): ;int vp8_mbblock_error_xmm_impl(short *coeff_ptr, short *dcoef_ptr, int dc); -global sym(vp8_mbblock_error_xmm_impl) +global sym(vp8_mbblock_error_xmm_impl) PRIVATE sym(vp8_mbblock_error_xmm_impl): push rbp mov rbp, rsp @@ -273,7 +273,7 @@ sym(vp8_mbblock_error_xmm_impl): ;int vp8_mbuverror_mmx_impl(short *s_ptr, short *d_ptr); -global sym(vp8_mbuverror_mmx_impl) +global sym(vp8_mbuverror_mmx_impl) PRIVATE sym(vp8_mbuverror_mmx_impl): push rbp mov rbp, rsp @@ -330,7 +330,7 @@ sym(vp8_mbuverror_mmx_impl): ;int vp8_mbuverror_xmm_impl(short *s_ptr, short *d_ptr); -global sym(vp8_mbuverror_xmm_impl) +global sym(vp8_mbuverror_xmm_impl) PRIVATE sym(vp8_mbuverror_xmm_impl): push rbp mov rbp, rsp diff --git a/vp8/encoder/x86/fwalsh_sse2.asm b/vp8/encoder/x86/fwalsh_sse2.asm index 71efd56..f498927 100644 --- a/vp8/encoder/x86/fwalsh_sse2.asm +++ b/vp8/encoder/x86/fwalsh_sse2.asm @@ -12,7 +12,7 @@ %include "vpx_ports/x86_abi_support.asm" ;void vp8_short_walsh4x4_sse2(short *input, short *output, int pitch) -global sym(vp8_short_walsh4x4_sse2) +global sym(vp8_short_walsh4x4_sse2) PRIVATE sym(vp8_short_walsh4x4_sse2): push rbp mov rbp, rsp diff --git a/vp8/encoder/x86/quantize_mmx.asm b/vp8/encoder/x86/quantize_mmx.asm index f29a54e..2864ce1 100644 --- a/vp8/encoder/x86/quantize_mmx.asm +++ b/vp8/encoder/x86/quantize_mmx.asm @@ -15,7 +15,7 @@ ; short *qcoeff_ptr,short *dequant_ptr, ; short *scan_mask, short *round_ptr, ; short *quant_ptr, short *dqcoeff_ptr); -global sym(vp8_fast_quantize_b_impl_mmx) +global sym(vp8_fast_quantize_b_impl_mmx) PRIVATE sym(vp8_fast_quantize_b_impl_mmx): push rbp mov rbp, rsp diff --git a/vp8/encoder/x86/quantize_sse2.asm b/vp8/encoder/x86/quantize_sse2.asm index 7c249ff..724e54c 100644 --- a/vp8/encoder/x86/quantize_sse2.asm +++ b/vp8/encoder/x86/quantize_sse2.asm @@ -16,7 +16,7 @@ ; (BLOCK *b, | 0 ; BLOCKD *d) | 1 -global sym(vp8_regular_quantize_b_sse2) +global sym(vp8_regular_quantize_b_sse2) PRIVATE sym(vp8_regular_quantize_b_sse2): push rbp mov rbp, rsp @@ -240,7 +240,7 @@ ZIGZAG_LOOP 15 ; (BLOCK *b, | 0 ; BLOCKD *d) | 1 -global sym(vp8_fast_quantize_b_sse2) +global sym(vp8_fast_quantize_b_sse2) PRIVATE sym(vp8_fast_quantize_b_sse2): push rbp mov rbp, rsp diff --git a/vp8/encoder/x86/quantize_sse4.asm b/vp8/encoder/x86/quantize_sse4.asm index 70eac0c..f0e5d40 100644 --- a/vp8/encoder/x86/quantize_sse4.asm +++ b/vp8/encoder/x86/quantize_sse4.asm @@ -16,7 +16,7 @@ ; (BLOCK *b, | 0 ; BLOCKD *d) | 1 -global sym(vp8_regular_quantize_b_sse4) +global sym(vp8_regular_quantize_b_sse4) PRIVATE sym(vp8_regular_quantize_b_sse4): %if ABI_IS_32BIT diff --git a/vp8/encoder/x86/quantize_ssse3.asm b/vp8/encoder/x86/quantize_ssse3.asm index e698e90..dd526f4 100644 --- a/vp8/encoder/x86/quantize_ssse3.asm +++ b/vp8/encoder/x86/quantize_ssse3.asm @@ -17,7 +17,7 @@ ; BLOCKD *d) | 1 ; -global sym(vp8_fast_quantize_b_ssse3) +global sym(vp8_fast_quantize_b_ssse3) PRIVATE sym(vp8_fast_quantize_b_ssse3): push rbp mov rbp, rsp diff --git a/vp8/encoder/x86/ssim_opt.asm b/vp8/encoder/x86/ssim_opt.asm index c6db3d1..5964a85 100644 --- a/vp8/encoder/x86/ssim_opt.asm +++ b/vp8/encoder/x86/ssim_opt.asm @@ -61,7 +61,7 @@ ; or pavgb At this point this is just meant to be first pass for calculating ; all the parms needed for 16x16 ssim so we can play with dssim as distortion ; in mode selection code. -global sym(vp8_ssim_parms_16x16_sse2) +global sym(vp8_ssim_parms_16x16_sse2) PRIVATE sym(vp8_ssim_parms_16x16_sse2): push rbp mov rbp, rsp @@ -151,7 +151,7 @@ sym(vp8_ssim_parms_16x16_sse2): ; or pavgb At this point this is just meant to be first pass for calculating ; all the parms needed for 16x16 ssim so we can play with dssim as distortion ; in mode selection code. -global sym(vp8_ssim_parms_8x8_sse2) +global sym(vp8_ssim_parms_8x8_sse2) PRIVATE sym(vp8_ssim_parms_8x8_sse2): push rbp mov rbp, rsp diff --git a/vp8/encoder/x86/subtract_mmx.asm b/vp8/encoder/x86/subtract_mmx.asm index 75e8aa3..794dd22 100644 --- a/vp8/encoder/x86/subtract_mmx.asm +++ b/vp8/encoder/x86/subtract_mmx.asm @@ -14,7 +14,7 @@ ;void vp8_subtract_b_mmx_impl(unsigned char *z, int src_stride, ; short *diff, unsigned char *Predictor, ; int pitch); -global sym(vp8_subtract_b_mmx_impl) +global sym(vp8_subtract_b_mmx_impl) PRIVATE sym(vp8_subtract_b_mmx_impl): push rbp mov rbp, rsp @@ -75,7 +75,7 @@ sym(vp8_subtract_b_mmx_impl): ;void vp8_subtract_mby_mmx(short *diff, unsigned char *src, int src_stride, ;unsigned char *pred, int pred_stride) -global sym(vp8_subtract_mby_mmx) +global sym(vp8_subtract_mby_mmx) PRIVATE sym(vp8_subtract_mby_mmx): push rbp mov rbp, rsp @@ -150,7 +150,7 @@ sym(vp8_subtract_mby_mmx): ; int src_stride, unsigned char *upred, ; unsigned char *vpred, int pred_stride) -global sym(vp8_subtract_mbuv_mmx) +global sym(vp8_subtract_mbuv_mmx) PRIVATE sym(vp8_subtract_mbuv_mmx): push rbp mov rbp, rsp diff --git a/vp8/encoder/x86/subtract_sse2.asm b/vp8/encoder/x86/subtract_sse2.asm index 008e9c7..a5d17f5 100644 --- a/vp8/encoder/x86/subtract_sse2.asm +++ b/vp8/encoder/x86/subtract_sse2.asm @@ -14,7 +14,7 @@ ;void vp8_subtract_b_sse2_impl(unsigned char *z, int src_stride, ; short *diff, unsigned char *Predictor, ; int pitch); -global sym(vp8_subtract_b_sse2_impl) +global sym(vp8_subtract_b_sse2_impl) PRIVATE sym(vp8_subtract_b_sse2_impl): push rbp mov rbp, rsp @@ -73,7 +73,7 @@ sym(vp8_subtract_b_sse2_impl): ;void vp8_subtract_mby_sse2(short *diff, unsigned char *src, int src_stride, ;unsigned char *pred, int pred_stride) -global sym(vp8_subtract_mby_sse2) +global sym(vp8_subtract_mby_sse2) PRIVATE sym(vp8_subtract_mby_sse2): push rbp mov rbp, rsp @@ -146,7 +146,7 @@ sym(vp8_subtract_mby_sse2): ;vp8_subtract_mbuv_sse2(short *diff, unsigned char *usrc, unsigned char *vsrc, ; int src_stride, unsigned char *upred, ; unsigned char *vpred, int pred_stride) -global sym(vp8_subtract_mbuv_sse2) +global sym(vp8_subtract_mbuv_sse2) PRIVATE sym(vp8_subtract_mbuv_sse2): push rbp mov rbp, rsp diff --git a/vp8/encoder/x86/temporal_filter_apply_sse2.asm b/vp8/encoder/x86/temporal_filter_apply_sse2.asm index b97c694..ce9d983 100644 --- a/vp8/encoder/x86/temporal_filter_apply_sse2.asm +++ b/vp8/encoder/x86/temporal_filter_apply_sse2.asm @@ -20,7 +20,7 @@ ; int filter_weight, | 5 ; unsigned int *accumulator, | 6 ; unsigned short *count) | 7 -global sym(vp8_temporal_filter_apply_sse2) +global sym(vp8_temporal_filter_apply_sse2) PRIVATE sym(vp8_temporal_filter_apply_sse2): push rbp diff --git a/vpx_ports/emms.asm b/vpx_ports/emms.asm index 306e235..efad1a5 100644 --- a/vpx_ports/emms.asm +++ b/vpx_ports/emms.asm @@ -12,14 +12,14 @@ %include "vpx_ports/x86_abi_support.asm" section .text - global sym(vpx_reset_mmx_state) +global sym(vpx_reset_mmx_state) PRIVATE sym(vpx_reset_mmx_state): emms ret %ifidn __OUTPUT_FORMAT__,x64 -global sym(vpx_winx64_fldcw) +global sym(vpx_winx64_fldcw) PRIVATE sym(vpx_winx64_fldcw): sub rsp, 8 mov [rsp], rcx ; win x64 specific @@ -28,7 +28,7 @@ sym(vpx_winx64_fldcw): ret -global sym(vpx_winx64_fstcw) +global sym(vpx_winx64_fstcw) PRIVATE sym(vpx_winx64_fstcw): sub rsp, 8 fstcw [rsp] diff --git a/vpx_ports/x86_abi_support.asm b/vpx_ports/x86_abi_support.asm index cef6a0b..e1a540c 100644 --- a/vpx_ports/x86_abi_support.asm +++ b/vpx_ports/x86_abi_support.asm @@ -94,6 +94,31 @@ %define sym(x) _ %+ x %endif +; PRIVATE +; Macro for the attribute to hide a global symbol for the target ABI. +; This is only active if CHROMIUM is defined. +; +; Chromium doesn't like exported global symbols due to symbol clashing with +; plugins among other things. +; +; Requires Chromium's patched copy of yasm: +; http://src.chromium.org/viewvc/chrome?view=rev&revision=73761 +; http://www.tortall.net/projects/yasm/ticket/236 +; +%ifdef CHROMIUM + %ifidn __OUTPUT_FORMAT__,elf32 + %define PRIVATE :hidden + %elifidn __OUTPUT_FORMAT__,elf64 + %define PRIVATE :hidden + %elifidn __OUTPUT_FORMAT__,x64 + %define PRIVATE + %else + %define PRIVATE :private_extern + %endif +%else + %define PRIVATE +%endif + ; arg() ; Return the address specification of the given argument ; @@ -181,7 +206,16 @@ %endmacro %endif %endif - %define HIDDEN_DATA(x) x + + %ifdef CHROMIUM + %ifidn __OUTPUT_FORMAT__,macho32 + %define HIDDEN_DATA(x) x:private_extern + %else + %define HIDDEN_DATA(x) x + %endif + %else + %define HIDDEN_DATA(x) x + %endif %else %macro GET_GOT 1 %endmacro -- 2.7.4