ARM Skia NEON patches - 04 - Clean SkFixed / SkLONGLONG

It removes SkLONGLONG and uses int64_t to implement the  SkFixed
operations for which a SkLONGLONG version existed. It also
removes the 32 bit version that are being replaced.

BUG=
R=djsollen@google.com, reed@google.com

Author: kevin.petit.arm@gmail.com

Review URL: https://chromiumcodereview.appspot.com/18539004

git-svn-id: http://skia.googlecode.com/svn/trunk/src@10705 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/core/Sk64.cpp b/core/Sk64.cpp
index 7c195ce..2061ebb 100644
--- a/core/Sk64.cpp
+++ b/core/Sk64.cpp
@@ -299,15 +299,6 @@
     return root;
 }
 
-#ifdef SkLONGLONG
-    SkLONGLONG Sk64::getLongLong() const
-    {
-        SkLONGLONG value = fHi;
-        value <<= 32;
-        return value | fLo;
-    }
-#endif
-
 SkFixed Sk64::getFixedDiv(const Sk64& denom) const
 {
     Sk64    N = *this;
diff --git a/core/SkMath.cpp b/core/SkMath.cpp
index 2693e5c..6c6c6d5 100644
--- a/core/SkMath.cpp
+++ b/core/SkMath.cpp
@@ -105,71 +105,6 @@
     }
 }
 
-SkFixed SkFixedMul_portable(SkFixed a, SkFixed b) {
-#if 0
-    Sk64    tmp;
-
-    tmp.setMul(a, b);
-    tmp.shiftRight(16);
-    return tmp.fLo;
-#elif defined(SkLONGLONG)
-    return static_cast<SkFixed>((SkLONGLONG)a * b >> 16);
-#else
-    int sa = SkExtractSign(a);
-    int sb = SkExtractSign(b);
-    // now make them positive
-    a = SkApplySign(a, sa);
-    b = SkApplySign(b, sb);
-
-    uint32_t    ah = a >> 16;
-    uint32_t    al = a & 0xFFFF;
-    uint32_t bh = b >> 16;
-    uint32_t bl = b & 0xFFFF;
-
-    uint32_t R = ah * b + al * bh + (al * bl >> 16);
-
-    return SkApplySign(R, sa ^ sb);
-#endif
-}
-
-SkFract SkFractMul_portable(SkFract a, SkFract b) {
-#if 0
-    Sk64 tmp;
-    tmp.setMul(a, b);
-    return tmp.getFract();
-#elif defined(SkLONGLONG)
-    return static_cast<SkFract>((SkLONGLONG)a * b >> 30);
-#else
-    int sa = SkExtractSign(a);
-    int sb = SkExtractSign(b);
-    // now make them positive
-    a = SkApplySign(a, sa);
-    b = SkApplySign(b, sb);
-
-    uint32_t ah = a >> 16;
-    uint32_t al = a & 0xFFFF;
-    uint32_t bh = b >> 16;
-    uint32_t bl = b & 0xFFFF;
-
-    uint32_t A = ah * bh;
-    uint32_t B = ah * bl + al * bh;
-    uint32_t C = al * bl;
-
-    /*  [  A  ]
-           [  B  ]
-              [  C  ]
-    */
-    uint32_t Lo = C + (B << 16);
-    uint32_t Hi = A + (B >>16) + (Lo < C);
-
-    SkASSERT((Hi >> 29) == 0);  // else overflow
-
-    int32_t R = (Hi << 2) + (Lo >> 30);
-
-    return SkApplySign(R, sa ^ sb);
-#endif
-}
-
 int SkFixedMulCommon(SkFixed a, int b, int bias) {
     // this function only works if b is 16bits
     SkASSERT(b == (int16_t)b);