michael@0: From 94916fbbc7865c6fe23a57d6edc48c6daf93dda8 Mon Sep 17 00:00:00 2001
michael@0: From: George Wright <gwright@mozilla.com>
michael@0: Date: Fri, 18 May 2012 14:16:08 -0400
michael@0: Subject: [PATCH 06/10]     Bug 755869 - [9] Re-apply bug 751814 - Various
michael@0:  Skia fixes for ARM without EDSP and ARMv6+
michael@0:  r=mattwoodrow
michael@0: 
michael@0: ---
michael@0:  gfx/skia/include/core/SkMath.h                   |    5 +--
michael@0:  gfx/skia/include/core/SkPostConfig.h             |   45 ++++++++++++++++++++++
michael@0:  gfx/skia/src/opts/SkBitmapProcState_opts_arm.cpp |    6 +-
michael@0:  gfx/skia/src/opts/SkBlitRow_opts_arm.cpp         |    9 ++++
michael@0:  4 files changed, 58 insertions(+), 7 deletions(-)
michael@0: 
michael@0: diff --git a/gfx/skia/include/core/SkMath.h b/gfx/skia/include/core/SkMath.h
michael@0: index 5889103..7a4b707 100644
michael@0: --- a/gfx/skia/include/core/SkMath.h
michael@0: +++ b/gfx/skia/include/core/SkMath.h
michael@0: @@ -153,10 +153,7 @@ static inline bool SkIsPow2(int value) {
michael@0:      With this requirement, we can generate faster instructions on some
michael@0:      architectures.
michael@0:  */
michael@0: -#if defined(__arm__) \
michael@0: -  && !defined(__thumb__) \
michael@0: -  && !defined(__ARM_ARCH_4T__) \
michael@0: -  && !defined(__ARM_ARCH_5T__)
michael@0: +#ifdef SK_ARM_HAS_EDSP
michael@0:      static inline int32_t SkMulS16(S16CPU x, S16CPU y) {
michael@0:          SkASSERT((int16_t)x == x);
michael@0:          SkASSERT((int16_t)y == y);
michael@0: diff --git a/gfx/skia/include/core/SkPostConfig.h b/gfx/skia/include/core/SkPostConfig.h
michael@0: index 041fe2a..03105e4 100644
michael@0: --- a/gfx/skia/include/core/SkPostConfig.h
michael@0: +++ b/gfx/skia/include/core/SkPostConfig.h
michael@0: @@ -311,3 +311,48 @@
michael@0:  #ifndef SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
michael@0:  #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 1
michael@0:  #endif
michael@0: +
michael@0: +//////////////////////////////////////////////////////////////////////
michael@0: +// ARM defines
michael@0: +
michael@0: +#if defined(__GNUC__) && defined(__arm__)
michael@0: +
michael@0: +#  define SK_ARM_ARCH 3
michael@0: +
michael@0: +#  if defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) \
michael@0: +   || defined(_ARM_ARCH_4)
michael@0: +#    undef SK_ARM_ARCH
michael@0: +#    define SK_ARM_ARCH 4
michael@0: +#  endif
michael@0: +
michael@0: +#  if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) \
michael@0: +   || defined(__ARM_ARCH_5E__) || defined(__ARM_ARCH_5TE__) \
michael@0: +   || defined(__ARM_ARCH_5TEJ__) || defined(_ARM_ARCH_5)
michael@0: +#    undef SK_ARM_ARCH
michael@0: +#    define SK_ARM_ARCH 5
michael@0: +#  endif
michael@0: + 
michael@0: +#  if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
michael@0: +   || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) \
michael@0: +   || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) \
michael@0: +   || defined(__ARM_ARCH_6M__) || defined(_ARM_ARCH_6)
michael@0: +#    undef SK_ARM_ARCH
michael@0: +#    define SK_ARM_ARCH 6
michael@0: +#  endif
michael@0: +
michael@0: +#  if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
michael@0: +   || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \
michael@0: +   || defined(__ARM_ARCH_7EM__) || defined(_ARM_ARCH_7)
michael@0: +#    undef SK_ARM_ARCH
michael@0: +#    define SK_ARM_ARCH 7
michael@0: +#  endif
michael@0: +
michael@0: +#  undef SK_ARM_HAS_EDSP
michael@0: +#  if defined(__thumb2__) && (SK_ARM_ARCH >= 6) \
michael@0: +   || !defined(__thumb__) \
michael@0: +   && ((SK_ARM_ARCH > 5) || defined(__ARM_ARCH_5E__) \
michael@0: +       || defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__))
michael@0: +#    define SK_ARM_HAS_EDSP 1
michael@0: +#  endif
michael@0: +
michael@0: +#endif
michael@0: diff --git a/gfx/skia/src/opts/SkBitmapProcState_opts_arm.cpp b/gfx/skia/src/opts/SkBitmapProcState_opts_arm.cpp
michael@0: index 20d62e1..deb1bfe 100644
michael@0: --- a/gfx/skia/src/opts/SkBitmapProcState_opts_arm.cpp
michael@0: +++ b/gfx/skia/src/opts/SkBitmapProcState_opts_arm.cpp
michael@0: @@ -11,7 +11,7 @@
michael@0:  #include "SkColorPriv.h"
michael@0:  #include "SkUtils.h"
michael@0:  
michael@0: -#if __ARM_ARCH__ >= 6 && !defined(SK_CPU_BENDIAN)
michael@0: +#if SK_ARM_ARCH >= 6 && !defined(SK_CPU_BENDIAN)
michael@0:  void SI8_D16_nofilter_DX_arm(
michael@0:      const SkBitmapProcState& s,
michael@0:      const uint32_t* SK_RESTRICT xy,
michael@0: @@ -182,7 +182,7 @@ void SI8_opaque_D32_nofilter_DX_arm(const SkBitmapProcState& s,
michael@0:  
michael@0:      s.fBitmap->getColorTable()->unlockColors(false);
michael@0:  }
michael@0: -#endif //__ARM_ARCH__ >= 6 && !defined(SK_CPU_BENDIAN)
michael@0: +#endif // SK_ARM_ARCH >= 6 && !defined(SK_CPU_BENDIAN)
michael@0:  
michael@0:  ///////////////////////////////////////////////////////////////////////////////
michael@0:  
michael@0: @@ -200,7 +200,7 @@ void SkBitmapProcState::platformProcs() {
michael@0:  
michael@0:      switch (fBitmap->config()) {
michael@0:          case SkBitmap::kIndex8_Config:
michael@0: -#if __ARM_ARCH__ >= 6 && !defined(SK_CPU_BENDIAN)
michael@0: +#if SK_ARM_ARCH >= 6 && !defined(SK_CPU_BENDIAN)
michael@0:              if (justDx && !doFilter) {
michael@0:  #if 0   /* crashing on android device */
michael@0:                  fSampleProc16 = SI8_D16_nofilter_DX_arm;
michael@0: diff --git a/gfx/skia/src/opts/SkBlitRow_opts_arm.cpp b/gfx/skia/src/opts/SkBlitRow_opts_arm.cpp
michael@0: index 2490371..c928888 100644
michael@0: --- a/gfx/skia/src/opts/SkBlitRow_opts_arm.cpp
michael@0: +++ b/gfx/skia/src/opts/SkBlitRow_opts_arm.cpp
michael@0: @@ -675,8 +675,13 @@ static void __attribute((noinline,optimize("-fomit-frame-pointer"))) S32A_Blend_
michael@0:                    /* dst1_scale and dst2_scale*/
michael@0:                    "lsr    r9, r5, #24                \n\t" /* src >> 24 */
michael@0:                    "lsr    r10, r6, #24               \n\t" /* src >> 24 */
michael@0: +#ifdef SK_ARM_HAS_EDSP
michael@0:                    "smulbb r9, r9, %[alpha]           \n\t" /* r9 = SkMulS16 r9 with src_scale */
michael@0:                    "smulbb r10, r10, %[alpha]         \n\t" /* r10 = SkMulS16 r10 with src_scale */
michael@0: +#else
michael@0: +                  "mul    r9, r9, %[alpha]           \n\t" /* r9 = SkMulS16 r9 with src_scale */
michael@0: +                  "mul    r10, r10, %[alpha]         \n\t" /* r10 = SkMulS16 r10 with src_scale */
michael@0: +#endif
michael@0:                    "lsr    r9, r9, #8                 \n\t" /* r9 >> 8 */
michael@0:                    "lsr    r10, r10, #8               \n\t" /* r10 >> 8 */
michael@0:                    "rsb    r9, r9, #256               \n\t" /* dst1_scale = r9 = 255 - r9 + 1 */
michael@0: @@ -745,7 +750,11 @@ static void __attribute((noinline,optimize("-fomit-frame-pointer"))) S32A_Blend_
michael@0:  
michael@0:                    "lsr    r6, r5, #24                \n\t" /* src >> 24 */
michael@0:                    "and    r8, r12, r5, lsr #8        \n\t" /* ag = r8 = r5 masked by r12 lsr by #8 */
michael@0: +#ifdef SK_ARM_HAS_EDSP
michael@0:                    "smulbb r6, r6, %[alpha]           \n\t" /* r6 = SkMulS16 with src_scale */
michael@0: +#else
michael@0: +                  "mul    r6, r6, %[alpha]           \n\t" /* r6 = SkMulS16 with src_scale */
michael@0: +#endif
michael@0:                    "and    r9, r12, r5                \n\t" /* rb = r9 = r5 masked by r12 */
michael@0:                    "lsr    r6, r6, #8                 \n\t" /* r6 >> 8 */
michael@0:                    "mul    r8, r8, %[alpha]           \n\t" /* ag = r8 times scale */
michael@0: -- 
michael@0: 1.7.5.4
michael@0: