ARM Skia NEON patches - 04 - Clean SkFixed / SkLONGLONG

tests/MathTest.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "Test.h"
 #include "SkFloatBits.h"
 #include "SkFloatingPoint.h"
@@ skipping 168 matching lines @@
                                  src, dst, a, r0, f1);
 #endif
                         REPORTER_ASSERT(reporter, false);
                     }
                 }
             }
         }
     }
 }
 
-#if defined(SkLONGLONG)
 static int symmetric_fixmul(int a, int b) {
     int sa = SkExtractSign(a);
     int sb = SkExtractSign(b);
 
     a = SkApplySign(a, sa);
     b = SkApplySign(b, sb);
 
 #if 1
-    int c = (int)(((SkLONGLONG)a * b) >> 16);
+    int c = (int)(((int64_t)a * b) >> 16);
 
     return SkApplySign(c, sa ^ sb);
 #else
-    SkLONGLONG ab = (SkLONGLONG)a * b;
+    int64_t ab = (int64_t)a * b;
     if (sa ^ sb) {
         ab = -ab;
     }
     return ab >> 16;
 #endif
 }
-#endif
 
 static void check_length(skiatest::Reporter* reporter,
                          const SkPoint& p, SkScalar targetLen) {
     float x = SkScalarToFloat(p.fX);
     float y = SkScalarToFloat(p.fY);
     float len = sk_float_sqrt(x*x + y*y);
 
     len /= SkScalarToFloat(targetLen);
 
     REPORTER_ASSERT(reporter, len > 0.999f && len < 1.001f);
@@ skipping 295 matching lines @@
     {
         SkFixed result = SkFixedDiv(100, 100);
         REPORTER_ASSERT(reporter, result == SK_Fixed1);
         result = SkFixedDiv(1, SK_Fixed1);
         REPORTER_ASSERT(reporter, result == 1);
     }
 
     unittest_fastfloat(reporter);
     unittest_isfinite(reporter);
 
-#ifdef SkLONGLONG
     for (i = 0; i < 10000; i++) {
         SkFixed numer = rand.nextS();
         SkFixed denom = rand.nextS();
         SkFixed result = SkFixedDiv(numer, denom);
-        SkLONGLONG check = ((SkLONGLONG)numer << 16) / denom;
+        int64_t check = ((int64_t)numer << 16) / denom;
 
         (void)SkCLZ(numer);
         (void)SkCLZ(denom);
 
         REPORTER_ASSERT(reporter, result != (SkFixed)SK_NaN32);
         if (check > SK_MaxS32) {
             check = SK_MaxS32;
         } else if (check < -SK_MaxS32) {
             check = SK_MinS32;
         }
         REPORTER_ASSERT(reporter, result == (int32_t)check);
 
         result = SkFractDiv(numer, denom);
-        check = ((SkLONGLONG)numer << 30) / denom;
+        check = ((int64_t)numer << 30) / denom;
 
         REPORTER_ASSERT(reporter, result != (SkFixed)SK_NaN32);
         if (check > SK_MaxS32) {
             check = SK_MaxS32;
         } else if (check < -SK_MaxS32) {
             check = SK_MinS32;
         }
         REPORTER_ASSERT(reporter, result == (int32_t)check);
 
         // make them <= 2^24, so we don't overflow in fixmul
@@ skipping 21 matching lines @@
             SkFixed mod = SkFixedMod(numer, denom);
             float n = SkFixedToFloat(numer);
             float d = SkFixedToFloat(denom);
             float m = sk_float_mod(n, d);
             // ensure the same sign
             REPORTER_ASSERT(reporter, mod == 0 || (mod < 0) == (m < 0));
             int diff = SkAbs32(mod - SkFloatToFixed(m));
             REPORTER_ASSERT(reporter, (diff >> 7) == 0);
         }
     }
-#endif
 
     for (i = 0; i < 10000; i++) {
         SkFract x = rand.nextU() >> 1;
         double xx = (double)x / SK_Fract1;
         SkFract xr = SkFractSqrt(x);
         SkFract check = SkFloatToFract(sqrt(xx));
         REPORTER_ASSERT(reporter, xr == check ||
                                   xr == check-1 ||
                                   xr == check+1);
 
@@ skipping 87 matching lines @@
     }
     for (size_t i = 0; i < SK_ARRAY_COUNT(g32); ++i) {
         REPORTER_ASSERT(reporter, g32[i].fYang == SkEndianSwap32(g32[i].fYin));
     }
     for (size_t i = 0; i < SK_ARRAY_COUNT(g64); ++i) {
         REPORTER_ASSERT(reporter, g64[i].fYang == SkEndianSwap64(g64[i].fYin));
     }
 }
 
 DEFINE_TESTCLASS("Endian", EndianTestClass, TestEndian)