michael@0: diff --git a/gfx/skia/src/opts/SkBlitRow_opts_arm.cpp b/gfx/skia/src/opts/SkBlitRow_opts_arm.cpp
michael@0: --- a/gfx/skia/src/opts/SkBlitRow_opts_arm.cpp
michael@0: +++ b/gfx/skia/src/opts/SkBlitRow_opts_arm.cpp
michael@0: @@ -26,66 +26,78 @@ static void S32A_D565_Opaque(uint16_t* S
michael@0:      asm volatile (
michael@0:                    "1:                                   \n\t"
michael@0:                    "ldr     r3, [%[src]], #4             \n\t"
michael@0:                    "cmp     r3, #0xff000000              \n\t"
michael@0:                    "blo     2f                           \n\t"
michael@0:                    "and     r4, r3, #0x0000f8            \n\t"
michael@0:                    "and     r5, r3, #0x00fc00            \n\t"
michael@0:                    "and     r6, r3, #0xf80000            \n\t"
michael@0: +#ifdef SK_ARM_HAS_EDSP
michael@0:                    "pld     [r1, #32]                    \n\t"
michael@0: +#endif
michael@0:                    "lsl     r3, r4, #8                   \n\t"
michael@0:                    "orr     r3, r3, r5, lsr #5           \n\t"
michael@0:                    "orr     r3, r3, r6, lsr #19          \n\t"
michael@0:                    "subs    %[count], %[count], #1       \n\t"
michael@0:                    "strh    r3, [%[dst]], #2             \n\t"
michael@0:                    "bne     1b                           \n\t"
michael@0:                    "b       4f                           \n\t"
michael@0:                    "2:                                   \n\t"
michael@0:                    "lsrs    r7, r3, #24                  \n\t"
michael@0:                    "beq     3f                           \n\t"
michael@0:                    "ldrh    r4, [%[dst]]                 \n\t"
michael@0:                    "rsb     r7, r7, #255                 \n\t"
michael@0:                    "and     r6, r4, #0x001f              \n\t"
michael@0: -#if SK_ARM_ARCH == 6
michael@0: +#if SK_ARM_ARCH <= 6
michael@0:                    "lsl     r5, r4, #21                  \n\t"
michael@0:                    "lsr     r5, r5, #26                  \n\t"
michael@0:  #else
michael@0:                    "ubfx    r5, r4, #5, #6               \n\t"
michael@0:  #endif
michael@0: +#ifdef SK_ARM_HAS_EDSP
michael@0:                    "pld     [r0, #16]                    \n\t"
michael@0: +#endif
michael@0:                    "lsr     r4, r4, #11                  \n\t"
michael@0:  #ifdef SK_ARM_HAS_EDSP
michael@0:                    "smulbb  r6, r6, r7                   \n\t"
michael@0:                    "smulbb  r5, r5, r7                   \n\t"
michael@0:                    "smulbb  r4, r4, r7                   \n\t"
michael@0:  #else
michael@0:                    "mul     r6, r6, r7                   \n\t"
michael@0:                    "mul     r5, r5, r7                   \n\t"
michael@0:                    "mul     r4, r4, r7                   \n\t"
michael@0:  #endif
michael@0: +#if SK_ARM_ARCH >= 6
michael@0:                    "uxtb    r7, r3, ROR #16              \n\t"
michael@0:                    "uxtb    ip, r3, ROR #8               \n\t"
michael@0: +#else
michael@0: +                  "mov     ip, #0xff                    \n\t"
michael@0: +                  "and     r7, ip, r3, ROR #16          \n\t"
michael@0: +                  "and     ip, ip, r3, ROR #8           \n\t"
michael@0: +#endif
michael@0:                    "and     r3, r3, #0xff                \n\t"
michael@0:                    "add     r6, r6, #16                  \n\t"
michael@0:                    "add     r5, r5, #32                  \n\t"
michael@0:                    "add     r4, r4, #16                  \n\t"
michael@0:                    "add     r6, r6, r6, lsr #5           \n\t"
michael@0:                    "add     r5, r5, r5, lsr #6           \n\t"
michael@0:                    "add     r4, r4, r4, lsr #5           \n\t"
michael@0:                    "add     r6, r7, r6, lsr #5           \n\t"
michael@0:                    "add     r5, ip, r5, lsr #6           \n\t"
michael@0:                    "add     r4, r3, r4, lsr #5           \n\t"
michael@0:                    "lsr     r6, r6, #3                   \n\t"
michael@0:                    "and     r5, r5, #0xfc                \n\t"
michael@0:                    "and     r4, r4, #0xf8                \n\t"
michael@0:                    "orr     r6, r6, r5, lsl #3           \n\t"
michael@0:                    "orr     r4, r6, r4, lsl #8           \n\t"
michael@0:                    "strh    r4, [%[dst]], #2             \n\t"
michael@0: +#ifdef SK_ARM_HAS_EDSP
michael@0:                    "pld     [r1, #32]                    \n\t"
michael@0: +#endif
michael@0:                    "subs    %[count], %[count], #1       \n\t"
michael@0:                    "bne     1b                           \n\t"
michael@0:                    "b       4f                           \n\t"
michael@0:                    "3:                                   \n\t"
michael@0:                    "subs    %[count], %[count], #1       \n\t"
michael@0:                    "add     %[dst], %[dst], #2           \n\t"
michael@0:                    "bne     1b                           \n\t"
michael@0:                    "4:                                   \n\t"