AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix SkBlitRow_opts_arm so that it works on ARM v4t.

Browse Source 
Original Mozilla bug: https://bugzilla.mozilla.org/show_bug.cgi?id=901208

R=reed@google.com, mtklein@google.com, reed1
BUG=skia:

Author: george@mozilla.com

Review URL: https://codereview.chromium.org/337853003
This commit is contained in:
george 2014-06-20 12:03:35 -07:00 committed by Commit bot
parent 9eb182ac4b
commit bf1850ec7e
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/opts/SkBlitRow_opts_arm.cpp
View File

@ -37,7 +37,9 @@ static void S32A_D565_Opaque(uint16_t* SK_RESTRICT dst,
"and r4, r3, #0x0000f8 \n\t"
"and r5, r3, #0x00fc00 \n\t"
"and r6, r3, #0xf80000 \n\t"
#ifdef SK_ARM_HAS_EDSP
"pld [r1, #32] \n\t"
#endif
"lsl r3, r4, #8 \n\t"
"orr r3, r3, r5, lsr #5 \n\t"
"orr r3, r3, r6, lsr #19 \n\t"
@ -51,13 +53,15 @@ static void S32A_D565_Opaque(uint16_t* SK_RESTRICT dst,
"ldrh r4, [%[dst]] \n\t"
"rsb r7, r7, #255 \n\t"
"and r6, r4, #0x001f \n\t"
#if SK_ARM_ARCH == 6
#if SK_ARM_ARCH <= 6
"lsl r5, r4, #21 \n\t"
"lsr r5, r5, #26 \n\t"
#else
"ubfx r5, r4, #5, #6 \n\t"
#endif
#ifdef SK_ARM_HAS_EDSP
"pld [r0, #16] \n\t"
#endif
"lsr r4, r4, #11 \n\t"
#ifdef SK_ARM_HAS_EDSP
"smulbb r6, r6, r7 \n\t"
@ -68,8 +72,14 @@ static void S32A_D565_Opaque(uint16_t* SK_RESTRICT dst,
"mul r5, r5, r7 \n\t"
"mul r4, r4, r7 \n\t"
#endif
#if SK_ARM_ARCH >= 6
"uxtb r7, r3, ROR #16 \n\t"
"uxtb ip, r3, ROR #8 \n\t"
#else
"mov ip, #0xff \n\t"
"and r7, ip, r3, ROR #16 \n\t"
"and ip, ip, r3, ROR #8 \n\t"
#endif
"and r3, r3, #0xff \n\t"
"add r6, r6, #16 \n\t"
"add r5, r5, #32 \n\t"
@ -86,7 +96,9 @@ static void S32A_D565_Opaque(uint16_t* SK_RESTRICT dst,
"orr r6, r6, r5, lsl #3 \n\t"
"orr r4, r6, r4, lsl #8 \n\t"
"strh r4, [%[dst]], #2 \n\t"
#ifdef SK_ARM_HAS_EDSP
"pld [r1, #32] \n\t"
#endif
"subs %[count], %[count], #1 \n\t"
"bne 1b \n\t"
"b 4f \n\t"