ARM Skia NEON patches - 04 - Clean SkFixed / SkLONGLONG

include/core/SkFixed.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkFixed_DEFINED
@@ skipping 102 matching lines @@
 #define SkFixedFloorToFixed(x)  ((x) & 0xFFFF0000)
 
 // DEPRECATED
 #define SkFixedFloor(x)     SkFixedFloorToInt(x)
 #define SkFixedCeil(x)      SkFixedCeilToInt(x)
 #define SkFixedRound(x)     SkFixedRoundToInt(x)
 
 #define SkFixedAbs(x)       SkAbs32(x)
 #define SkFixedAve(a, b)    (((a) + (b)) >> 1)
 
-SkFixed SkFixedMul_portable(SkFixed, SkFixed);
-SkFract SkFractMul_portable(SkFract, SkFract);
-inline SkFixed SkFixedSquare_portable(SkFixed value)
-{
-    uint32_t a = SkAbs32(value);
-    uint32_t ah = a >> 16;
-    uint32_t al = a & 0xFFFF;
-    SkFixed result = ah * a + al * ah + (al * al >> 16);
-    if (result >= 0)
-        return result;
-    else // Overflow.
-        return SK_FixedMax;
-}
-
 #define SkFixedDiv(numer, denom)    SkDivBits(numer, denom, 16)
 SkFixed SkFixedDivInt(int32_t numer, int32_t denom);
 SkFixed SkFixedMod(SkFixed numer, SkFixed denom);
 #define SkFixedInvert(n)            SkDivBits(SK_Fixed1, n, 16)
 SkFixed SkFixedFastInvert(SkFixed n);
 #define SkFixedSqrt(n)              SkSqrtBits(n, 23)
 SkFixed SkFixedMean(SkFixed a, SkFixed b);  //*< returns sqrt(x*y)
 int SkFixedMulCommon(SkFixed, int , int bias);  // internal used by SkFixedMulFloor, SkFixedMulCeil, SkFixedMulRound
 
 #define SkFractDiv(numer, denom)    SkDivBits(numer, denom, 30)
@@ skipping 15 matching lines @@
 SkFixed SkFixedLog(SkFixed);
 
 #define SK_FixedNearlyZero          (SK_Fixed1 >> 12)
 
 inline bool SkFixedNearlyZero(SkFixed x, SkFixed tolerance = SK_FixedNearlyZero)
 {
     SkASSERT(tolerance > 0);
     return SkAbs32(x) < tolerance;
 }
 
+inline SkFixed SkFixedMul_longlong(SkFixed a, SkFixed b)
+{
+    return (SkFixed)((int64_t)a * b >> 16);
+}
+
+inline SkFract SkFractMul_longlong(SkFract a, SkFract b)
+{
+    return (SkFract)((int64_t)a * b >> 30);
+}
+
+inline SkFixed SkFixedSquare_longlong(SkFixed value)
+{
+    return (SkFixed)((int64_t)value * value >> 16);
+}
+
+#define SkFixedMul(a,b)     SkFixedMul_longlong(a,b)
+#define SkFractMul(a,b)     SkFractMul_longlong(a,b)
+#define SkFixedSquare(a)    SkFixedSquare_longlong(a)
+
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 // Now look for ASM overrides for our portable versions (should consider putting this in its own file)
 
-#ifdef SkLONGLONG
-    inline SkFixed SkFixedMul_longlong(SkFixed a, SkFixed b)
-    {
-        return (SkFixed)((SkLONGLONG)a * b >> 16);
-    }
-    inline SkFract SkFractMul_longlong(SkFract a, SkFract b)
-    {
-        return (SkFract)((SkLONGLONG)a * b >> 30);
-    }
-    inline SkFixed SkFixedSquare_longlong(SkFixed value)
-    {
-        return (SkFixed)((SkLONGLONG)value * value >> 16);
-    }
-    #define SkFixedMul(a,b)     SkFixedMul_longlong(a,b)
-    #define SkFractMul(a,b)     SkFractMul_longlong(a,b)
-    #define SkFixedSquare(a)    SkFixedSquare_longlong(a)
-#endif
-
 #if defined(SK_CPU_ARM)
     /* This guy does not handle NaN or other obscurities, but is faster than
        than (int)(x*65536)
     */
     inline SkFixed SkFloatToFixed_arm(float x)
     {
         register int32_t y, z;
         asm("movs    %1, %3, lsl #1         \n"
             "mov     %2, #0x8E              \n"
             "sub     %1, %2, %1, lsr #24    \n"
@@ skipping 52 matching lines @@
 
     #undef SkFloatToFixed
     #define SkFloatToFixed(x)  SkFloatToFixed_arm(x)
 #endif
 
 /////////////////////// Now define our macros to the portable versions if they weren't overridden
 
 #ifndef SkFixedSquare
     #define SkFixedSquare(x)    SkFixedSquare_portable(x)
 #endif
-#ifndef SkFixedMul
-    #define SkFixedMul(x, y)    SkFixedMul_portable(x, y)
-#endif
-#ifndef SkFractMul
-    #define SkFractMul(x, y)    SkFractMul_portable(x, y)
-#endif
 #ifndef SkFixedMulAdd
     #define SkFixedMulAdd(x, y, a)  (SkFixedMul(x, y) + (a))
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
 typedef int64_t SkFixed48;
 
 #define SkIntToFixed48(x)       ((SkFixed48)(x) << 48)
 #define SkFixed48ToInt(x)       ((int)((x) >> 48))
 #define SkFixedToFixed48(x)     ((SkFixed48)(x) << 32)
 #define SkFixed48ToFixed(x)     ((SkFixed)((x) >> 32))
 #define SkFloatToFixed48(x)     ((SkFixed48)((x) * (65536.0f * 65536.0f * 65536.0f)))
 
 #ifdef SK_SCALAR_IS_FLOAT
     #define SkScalarToFixed48(x)    SkFloatToFixed48(x)
 #else
     #define SkScalarToFixed48(x)    SkFixedToFixed48(x)
 #endif
 
 #endif