diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2015-08-19 15:25:00 -0700 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2015-08-19 15:25:00 -0700 |
| commit | 01ce4e0dfd73d2ec550e2efdb4fb228ca836083d (patch) | |
| tree | 79b172eedb64b17be773e36b13875c95a3ab56d0 | |
| parent | 9f3436c3b153b55257caca0345c8135514b26945 (diff) | |
| parent | 0fa7bb8caa7a1785591f4c17d37ddb9130560b34 (diff) | |
| download | jpeg-brillo-m7-dev.tar.gz | |
resolved conflicts for merge of 0fa7bb8c to mnc-dev-plus-aospbrillo-m7-releasebrillo-m7-mr-devbrillo-m7-dev
Change-Id: I5aee0816a8ab0d531df88bffd70c6c91e07ebdfb
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | armv6_idct.S | 17 | ||||
| -rw-r--r-- | jsimd_arm_neon.S | 5 |
3 files changed, 8 insertions, 17 deletions
@@ -15,9 +15,6 @@ LOCAL_SRC_FILES := \ LOCAL_SRC_FILES_arm += armv6_idct.S -# jsimd_arm_neon.S does not compile with clang. -LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as - ifneq (,$(TARGET_BUILD_APPS)) # unbundled branch, built against NDK. LOCAL_SDK_VERSION := 17 diff --git a/armv6_idct.S b/armv6_idct.S index 843c2dd..51d62e6 100644 --- a/armv6_idct.S +++ b/armv6_idct.S @@ -61,10 +61,10 @@ // void armv6_idct(short *coefs, int *quans, unsigned char *rows, int col) .arm + .syntax unified .text .align .global armv6_idct - .func armv6_idct armv6_idct: // Push everything except sp (r13) and pc (r15). @@ -97,9 +97,9 @@ pass1_head: // Check if ACs are all zero. cmp r0, #0 - orreqs r8, r1, r2 - orreqs r8, r3, r5 - orreqs r8, r6, r7 + orrseq r8, r1, r2 + orrseq r8, r3, r5 + orrseq r8, r6, r7 beq pass1_zero // Step 1: Dequantizations. @@ -128,8 +128,8 @@ pass1_head: mla r1, r10, r1, r7 mla r3, r11, r3, r5 - // Load constants. - ldrd r10, constants + // Load constants to r10, r11. + ldrd r10, r11, constants // Step 2: Rotations and Butterflies. @@ -230,8 +230,8 @@ pass1_tail: ldr r12, [sp, #256] ldr r14, [sp, #260] - // Load constants. - ldrd r10, constants + // Load constants to r10, r11. + ldrd r10, r11, constants pass2_head: // Load coefficients. (c[0, 1, 2, 3, 4, 5, 6, 7]) @@ -355,4 +355,3 @@ pass2_tail: ldmia sp!, {r4, r5, r6, r7, r8, r9, r10, r11, r12, r14} bx lr - .endfunc diff --git a/jsimd_arm_neon.S b/jsimd_arm_neon.S index cc0d540..04fd9b2 100644 --- a/jsimd_arm_neon.S +++ b/jsimd_arm_neon.S @@ -67,7 +67,6 @@ /* Supplementary macro for setting function attributes */ .macro asm_function fname - .func \fname .global \fname #ifdef __ELF__ .hidden \fname @@ -278,7 +277,6 @@ asm_function jsimd_idct_ifast_neon .unreq OUTPUT_BUF .unreq OUTPUT_COL .unreq TMP -.endfunc .purgem idct_helper @@ -493,7 +491,6 @@ asm_function jsimd_idct_4x4_neon .unreq TMP2 .unreq TMP3 .unreq TMP4 -.endfunc .purgem idct_helper @@ -641,7 +638,6 @@ asm_function jsimd_idct_2x2_neon .unreq OUTPUT_COL .unreq TMP1 .unreq TMP2 -.endfunc .purgem idct_helper @@ -896,7 +892,6 @@ asm_function jsimd_ycc_\colorid\()_convert_neon .unreq U .unreq V .unreq N -.endfunc .purgem do_yuv_to_rgb |