diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/core/Sk64.cpp | 9 | ||||
-rw-r--r-- | src/core/SkMath.cpp | 65 |
2 files changed, 0 insertions, 74 deletions
diff --git a/src/core/Sk64.cpp b/src/core/Sk64.cpp index 7c195ce4fe..2061ebbf4f 100644 --- a/src/core/Sk64.cpp +++ b/src/core/Sk64.cpp @@ -299,15 +299,6 @@ int32_t Sk64::getSqrt() const 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/src/core/SkMath.cpp b/src/core/SkMath.cpp index 2693e5c13c..6c6c6d5670 100644 --- a/src/core/SkMath.cpp +++ b/src/core/SkMath.cpp @@ -105,71 +105,6 @@ int32_t SkMulShift(int32_t a, int32_t b, unsigned shift) { } } -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); |