diff options
| author |  george <george@mozilla.com> | 2014-06-20 12:03:35 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-20 12:03:35 -0700 |
| commit | bf1850ec7ec3a19093ebd3b18adb98f6f64dbfb8 (patch) | |
| tree | 0aedb3697cbfb43599eec000b9b587fa1d71718d /src | |
| parent | 9eb182ac4bcdc38f71a603ba958ff889fbbf5d77 (diff) | |
Fix SkBlitRow_opts_arm so that it works on ARM v4t.
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/opts/SkBlitRow_opts_arm.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/opts/SkBlitRow_opts_arm.cpp b/src/opts/SkBlitRow_opts_arm.cpp index 34b8564723..473a3e91b1 100644 --- a/src/opts/SkBlitRow_opts_arm.cpp +++ b/src/opts/SkBlitRow_opts_arm.cpp @@ -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" |