diff options
| author |  mtklein <mtklein@chromium.org> | 2014-06-03 12:07:31 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-03 12:07:31 -0700 |
| commit | 3a2682a77f996f649de7699c9f7bee046c6d4f17 (patch) | |
| tree | 604c10a616880247b9f08fb76d395a2ea0832fa8 /include/core | |
| parent | 1800b1f51e48c186870e7687e33648a0b1cfa389 (diff) | |
SK_CPU_ARM --> SK_CPU_ARM32
That's what it means. It keeps confusing us as named today.
BUG=skia:
R=djsollen@google.com, mtklein@google.com, reed@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/314643004
Diffstat (limited to 'include/core')
| -rw-r--r-- | include/core/SkFixed.h | 2 | ||||
| -rw-r--r-- | include/core/SkMath.h | 6 | ||||
| -rw-r--r-- | include/core/SkPostConfig.h | 2 | ||||
| -rw-r--r-- | include/core/SkPreConfig.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/core/SkFixed.h b/include/core/SkFixed.h index a16adacccf..6f168c8edd 100644 --- a/include/core/SkFixed.h +++ b/include/core/SkFixed.h @@ -105,7 +105,7 @@ static inline SkFixed SkFixedCos(SkFixed radians) { #define SkFixedMul(a,b) SkFixedMul_longlong(a,b) #endif -#if defined(SK_CPU_ARM) +#if defined(SK_CPU_ARM32) /* This guy does not handle NaN or other obscurities, but is faster than than (int)(x*65536). When built on Android with -Os, needs forcing to inline or we lose the speed benefit. diff --git a/include/core/SkMath.h b/include/core/SkMath.h index fe968fd179..014f014deb 100644 --- a/include/core/SkMath.h +++ b/include/core/SkMath.h @@ -84,7 +84,7 @@ int SkCLZ_portable(uint32_t); return 32; } } - #elif defined(SK_CPU_ARM) || defined(__GNUC__) || defined(__clang__) + #elif defined(SK_CPU_ARM32) || defined(__GNUC__) || defined(__clang__) static inline int SkCLZ(uint32_t mask) { // __builtin_clz(0) is undefined, so we have to detect that case. return mask ? __builtin_clz(mask) : 32; @@ -209,7 +209,7 @@ static inline U8CPU SkMulDiv255Round(U16CPU a, U16CPU b) { */ template <typename In, typename Out> inline void SkTDivMod(In numer, In denom, Out* div, Out* mod) { -#ifdef SK_CPU_ARM +#ifdef SK_CPU_ARM32 // If we wrote this as in the else branch, GCC won't fuse the two into one // divmod call, but rather a div call followed by a divmod. Silly! This // version is just as fast as calling __aeabi_[u]idivmod manually, but with @@ -223,7 +223,7 @@ inline void SkTDivMod(In numer, In denom, Out* div, Out* mod) { // On x86 this will just be a single idiv. *div = static_cast<Out>(numer/denom); *mod = static_cast<Out>(numer%denom); -#endif // SK_CPU_ARM +#endif } #endif diff --git a/include/core/SkPostConfig.h b/include/core/SkPostConfig.h index d4d9857d87..2060789c99 100644 --- a/include/core/SkPostConfig.h +++ b/include/core/SkPostConfig.h @@ -400,7 +400,7 @@ #endif #ifndef SK_BARRIERS_PLATFORM_H -# if defined(SK_CPU_ARM) || defined(SK_CPU_ARM64) +# if defined(SK_CPU_ARM32) || defined(SK_CPU_ARM64) # define SK_BARRIERS_PLATFORM_H "../../src/ports/SkBarriers_arm.h" # else # define SK_BARRIERS_PLATFORM_H "../../src/ports/SkBarriers_x86.h" diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h index cf43be39d2..c7331113dc 100644 --- a/include/core/SkPreConfig.h +++ b/include/core/SkPreConfig.h @@ -162,7 +162,7 @@ // ARM defines #if defined(__arm__) && (!defined(__APPLE__) || !TARGET_IPHONE_SIMULATOR) - #define SK_CPU_ARM + #define SK_CPU_ARM32 #if defined(__GNUC__) #if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \ |