Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 901208 - Fix Skia for ARM v4t. r=derf

Browse Source
This commit is contained in:
Mike Hommey 2014-08-04 09:04:06 +09:00
parent 3107b612d5
commit 4d34febc3f
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gfx/skia/trunk/src/opts/SkBlitRow_opts_arm.cpp
View File

@ -39,7 +39,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"
@ -53,13 +55,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"
@ -70,8 +74,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"
@ -88,7 +98,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"