commit 008fa5114f356861f74f086f0b0c50fe42ef2891
author Logan Chien <loganchien@google.com> Fri Jun 22 08:09:57 2012 -0700
committer Shih-wei Liao <sliao@google.com> Fri Jun 22 08:53:36 2012 -0700
tree 4e02644aad39bad7debe1acf0fd2fe8509ed5e51
parent a64f157a79bec7215e29f18a5a73d70edb0f8abf

Fix d2i, f2i runtime support regression.

(double)(int32_t)(0x80000000ul) is not equal to
static_cast<double>(0x80000000ul).  We should use
static_cast<double>(static_cast<int32_t>(0x80000000))
instead.

Change-Id: Idfc39ec7c990056bd157689fe4cdb899e62c0f10

src/runtime_support.cc

diff --git a/src/runtime_support.cc b/src/runtime_support.cc
index 37be5f7..c067765 100644
--- a/src/runtime_support.cc
+++ b/src/runtime_support.cc
@@ -35,9 +35,9 @@
   static const double kMaxLong = static_cast<double>(static_cast<int64_t>(0x7fffffffffffffffULL));
   static const double kMinLong = static_cast<double>(static_cast<int64_t>(0x8000000000000000ULL));
   if (d >= kMaxLong) {
-    return 0x7fffffffffffffffULL;
+    return static_cast<int64_t>(0x7fffffffffffffffULL);
   } else if (d <= kMinLong) {
-    return 0x8000000000000000ULL;
+    return static_cast<int64_t>(0x8000000000000000ULL);
   } else if (d != d)  { // NaN case
     return 0;
   } else {
@@ -49,9 +49,9 @@
   static const float kMaxLong = static_cast<float>(static_cast<int64_t>(0x7fffffffffffffffULL));
   static const float kMinLong = static_cast<float>(static_cast<int64_t>(0x8000000000000000ULL));
   if (f >= kMaxLong) {
-    return 0x7fffffffffffffffULL;
+    return static_cast<int64_t>(0x7fffffffffffffffULL);
   } else if (f <= kMinLong) {
-    return 0x8000000000000000ULL;
+    return static_cast<int64_t>(0x8000000000000000ULL);
   } else if (f != f) { // NaN case
     return 0;
   } else {
@@ -60,12 +60,12 @@
 }
 
 int32_t art_d2i(double d) {
-  static const double kMaxInt = static_cast<double>(0x7fffffffUL);
-  static const double kMinInt = static_cast<double>(0x80000000UL);
+  static const double kMaxInt = static_cast<double>(static_cast<int32_t>(0x7fffffffUL));
+  static const double kMinInt = static_cast<double>(static_cast<int32_t>(0x80000000UL));
   if (d >= kMaxInt) {
-    return 0x7fffffffUL;
+    return static_cast<int32_t>(0x7fffffffUL);
   } else if (d <= kMinInt) {
-    return 0x80000000UL;
+    return static_cast<int32_t>(0x80000000UL);
   } else if (d != d)  { // NaN case
     return 0;
   } else {
@@ -74,12 +74,12 @@
 }
 
 int32_t art_f2i(float f) {
-  static const float kMaxInt = static_cast<float>(0x7fffffffUL);
-  static const float kMinInt = static_cast<float>(0x80000000UL);
+  static const float kMaxInt = static_cast<float>(static_cast<int32_t>(0x7fffffffUL));
+  static const float kMinInt = static_cast<float>(static_cast<int32_t>(0x80000000UL));
   if (f >= kMaxInt) {
-    return 0x7fffffffUL;
+    return static_cast<int32_t>(0x7fffffffUL);
   } else if (f <= kMinInt) {
-    return 0x80000000UL;
+    return static_cast<int32_t>(0x80000000UL);
   } else if (f != f) { // NaN case
     return 0;
   } else {