Revert of Some inline ARM assembly for saturated arithmetic, a small speed-up for

Source/wtf/SaturatedArithmetic.h

 /*
  * Copyright (c) 2012, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef SaturatedArithmetic_h
 #define SaturatedArithmetic_h
 
-#include "wtf/CPU.h"
 #include <limits>
 #include <stdint.h>
 
-#if CPU(ARM) && COMPILER(GCC)
-
-// If we're building ARM on GCC we replace the C++ versions with some
-// native ARM assembly for speed.
-#include "wtf/asm/SaturatedArithmeticARM.h"
-
-#else
-
 ALWAYS_INLINE int32_t saturatedAddition(int32_t a, int32_t b)
 {
     uint32_t ua = a;
     uint32_t ub = b;
     uint32_t result = ua + ub;
 
-    // Can only overflow if the signed bit of the two values match. If the
-    // signed bit of the result and one of the values differ it overflowed.
-
-    if (~(ua ^ ub) & (result ^ ua) & (1 << 31))
-        return std::numeric_limits<int>::max() + (ua >> 31);
+    // Can only overflow if the signed bit of the two values match. If the signed
+    // bit of the result and one of the values differ it did overflow.
+    if (!((ua ^ ub) >> 31) & (result ^ ua) >> 31)
+        result = std::numeric_limits<int>::max() + (ua >> 31);
 
     return result;
 }
 
 ALWAYS_INLINE int32_t saturatedSubtraction(int32_t a, int32_t b)
 {
     uint32_t ua = a;
     uint32_t ub = b;
     uint32_t result = ua - ub;
 
-    // Can only overflow if the signed bit of the two input values differ. If
-    // the signed bit of the result and the first value differ it overflowed.
-
-    if ((ua ^ ub) & (result ^ ua) & (1 << 31))
-        return std::numeric_limits<int>::max() + (ua >> 31);
+    // Can only overflow if the signed bit of the two values do not match. If the
+    // signed bit of the result and the first value differ it did overflow.
+    if ((ua ^ ub) >> 31 & (result ^ ua) >> 31)
+        result = std::numeric_limits<int>::max() + (ua >> 31);
 
     return result;
 }
 
-inline int getMaxSaturatedSetResultForTesting(int FractionalShift)
-{
-    // For C version the set function maxes out to max int, this differs from
-    // the ARM asm version, see SaturatedArithmetiARM.h for the equivalent asm
-    // version.
-    return std::numeric_limits<int>::max();
-}
-
-inline int getMinSaturatedSetResultForTesting(int FractionalShift)
-{
-    return std::numeric_limits<int>::min();
-}
-
-ALWAYS_INLINE int saturatedSet(int value, int FractionalShift)
-{
-    const int intMaxForLayoutUnit =
-        std::numeric_limits<int>::max() >> FractionalShift;
-
-    const int intMinForLayoutUnit =
-        std::numeric_limits<int>::min() >> FractionalShift;
-
-    if (value > intMaxForLayoutUnit)
-        return std::numeric_limits<int>::max();
-
-    if (value < intMinForLayoutUnit)
-        return std::numeric_limits<int>::min();
-
-    return value << FractionalShift;
-}
-
-
-ALWAYS_INLINE int saturatedSet(unsigned value, int FractionalShift)
-{
-    const unsigned intMaxForLayoutUnit =
-        std::numeric_limits<int>::max() >> FractionalShift;
-
-    if (value >= intMaxForLayoutUnit)
-        return std::numeric_limits<int>::max();
-
-    return value << FractionalShift;
-}
-
-#endif // CPU(ARM) && COMPILER(GCC)
 #endif // SaturatedArithmetic_h