From c2a6c58c69c56f296b651ddc4006efe817de9e90 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Thu, 14 May 2015 16:36:18 -0700 Subject: Use standard arm assembly syntax. The output from gcc before and after this change, and from llvm are identical, except the ADRL to ADR change. In this case, old "ADRL r8, Table" is translated into add r8, pc, #1184 ; 0x4a0 nop ; (mov r0, r0) and new "ADR r8, Table; NOP" is translated into equivalent: add r8, pc, #1184 ; 0x4a0 nop {0} BUG: 21169627 Change-Id: I64130e99f6506494b9c4a6e0f1f850491d481242 --- media/libstagefright/codecs/amrwbenc/Android.mk | 3 --- media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s | 2 +- media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s | 2 +- media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s | 2 +- media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Norm_Corr_opt.s | 2 +- .../libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s | 2 +- media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/convolve_opt.s | 2 +- media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s | 2 +- media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s | 5 +++-- media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/residu_asm_opt.s | 2 +- media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/scale_sig_opt.s | 2 +- media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/syn_filt_opt.s | 2 +- media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s | 2 +- media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Dot_p_neon.s | 2 +- media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s | 2 +- media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Norm_Corr_neon.s | 2 +- .../libstagefright/codecs/amrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s | 2 +- media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/convolve_neon.s | 2 +- media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/cor_h_vec_neon.s | 2 +- media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s | 2 +- media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/residu_asm_neon.s | 2 +- media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/scale_sig_neon.s | 2 +- media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/syn_filt_neon.s | 2 +- 23 files changed, 24 insertions(+), 26 deletions(-) (limited to 'media/libstagefright/codecs') diff --git a/media/libstagefright/codecs/amrwbenc/Android.mk b/media/libstagefright/codecs/amrwbenc/Android.mk index bc165cb..8ded6df 100644 --- a/media/libstagefright/codecs/amrwbenc/Android.mk +++ b/media/libstagefright/codecs/amrwbenc/Android.mk @@ -85,9 +85,6 @@ else LOCAL_C_INCLUDES_arm += $(LOCAL_PATH)/src/asm/ARMV7 endif -# ARMV5E/Filt_6k_7k_opt.s does not compile with Clang. -LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as - LOCAL_MODULE := libstagefright_amrwbenc LOCAL_ARM_MODE := arm diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s index 282db92..42ebc32 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s @@ -99,6 +99,6 @@ LOOP: LDMFD r13!, {r4 - r12, r15} @ENDP - .END + .end diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s index 4aa317e..3f060ff 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s @@ -75,6 +75,6 @@ Dot_product12_end: LDMFD r13!, {r4 - r12, r15} @ENDFUNC - .END + .end diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s index f23b5a0..9cad479 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s @@ -183,6 +183,6 @@ Filt_6k_7k_end: Lable1: .word fir_6k_7k-Lable1 @ENDFUNC - .END + .end diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Norm_Corr_opt.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Norm_Corr_opt.s index 49bdc2b..ffedbde 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Norm_Corr_opt.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Norm_Corr_opt.s @@ -226,6 +226,6 @@ Norm_corr_asm_end: ADD r13, r13, #voSTACK LDMFD r13!, {r4 - r12, r15} - .END + .end diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s index 3f4930c..9743b9e 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s @@ -221,6 +221,6 @@ Syn_filt_32_end: LDMFD r13!, {r4 - r12, r15} @ENDFUNC - .END + .end diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/convolve_opt.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/convolve_opt.s index 71bb532..cd75179 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/convolve_opt.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/convolve_opt.s @@ -181,6 +181,6 @@ Convolve_asm_end: LDMFD r13!, {r4 - r12, r15} @ENDFUNC - .END + .end diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s index 2d4c7cc..eedccc7 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s @@ -143,7 +143,7 @@ the_end: LDMFD r13!, {r4 - r12, r15} @ENDFUNC - .END + .end diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s index deb7efc..60c2a47 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s @@ -45,7 +45,8 @@ pred_lt4_asm: SUBLT r5, r5, #2 @x-- SUB r5, r5, #30 @x -= 15 RSB r4, r2, #3 @k = 3 - frac - ADRL r8, Table + ADR r8, Table + NOP @space for fixed up relative address of ADR LDR r6, [r8] ADD r6, r8 MOV r8, r4, LSL #6 @@ -456,7 +457,7 @@ pred_lt4_end: Table: .word inter4_2-Table @ENDFUNC - .END + .end diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/residu_asm_opt.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/residu_asm_opt.s index 5ff0964..d71d790 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/residu_asm_opt.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/residu_asm_opt.s @@ -220,7 +220,7 @@ end: LDMFD r13!, {r4 -r12,pc} @ENDFUNC - .END + .end diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/scale_sig_opt.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/scale_sig_opt.s index b300224..e8802f5 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/scale_sig_opt.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/scale_sig_opt.s @@ -67,7 +67,7 @@ The_end: LDMFD r13!, {r4 - r12, r15} @ENDFUNC - .END + .end diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/syn_filt_opt.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/syn_filt_opt.s index 0c287a4..2a1e0d7 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/syn_filt_opt.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/syn_filt_opt.s @@ -233,6 +233,6 @@ Syn_filt_asm_end: ADD r13, r13, #700 LDMFD r13!, {r4 - r12, r15} @ENDFUNC - .END + .end diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s index 1d5893f..91feea0 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s @@ -98,5 +98,5 @@ LOOP: LDMFD r13!, {r4 - r12, r15} - .END + .end diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Dot_p_neon.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Dot_p_neon.s index 8230944..7149a49 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Dot_p_neon.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Dot_p_neon.s @@ -123,5 +123,5 @@ Dot_product12_end: LDMFD r13!, {r4 - r12, r15} - .END + .end diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s index 8df0caa..e0f992f 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s @@ -226,6 +226,6 @@ Filt_6k_7k_end: Lable1: .word fir_6k_7k-Lable1 @ENDFUNC - .END + .end diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Norm_Corr_neon.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Norm_Corr_neon.s index 4263cd4..28e6d6c 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Norm_Corr_neon.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Norm_Corr_neon.s @@ -265,6 +265,6 @@ Norm_corr_asm_end: ADD r13, r13, #voSTACK LDMFD r13!, {r4 - r12, r15} - .END + .end diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s index e786dde..9687431 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s @@ -128,6 +128,6 @@ Syn_filt_32_end: LDMFD r13!, {r4 - r12, r15} @ENDFUNC - .END + .end diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/convolve_neon.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/convolve_neon.s index 8efa9fb..9fb3a6e 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/convolve_neon.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/convolve_neon.s @@ -174,5 +174,5 @@ Convolve_asm_end: LDMFD r13!, {r4 - r12, r15} @ENDFUNC - .END + .end diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/cor_h_vec_neon.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/cor_h_vec_neon.s index 8904289..a4deda3 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/cor_h_vec_neon.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/cor_h_vec_neon.s @@ -143,7 +143,7 @@ LOOPj2: the_end: LDMFD r13!, {r4 - r12, r15} - .END + .end diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s index 67be1ed..f8b634f 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s @@ -99,5 +99,5 @@ pred_lt4_end: Lable1: .word inter4_2-Lable1 @ENDFUNC - .END + .end diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/residu_asm_neon.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/residu_asm_neon.s index 394fa83..bc3d780 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/residu_asm_neon.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/residu_asm_neon.s @@ -122,6 +122,6 @@ Residu_asm_end: LDMFD r13!, {r4 - r12, r15} @ENDFUNC - .END + .end diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/scale_sig_neon.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/scale_sig_neon.s index e45daac..89c0572 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/scale_sig_neon.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/scale_sig_neon.s @@ -133,6 +133,6 @@ Scale_sig_asm_end: LDMFD r13!, {r4 - r12, r15} @ENDFUNC - .END + .end diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/syn_filt_neon.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/syn_filt_neon.s index 5731bdb..029560e 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/syn_filt_neon.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV7/syn_filt_neon.s @@ -101,6 +101,6 @@ Syn_filt_asm_end: ADD r13, r13, #700 LDMFD r13!, {r4 - r12, r15} @ENDFUNC - .END + .end -- cgit v1.1