commit 42d10e5b728117739694a0918b3d13f19afe4497
author Shih-wei Liao <sliao@google.com> Thu Apr 12 16:57:06 2012 -0700
committer Shih-wei Liao <sliao@google.com> Thu Apr 12 16:57:06 2012 -0700
tree 7cbdfe504e5a0fab06266037ae187ea3394d77af
parent 2272f7bb20d963d01c4b7e07bf89237f5284a717

For float_to_int routines, fix int64_t. Also, Long -> Int.

Change-Id: I789dd887b611f0061686df063e552ab383cac44c

src/oat/runtime/support_math.cc

diff --git a/src/oat/runtime/support_math.cc b/src/oat/runtime/support_math.cc
index 9496780..80e7d3f 100644
--- a/src/oat/runtime/support_math.cc
+++ b/src/oat/runtime/support_math.cc
@@ -95,11 +95,11 @@
 }
 
 int32_t D2I(double d) {
-  static const double kMaxLong = (double) (int64_t) 0x7fffffffUL;
-  static const double kMinLong = (double) (int64_t) 0x80000000UL;
-  if (d >= kMaxLong) {
+  static const double kMaxInt = (double) (int32_t) 0x7fffffffUL;
+  static const double kMinInt = (double) (int32_t) 0x80000000UL;
+  if (d >= kMaxInt) {
     return (int32_t) 0x7fffffffUL;
-  } else if (d <= kMinLong) {
+  } else if (d <= kMinInt) {
     return (int32_t) 0x80000000UL;
   } else if (d != d)  { // NaN case
     return 0;
@@ -109,11 +109,11 @@
 }
 
 int32_t F2I(float f) {
-  static const float kMaxLong = (float) (int64_t) 0x7fffffffUL;
-  static const float kMinLong = (float) (int64_t) 0x80000000UL;
-  if (f >= kMaxLong) {
+  static const float kMaxInt = (float) (int32_t) 0x7fffffffUL;
+  static const float kMinInt = (float) (int32_t) 0x80000000UL;
+  if (f >= kMaxInt) {
     return (int32_t) 0x7fffffffUL;
-  } else if (f <= kMinLong) {
+  } else if (f <= kMinInt) {
     return (int32_t) 0x80000000UL;
   } else if (f != f) { // NaN case
     return 0;