diff options
| author | Chih-hung Hsieh <chh@google.com> | 2014-12-02 00:36:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-02 00:36:19 +0000 |
| commit | fac3e2390c61f3ea2364b8645b4a351f5f7feb3b (patch) | |
| tree | fd8f62ba0f2a65cf2c154a15edeb51106ecef789 | |
| parent | ec362f68e62dfa89ee9f4063b17774857a2be9e8 (diff) | |
| parent | 9bc988dadc2fb0a129e085882a09e8a370cba680 (diff) | |
| download | skia-android-wear-5.1.1_r1.tar.gz | |
am 9bc988da: Merge "Fix assembly code for clang"android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewmaster-soong
* commit '9bc988dadc2fb0a129e085882a09e8a370cba680':
Fix assembly code for clang
| -rw-r--r-- | src/opts/SkBlitRow_opts_arm_neon.cpp | 2 | ||||
| -rw-r--r-- | src/opts/memset16_neon.S | 5 | ||||
| -rw-r--r-- | src/opts/memset32_neon.S | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/opts/SkBlitRow_opts_arm_neon.cpp b/src/opts/SkBlitRow_opts_arm_neon.cpp index 01a6a2aa74..b2549f8aa4 100644 --- a/src/opts/SkBlitRow_opts_arm_neon.cpp +++ b/src/opts/SkBlitRow_opts_arm_neon.cpp @@ -299,7 +299,7 @@ void S32A_D565_Opaque_neon(uint16_t* SK_RESTRICT dst, "11: \n\t" // unzips achieve the same as a vld4 operation - "vuzpq.u16 q0, q1 \n\t" + "vuzp.u16 q0, q1 \n\t" "vuzp.u8 d0, d1 \n\t" "vuzp.u8 d2, d3 \n\t" // expand 0565 q12 to 8888 {d4-d7} diff --git a/src/opts/memset16_neon.S b/src/opts/memset16_neon.S index b1719fa1fa..4546344380 100644 --- a/src/opts/memset16_neon.S +++ b/src/opts/memset16_neon.S @@ -15,11 +15,11 @@ ***************************************************************************/ + .syntax unified .code 32 .fpu neon .align 4 .globl memset16_neon - .func memset16_neon: cmp r2, #0 @@ -70,7 +70,7 @@ memset_gt4: strcs r1, [r0], #4 strcs r1, [r0], #4 lsls r12, r12, #2 - strcsh r1, [r0], #2 + strhcs r1, [r0], #2 memset_route: /* * Decide where to route for the maximum copy sizes. Note that we @@ -139,5 +139,4 @@ memset_end: pop {r0} bx lr - .endfunc .end diff --git a/src/opts/memset32_neon.S b/src/opts/memset32_neon.S index a9eaa0e830..723ab13336 100644 --- a/src/opts/memset32_neon.S +++ b/src/opts/memset32_neon.S @@ -5,11 +5,11 @@ * found in the LICENSE file. ***************************************************************************/ + .syntax unified .code 32 .fpu neon .align 4 .globl memset32_neon - .func /* r0 = buffer, r1 = value, r2 = times to write */ memset32_neon: @@ -109,5 +109,4 @@ memset32_dropthru: str r1, [r0, #0] bx lr - .endfunc .end |