ARM Skia NEON patches - 04 - Clean SkFixed / SkLONGLONG

src/core/SkMath.cpp

 /*
  * Copyright 2008 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.
  */
 
 #include "SkMathPriv.h"
 #include "SkCordic.h"
 #include "SkFloatBits.h"
@@ skipping 113 matching lines @@
     }
 }
 
 SkFixed SkFixedMul_portable(SkFixed a, SkFixed b) {
 #if 0
     Sk64    tmp;
 
     tmp.setMul(a, b);
     tmp.shiftRight(16);
     return tmp.fLo;
-#elif defined(SkLONGLONG)

[djsollen, 2013/07/15 12:16:12]

in include/core/SkPostConfig.h we define SkLONGLONG on both windows and mac.

[kevin.petit.not.used.account, 2013/07/15 13:51:24]

Yes but in this case, and unless I've missed something, the code
at include/core/SkFixed.h:175 is used. The comment just above may
also be worth a look.

-    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;
@@ skipping 356 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkFixed SkFixedTan(SkFixed radians) { return SkCordicTan(radians); }
 SkFixed SkFixedASin(SkFixed x) { return SkCordicASin(x); }
 SkFixed SkFixedACos(SkFixed x) { return SkCordicACos(x); }
 SkFixed SkFixedATan2(SkFixed y, SkFixed x) { return SkCordicATan2(y, x); }
 SkFixed SkFixedExp(SkFixed x) { return SkCordicExp(x); }
 SkFixed SkFixedLog(SkFixed x) { return SkCordicLog(x); }