Simplify integer arithmetic code.

runtime/platform/utils.h

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef PLATFORM_UTILS_H_
 #define PLATFORM_UTILS_H_
 
 #include "platform/assert.h"
 #include "platform/globals.h"
 
@@ skipping 68 matching lines @@
   static uint32_t RoundUpToPowerOfTwo(uint32_t x);
   static int CountOneBits(uint32_t x);
 
   // Computes a hash value for the given string.
   static uint32_t StringHash(const char* data, int length);
 
   // Computes a hash value for the given word.
   static uint32_t WordHash(word key);
 
   // Check whether an N-bit two's-complement representation can hold value.
-  static inline bool IsInt(int N, word value) {
-    ASSERT((0 < N) && (N < kBitsPerWord));
+  template<typename T>
+  static inline bool IsInt(int N, T value) {
+    ASSERT((0 < N) && (N < (kBitsPerByte * sizeof(T))));

[Ivan Posva, 2012/01/18 20:05:22]

sizeof(value) is closer to the style guide:
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#sizeof

[regis, 2012/01/18 21:50:12]

Done.

     word limit = static_cast<word>(1) << (N - 1);

[Ivan Posva, 2012/01/18 20:05:22]

You need to cast the 1 to T instead of word here. And the type of limit needs to
change as well. Can you please add the appropriate tests for 64-bit values which
would have failed here on a 32-bit platform. Thanks!

[regis, 2012/01/18 21:50:12]

The cast is fixed in patch 5.
I have added a test.

     return (-limit <= value) && (value < limit);
   }
 
-  static inline bool IsUint(int N, word value) {
-    ASSERT((0 < N) && (N < kBitsPerWord));
+  template<typename T>

[Ivan Posva, 2012/01/18 20:05:22]

ditto

[regis, 2012/01/18 21:50:12]

Done.

+  static inline bool IsUint(int N, T value) {
+    ASSERT((0 < N) && (N < (kBitsPerByte * sizeof(T))));
     word limit = static_cast<word>(1) << N;
     return (0 <= value) && (value < limit);
   }
 
   // Check whether the magnitude of value fits in N bits, i.e., whether an
   // (N+1)-bit sign-magnitude representation can hold value.
-  static inline bool IsAbsoluteUint(int N, word value) {
-    ASSERT((0 < N) && (N < kBitsPerWord));
+  template<typename T>

[Ivan Posva, 2012/01/18 20:05:22]

ditto

[regis, 2012/01/18 21:50:12]

Done.

+  static inline bool IsAbsoluteUint(int N, T value) {
+    ASSERT((0 < N) && (N < (kBitsPerByte * sizeof(T))));
     if (value < 0) value = -value;
     return IsUint(N, value);
   }
 
   static inline int32_t Low16Bits(int32_t value) {
     return static_cast<int32_t>(value & 0xffff);
   }
 
   static inline int32_t High16Bits(int32_t value) {
     return static_cast<int32_t>(value >> 16);
@@ skipping 31 matching lines @@
   static char IntToHexDigit(int i) {
     ASSERT(0 <= i && i < 16);
     if (i < 10) return static_cast<char>('0' + i);
     return static_cast<char>('A' + (i - 10));
   }
 };
 
 }  // namespace dart
 
 #endif  // PLATFORM_UTILS_H_