summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohann <johannkoenig@google.com>2017-12-01 14:31:04 -0800
committerJohann <johannkoenig@google.com>2017-12-01 14:33:04 -0800
commitbdbecea1baba853b86b1647d116c284c86df723f (patch)
tree30c91e0ce4610b99f57012dafb07bc7a7799824b
parent65df957df6f930db1252affb6ddeb487cbf6d84e (diff)
downloadlibvpx-bdbecea1baba853b86b1647d116c284c86df723f.tar
libvpx-bdbecea1baba853b86b1647d116c284c86df723f.tar.gz
libvpx-bdbecea1baba853b86b1647d116c284c86df723f.tar.bz2
libvpx-bdbecea1baba853b86b1647d116c284c86df723f.zip
explicitly label .text sections
nasm should infer .text but does not for windows: https://bugzilla.nasm.us/show_bug.cgi?id=3392451 Change-Id: Ib195465e5f33405f5ff61c4cf88aa2a72640cacb
-rw-r--r--vp8/common/x86/copy_sse2.asm1
-rw-r--r--vp8/common/x86/copy_sse3.asm1
-rw-r--r--vp8/common/x86/dequantize_mmx.asm1
-rw-r--r--vp8/common/x86/idctllm_mmx.asm1
-rw-r--r--vp8/common/x86/idctllm_sse2.asm2
-rw-r--r--vp8/common/x86/iwalsh_sse2.asm2
-rw-r--r--vp8/common/x86/loopfilter_block_sse2_x86_64.asm2
-rw-r--r--vp8/common/x86/loopfilter_sse2.asm2
-rw-r--r--vp8/common/x86/mfqe_sse2.asm2
-rw-r--r--vp8/common/x86/recon_mmx.asm1
-rw-r--r--vp8/common/x86/recon_sse2.asm2
-rw-r--r--vp8/common/x86/subpixel_mmx.asm1
-rw-r--r--vp8/common/x86/subpixel_sse2.asm1
-rw-r--r--vp8/common/x86/subpixel_ssse3.asm1
-rw-r--r--vp8/encoder/x86/dct_sse2.asm2
-rw-r--r--vp8/encoder/x86/encodeopt.asm2
-rw-r--r--vp8/encoder/x86/fwalsh_sse2.asm2
-rw-r--r--vp8/encoder/x86/temporal_filter_apply_sse2.asm2
-rw-r--r--vp9/common/x86/vp9_mfqe_sse2.asm2
-rw-r--r--vpx_dsp/x86/add_noise_sse2.asm2
-rw-r--r--vpx_dsp/x86/deblock_sse2.asm2
-rw-r--r--vpx_dsp/x86/highbd_variance_impl_sse2.asm2
-rw-r--r--vpx_dsp/x86/sad_sse3.asm2
-rw-r--r--vpx_dsp/x86/sad_sse4.asm2
-rw-r--r--vpx_dsp/x86/sad_ssse3.asm2
-rw-r--r--vpx_dsp/x86/ssim_opt_x86_64.asm3
-rw-r--r--vpx_dsp/x86/vpx_high_subpixel_8t_sse2.asm2
-rw-r--r--vpx_dsp/x86/vpx_high_subpixel_bilinear_sse2.asm2
-rw-r--r--vpx_dsp/x86/vpx_subpixel_8t_sse2.asm2
-rw-r--r--vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm2
-rw-r--r--vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm2
31 files changed, 55 insertions, 0 deletions
diff --git a/vp8/common/x86/copy_sse2.asm b/vp8/common/x86/copy_sse2.asm
index 86fae2695..480faa255 100644
--- a/vp8/common/x86/copy_sse2.asm
+++ b/vp8/common/x86/copy_sse2.asm
@@ -11,6 +11,7 @@
%include "vpx_ports/x86_abi_support.asm"
+SECTION .text
;void vp8_copy32xn_sse2(
; unsigned char *src_ptr,
diff --git a/vp8/common/x86/copy_sse3.asm b/vp8/common/x86/copy_sse3.asm
index d789a40cc..31ea898a3 100644
--- a/vp8/common/x86/copy_sse3.asm
+++ b/vp8/common/x86/copy_sse3.asm
@@ -83,6 +83,7 @@
ret
%endmacro
+SECTION .text
;void vp8_copy32xn_sse3(
; unsigned char *src_ptr,
diff --git a/vp8/common/x86/dequantize_mmx.asm b/vp8/common/x86/dequantize_mmx.asm
index 4e551f00a..bfdd99778 100644
--- a/vp8/common/x86/dequantize_mmx.asm
+++ b/vp8/common/x86/dequantize_mmx.asm
@@ -11,6 +11,7 @@
%include "vpx_ports/x86_abi_support.asm"
+SECTION .text
;void vp8_dequantize_b_impl_mmx(short *sq, short *dq, short *q)
global sym(vp8_dequantize_b_impl_mmx) PRIVATE
diff --git a/vp8/common/x86/idctllm_mmx.asm b/vp8/common/x86/idctllm_mmx.asm
index 96fa2c60d..5773d9d84 100644
--- a/vp8/common/x86/idctllm_mmx.asm
+++ b/vp8/common/x86/idctllm_mmx.asm
@@ -31,6 +31,7 @@
; *
; **************************************************************************/
+SECTION .text
;void vp8_short_idct4x4llm_mmx(short *input, unsigned char *pred,
;int pitch, unsigned char *dest,int stride)
diff --git a/vp8/common/x86/idctllm_sse2.asm b/vp8/common/x86/idctllm_sse2.asm
index bf8e2c402..560faba00 100644
--- a/vp8/common/x86/idctllm_sse2.asm
+++ b/vp8/common/x86/idctllm_sse2.asm
@@ -19,6 +19,8 @@
; int dst_stride - 3
; )
+SECTION .text
+
global sym(vp8_idct_dequant_0_2x_sse2) PRIVATE
sym(vp8_idct_dequant_0_2x_sse2):
push rbp
diff --git a/vp8/common/x86/iwalsh_sse2.asm b/vp8/common/x86/iwalsh_sse2.asm
index 06e86a80b..82d7bf91a 100644
--- a/vp8/common/x86/iwalsh_sse2.asm
+++ b/vp8/common/x86/iwalsh_sse2.asm
@@ -11,6 +11,8 @@
%include "vpx_ports/x86_abi_support.asm"
+SECTION .text
+
;void vp8_short_inv_walsh4x4_sse2(short *input, short *output)
global sym(vp8_short_inv_walsh4x4_sse2) PRIVATE
sym(vp8_short_inv_walsh4x4_sse2):
diff --git a/vp8/common/x86/loopfilter_block_sse2_x86_64.asm b/vp8/common/x86/loopfilter_block_sse2_x86_64.asm
index 6d5aaa19d..6a3d05290 100644
--- a/vp8/common/x86/loopfilter_block_sse2_x86_64.asm
+++ b/vp8/common/x86/loopfilter_block_sse2_x86_64.asm
@@ -125,6 +125,8 @@
pxor %1, [GLOBAL(t80)]
%endmacro
+SECTION .text
+
;void vp8_loop_filter_bh_y_sse2
;(
; unsigned char *src_ptr,
diff --git a/vp8/common/x86/loopfilter_sse2.asm b/vp8/common/x86/loopfilter_sse2.asm
index 1913abc69..2ae028fea 100644
--- a/vp8/common/x86/loopfilter_sse2.asm
+++ b/vp8/common/x86/loopfilter_sse2.asm
@@ -276,6 +276,8 @@
%endmacro
+SECTION .text
+
%if ABI_IS_32BIT
;void vp8_loop_filter_horizontal_edge_sse2
diff --git a/vp8/common/x86/mfqe_sse2.asm b/vp8/common/x86/mfqe_sse2.asm
index 8177b7922..3fde973ad 100644
--- a/vp8/common/x86/mfqe_sse2.asm
+++ b/vp8/common/x86/mfqe_sse2.asm
@@ -11,6 +11,8 @@
%include "vpx_ports/x86_abi_support.asm"
+SECTION .text
+
;void vp8_filter_by_weight16x16_sse2
;(
; unsigned char *src,
diff --git a/vp8/common/x86/recon_mmx.asm b/vp8/common/x86/recon_mmx.asm
index 43f2dc6c6..e6a48f6b0 100644
--- a/vp8/common/x86/recon_mmx.asm
+++ b/vp8/common/x86/recon_mmx.asm
@@ -11,6 +11,7 @@
%include "vpx_ports/x86_abi_support.asm"
+SECTION .text
;void copy_mem8x8_mmx(
; unsigned char *src,
diff --git a/vp8/common/x86/recon_sse2.asm b/vp8/common/x86/recon_sse2.asm
index cb89537f7..57f8899c7 100644
--- a/vp8/common/x86/recon_sse2.asm
+++ b/vp8/common/x86/recon_sse2.asm
@@ -11,6 +11,8 @@
%include "vpx_ports/x86_abi_support.asm"
+SECTION .text
+
;void copy_mem16x16_sse2(
; unsigned char *src,
; int src_stride,
diff --git a/vp8/common/x86/subpixel_mmx.asm b/vp8/common/x86/subpixel_mmx.asm
index 6ab7f1fdc..1f3a2baca 100644
--- a/vp8/common/x86/subpixel_mmx.asm
+++ b/vp8/common/x86/subpixel_mmx.asm
@@ -17,6 +17,7 @@ extern sym(vp8_bilinear_filters_x86_8)
%define vp8_filter_weight 128
%define VP8_FILTER_SHIFT 7
+SECTION .text
;void vp8_filter_block1d_h6_mmx
;(
diff --git a/vp8/common/x86/subpixel_sse2.asm b/vp8/common/x86/subpixel_sse2.asm
index ca00583ca..6e70f6d2e 100644
--- a/vp8/common/x86/subpixel_sse2.asm
+++ b/vp8/common/x86/subpixel_sse2.asm
@@ -16,6 +16,7 @@ extern sym(vp8_bilinear_filters_x86_8)
%define VP8_FILTER_WEIGHT 128
%define VP8_FILTER_SHIFT 7
+SECTION .text
;/************************************************************************************
; Notes: filter_block1d_h6 applies a 6 tap filter horizontally to the input pixels. The
diff --git a/vp8/common/x86/subpixel_ssse3.asm b/vp8/common/x86/subpixel_ssse3.asm
index 1f6cbd1d1..8d55c9320 100644
--- a/vp8/common/x86/subpixel_ssse3.asm
+++ b/vp8/common/x86/subpixel_ssse3.asm
@@ -15,6 +15,7 @@
%define VP8_FILTER_WEIGHT 128
%define VP8_FILTER_SHIFT 7
+SECTION .text
;/************************************************************************************
; Notes: filter_block1d_h6 applies a 6 tap filter horizontally to the input pixels. The
diff --git a/vp8/encoder/x86/dct_sse2.asm b/vp8/encoder/x86/dct_sse2.asm
index d06bca592..4d92f0341 100644
--- a/vp8/encoder/x86/dct_sse2.asm
+++ b/vp8/encoder/x86/dct_sse2.asm
@@ -60,6 +60,8 @@
ret
%endmacro
+SECTION .text
+
;void vp8_short_fdct4x4_sse2(short *input, short *output, int pitch)
global sym(vp8_short_fdct4x4_sse2) PRIVATE
sym(vp8_short_fdct4x4_sse2):
diff --git a/vp8/encoder/x86/encodeopt.asm b/vp8/encoder/x86/encodeopt.asm
index 0297220ee..f6c6aeae7 100644
--- a/vp8/encoder/x86/encodeopt.asm
+++ b/vp8/encoder/x86/encodeopt.asm
@@ -11,6 +11,8 @@
%include "vpx_ports/x86_abi_support.asm"
+SECTION .text
+
;int vp8_block_error_sse2(short *coeff_ptr, short *dcoef_ptr)
global sym(vp8_block_error_sse2) PRIVATE
sym(vp8_block_error_sse2):
diff --git a/vp8/encoder/x86/fwalsh_sse2.asm b/vp8/encoder/x86/fwalsh_sse2.asm
index f4989279f..b5d5de4a5 100644
--- a/vp8/encoder/x86/fwalsh_sse2.asm
+++ b/vp8/encoder/x86/fwalsh_sse2.asm
@@ -11,6 +11,8 @@
%include "vpx_ports/x86_abi_support.asm"
+SECTION .text
+
;void vp8_short_walsh4x4_sse2(short *input, short *output, int pitch)
global sym(vp8_short_walsh4x4_sse2) PRIVATE
sym(vp8_short_walsh4x4_sse2):
diff --git a/vp8/encoder/x86/temporal_filter_apply_sse2.asm b/vp8/encoder/x86/temporal_filter_apply_sse2.asm
index 0323bd876..d2b4711b8 100644
--- a/vp8/encoder/x86/temporal_filter_apply_sse2.asm
+++ b/vp8/encoder/x86/temporal_filter_apply_sse2.asm
@@ -11,6 +11,8 @@
%include "vpx_ports/x86_abi_support.asm"
+SECTION .text
+
; void vp8_temporal_filter_apply_sse2 | arg
; (unsigned char *frame1, | 0
; unsigned int stride, | 1
diff --git a/vp9/common/x86/vp9_mfqe_sse2.asm b/vp9/common/x86/vp9_mfqe_sse2.asm
index 30852049b..ca0897ab9 100644
--- a/vp9/common/x86/vp9_mfqe_sse2.asm
+++ b/vp9/common/x86/vp9_mfqe_sse2.asm
@@ -12,6 +12,8 @@
; TODO(jackychen): Find a way to fix the duplicate.
%include "vpx_ports/x86_abi_support.asm"
+SECTION .text
+
;void vp9_filter_by_weight16x16_sse2
;(
; unsigned char *src,
diff --git a/vpx_dsp/x86/add_noise_sse2.asm b/vpx_dsp/x86/add_noise_sse2.asm
index af48adc31..80cced4ce 100644
--- a/vpx_dsp/x86/add_noise_sse2.asm
+++ b/vpx_dsp/x86/add_noise_sse2.asm
@@ -11,6 +11,8 @@
%include "vpx_ports/x86_abi_support.asm"
+SECTION .text
+
;void vpx_plane_add_noise_sse2(uint8_t *start, const int8_t *noise,
; int blackclamp, int whiteclamp,
; int width, int height, int pitch)
diff --git a/vpx_dsp/x86/deblock_sse2.asm b/vpx_dsp/x86/deblock_sse2.asm
index bd8fd1248..97cb43b67 100644
--- a/vpx_dsp/x86/deblock_sse2.asm
+++ b/vpx_dsp/x86/deblock_sse2.asm
@@ -83,6 +83,8 @@
add rbx, 16
%endmacro
+SECTION .text
+
;void vpx_post_proc_down_and_across_mb_row_sse2
;(
; unsigned char *src_ptr,
diff --git a/vpx_dsp/x86/highbd_variance_impl_sse2.asm b/vpx_dsp/x86/highbd_variance_impl_sse2.asm
index 923418a99..e646767e1 100644
--- a/vpx_dsp/x86/highbd_variance_impl_sse2.asm
+++ b/vpx_dsp/x86/highbd_variance_impl_sse2.asm
@@ -11,6 +11,8 @@
%include "vpx_ports/x86_abi_support.asm"
+SECTION .text
+
;unsigned int vpx_highbd_calc16x16var_sse2
;(
; unsigned char * src_ptr,
diff --git a/vpx_dsp/x86/sad_sse3.asm b/vpx_dsp/x86/sad_sse3.asm
index 18279bdb9..175dcc089 100644
--- a/vpx_dsp/x86/sad_sse3.asm
+++ b/vpx_dsp/x86/sad_sse3.asm
@@ -165,6 +165,8 @@
paddw mm7, mm3
%endmacro
+SECTION .text
+
;void int vpx_sad16x16x3_sse3(
; unsigned char *src_ptr,
; int src_stride,
diff --git a/vpx_dsp/x86/sad_sse4.asm b/vpx_dsp/x86/sad_sse4.asm
index bc6744797..03999dfca 100644
--- a/vpx_dsp/x86/sad_sse4.asm
+++ b/vpx_dsp/x86/sad_sse4.asm
@@ -165,6 +165,8 @@
movdqa [rdi + 16], xmm2
%endmacro
+SECTION .text
+
;void vpx_sad16x16x8_sse4_1(
; const unsigned char *src_ptr,
; int src_stride,
diff --git a/vpx_dsp/x86/sad_ssse3.asm b/vpx_dsp/x86/sad_ssse3.asm
index 49f204fa0..7cf93cf51 100644
--- a/vpx_dsp/x86/sad_ssse3.asm
+++ b/vpx_dsp/x86/sad_ssse3.asm
@@ -146,6 +146,8 @@
%endmacro
+SECTION .text
+
;void int vpx_sad16x16x3_ssse3(
; unsigned char *src_ptr,
; int src_stride,
diff --git a/vpx_dsp/x86/ssim_opt_x86_64.asm b/vpx_dsp/x86/ssim_opt_x86_64.asm
index 6d58321e0..300fa8aab 100644
--- a/vpx_dsp/x86/ssim_opt_x86_64.asm
+++ b/vpx_dsp/x86/ssim_opt_x86_64.asm
@@ -44,6 +44,9 @@
paddd %1, xmm1
SUM_ACROSS_Q %1
%endmacro
+
+SECTION .text
+
;void ssim_parms_sse2(
; unsigned char *s,
; int sp,
diff --git a/vpx_dsp/x86/vpx_high_subpixel_8t_sse2.asm b/vpx_dsp/x86/vpx_high_subpixel_8t_sse2.asm
index bfc816f23..d83507dc9 100644
--- a/vpx_dsp/x86/vpx_high_subpixel_8t_sse2.asm
+++ b/vpx_dsp/x86/vpx_high_subpixel_8t_sse2.asm
@@ -197,6 +197,8 @@
movdqu [rdi + %2], xmm0
%endm
+SECTION .text
+
;void vpx_filter_block1d4_v8_sse2
;(
; unsigned char *src_ptr,
diff --git a/vpx_dsp/x86/vpx_high_subpixel_bilinear_sse2.asm b/vpx_dsp/x86/vpx_high_subpixel_bilinear_sse2.asm
index 72f2ff71d..9bffe504b 100644
--- a/vpx_dsp/x86/vpx_high_subpixel_bilinear_sse2.asm
+++ b/vpx_dsp/x86/vpx_high_subpixel_bilinear_sse2.asm
@@ -171,6 +171,8 @@
%endm
%endif
+SECTION .text
+
global sym(vpx_highbd_filter_block1d4_v2_sse2) PRIVATE
sym(vpx_highbd_filter_block1d4_v2_sse2):
push rbp
diff --git a/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm b/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm
index 08f3d6a6c..8497e1721 100644
--- a/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm
+++ b/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm
@@ -176,6 +176,8 @@
movq [rdi + %2], xmm0
%endm
+SECTION .text
+
;void vpx_filter_block1d4_v8_sse2
;(
; unsigned char *src_ptr,
diff --git a/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm b/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm
index a378dd040..6d79492e4 100644
--- a/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm
+++ b/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm
@@ -131,6 +131,8 @@
dec rcx
%endm
+SECTION .text
+
global sym(vpx_filter_block1d4_v2_sse2) PRIVATE
sym(vpx_filter_block1d4_v2_sse2):
push rbp
diff --git a/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm b/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm
index 538b2129d..8c9c817be 100644
--- a/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm
+++ b/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm
@@ -105,6 +105,8 @@
dec rcx
%endm
+SECTION .text
+
global sym(vpx_filter_block1d4_v2_ssse3) PRIVATE
sym(vpx_filter_block1d4_v2_ssse3):
push rbp