ref: 0b0884874dc05f64cd7ecb4062e655223868e991
parent: 2b1c815184c027f6a8287fa0f692054b114606df
author: Martin Storsjö <[email protected]>
date: Fri Mar 27 06:46:34 EDT 2015
Remove superfluous .text directives at the start of arm assembly files This directive can be set by the common include header that is included by all files anyway.
--- a/codec/common/arm/arm_arch_common_macro.S
+++ b/codec/common/arm/arm_arch_common_macro.S
@@ -36,6 +36,8 @@
#ifdef __APPLE__
+.text
+
.macro WELS_ASM_FUNC_BEGIN
.align 2
.arm
--- a/codec/common/arm/copy_mb_neon.S
+++ b/codec/common/arm/copy_mb_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON
-.text
#include "arm_arch_common_macro.S"
#ifdef __APPLE__
--- a/codec/common/arm/deblocking_neon.S
+++ b/codec/common/arm/deblocking_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON
-.text
#include "arm_arch_common_macro.S"
--- a/codec/common/arm/expand_picture_neon.S
+++ b/codec/common/arm/expand_picture_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON
-.text
#include "arm_arch_common_macro.S"
--- a/codec/common/arm/intra_pred_common_neon.S
+++ b/codec/common/arm/intra_pred_common_neon.S
@@ -32,7 +32,6 @@
#ifdef HAVE_NEON
-.text
#include "arm_arch_common_macro.S"
WELS_ASM_FUNC_BEGIN WelsI16x16LumaPredV_neon
--- a/codec/common/arm/mc_neon.S
+++ b/codec/common/arm/mc_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON
-.text
#include "arm_arch_common_macro.S"
#ifdef __APPLE__
--- a/codec/common/arm64/arm_arch64_common_macro.S
+++ b/codec/common/arm64/arm_arch64_common_macro.S
@@ -32,6 +32,8 @@
#ifdef __APPLE__
+.text
+
.macro WELS_ASM_AARCH64_FUNC_BEGIN
.align 2
.globl _$0
--- a/codec/common/arm64/copy_mb_aarch64_neon.S
+++ b/codec/common/arm64/copy_mb_aarch64_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON_AARCH64
-.text
#include "arm_arch64_common_macro.S"
#ifdef __APPLE__
--- a/codec/common/arm64/deblocking_aarch64_neon.S
+++ b/codec/common/arm64/deblocking_aarch64_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON_AARCH64
-.text
#include "arm_arch64_common_macro.S"
#ifdef __APPLE__
--- a/codec/common/arm64/expand_picture_aarch64_neon.S
+++ b/codec/common/arm64/expand_picture_aarch64_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON_AARCH64
-.text
#include "arm_arch64_common_macro.S"
WELS_ASM_AARCH64_FUNC_BEGIN ExpandPictureLuma_AArch64_neon
--- a/codec/common/arm64/intra_pred_common_aarch64_neon.S
+++ b/codec/common/arm64/intra_pred_common_aarch64_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON_AARCH64
-.text
#include "arm_arch64_common_macro.S"
//for Luma 16x16
--- a/codec/common/arm64/mc_aarch64_neon.S
+++ b/codec/common/arm64/mc_aarch64_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON_AARCH64
-.text
#include "arm_arch64_common_macro.S"
.align 4
filter_para: .short 0, 1, -5, 20, 0, 0, 0, 0
--- a/codec/decoder/core/arm/block_add_neon.S
+++ b/codec/decoder/core/arm/block_add_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON
-.text
#include "arm_arch_common_macro.S"
#ifdef __APPLE__
--- a/codec/decoder/core/arm/intra_pred_neon.S
+++ b/codec/decoder/core/arm/intra_pred_neon.S
@@ -32,7 +32,6 @@
#ifdef HAVE_NEON
//Global macro
-.text
#include "arm_arch_common_macro.S"
#ifdef __APPLE__
--- a/codec/decoder/core/arm64/block_add_aarch64_neon.S
+++ b/codec/decoder/core/arm64/block_add_aarch64_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON_AARCH64
-.text
#include "arm_arch64_common_macro.S"
#ifdef __APPLE__
.macro ROW_TRANSFORM_1_STEP
--- a/codec/decoder/core/arm64/intra_pred_aarch64_neon.S
+++ b/codec/decoder/core/arm64/intra_pred_aarch64_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON_AARCH64
-.text
#include "arm_arch64_common_macro.S"
// for Luma 4x4
--- a/codec/encoder/core/arm/intra_pred_neon.S
+++ b/codec/encoder/core/arm/intra_pred_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON
-.text
#include "arm_arch_common_macro.S"
--- a/codec/encoder/core/arm/intra_pred_sad_3_opt_neon.S
+++ b/codec/encoder/core/arm/intra_pred_sad_3_opt_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON
-.text
#include "arm_arch_common_macro.S"
--- a/codec/encoder/core/arm/memory_neon.S
+++ b/codec/encoder/core/arm/memory_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON
-.text
#include "arm_arch_common_macro.S"
--- a/codec/encoder/core/arm/pixel_neon.S
+++ b/codec/encoder/core/arm/pixel_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON
-.text
#include "arm_arch_common_macro.S"
.macro SATD_16x4
--- a/codec/encoder/core/arm/reconstruct_neon.S
+++ b/codec/encoder/core/arm/reconstruct_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON
-.text
#include "arm_arch_common_macro.S"
#ifdef __APPLE__
--- a/codec/encoder/core/arm/svc_motion_estimation.S
+++ b/codec/encoder/core/arm/svc_motion_estimation.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON
-.text
#include "arm_arch_common_macro.S"
--- a/codec/encoder/core/arm64/intra_pred_aarch64_neon.S
+++ b/codec/encoder/core/arm64/intra_pred_aarch64_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON_AARCH64
-.text
#include "arm_arch64_common_macro.S"
// for Luma 4x4
--- a/codec/encoder/core/arm64/intra_pred_sad_3_opt_aarch64_neon.S
+++ b/codec/encoder/core/arm64/intra_pred_sad_3_opt_aarch64_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON_AARCH64
-.text
#include "arm_arch64_common_macro.S"
.macro LOAD_LUMA_DATA
--- a/codec/encoder/core/arm64/memory_aarch64_neon.S
+++ b/codec/encoder/core/arm64/memory_aarch64_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON_AARCH64
-.text
#include "arm_arch64_common_macro.S"
--- a/codec/encoder/core/arm64/pixel_aarch64_neon.S
+++ b/codec/encoder/core/arm64/pixel_aarch64_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON_AARCH64
-.text
#include "arm_arch64_common_macro.S"
.macro CALC_AND_STORE_SAD
--- a/codec/encoder/core/arm64/reconstruct_aarch64_neon.S
+++ b/codec/encoder/core/arm64/reconstruct_aarch64_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON_AARCH64
-.text
#include "arm_arch64_common_macro.S"
#ifdef __APPLE__
--- a/codec/encoder/core/arm64/svc_motion_estimation_aarch64_neon.S
+++ b/codec/encoder/core/arm64/svc_motion_estimation_aarch64_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON_AARCH64
-.text
#include "arm_arch64_common_macro.S"
WELS_ASM_AARCH64_FUNC_BEGIN SumOf8x8SingleBlock_AArch64_neon
@@ -334,4 +333,4 @@
subs x2, x2, #1
cbnz x2, _hash_height_loop
WELS_ASM_AARCH64_FUNC_END
-#endif
\ No newline at end of file
+#endif
--- a/codec/processing/src/arm/adaptive_quantization.S
+++ b/codec/processing/src/arm/adaptive_quantization.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON
-.text
#include "arm_arch_common_macro.S"
#ifdef __APPLE__
--- a/codec/processing/src/arm/down_sample_neon.S
+++ b/codec/processing/src/arm/down_sample_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON
-.text
#include "arm_arch_common_macro.S"
--- a/codec/processing/src/arm/pixel_sad_neon.S
+++ b/codec/processing/src/arm/pixel_sad_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON
-.text
#include "arm_arch_common_macro.S"
--- a/codec/processing/src/arm/vaa_calc_neon.S
+++ b/codec/processing/src/arm/vaa_calc_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON
-.text
#include "arm_arch_common_macro.S"
#ifdef __APPLE__
--- a/codec/processing/src/arm64/adaptive_quantization_aarch64_neon.S
+++ b/codec/processing/src/arm64/adaptive_quantization_aarch64_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON_AARCH64
-.text
#include "arm_arch64_common_macro.S"
WELS_ASM_AARCH64_FUNC_BEGIN SampleVariance16x16_AArch64_neon
ld1 {v1.16b}, [x0], x1 //save the ref data (16bytes)--- a/codec/processing/src/arm64/down_sample_aarch64_neon.S
+++ b/codec/processing/src/arm64/down_sample_aarch64_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON_AARCH64
-.text
#include "arm_arch64_common_macro.S"
WELS_ASM_AARCH64_FUNC_BEGIN DyadicBilinearDownsampler_AArch64_neon
@@ -223,4 +222,4 @@
WELS_ASM_AARCH64_FUNC_END
-#endif
\ No newline at end of file
+#endif
--- a/codec/processing/src/arm64/pixel_sad_aarch64_neon.S
+++ b/codec/processing/src/arm64/pixel_sad_aarch64_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON_AARCH64
-.text
#include "arm_arch64_common_macro.S"
WELS_ASM_AARCH64_FUNC_BEGIN WelsProcessingSampleSad8x8_AArch64_neon
@@ -47,4 +46,4 @@
fmov w0, s2
WELS_ASM_AARCH64_FUNC_END
-#endif
\ No newline at end of file
+#endif
--- a/codec/processing/src/arm64/vaa_calc_aarch64_neon.S
+++ b/codec/processing/src/arm64/vaa_calc_aarch64_neon.S
@@ -31,7 +31,6 @@
*/
#ifdef HAVE_NEON_AARCH64
-.text
#include "arm_arch64_common_macro.S"
#ifdef __APPLE__