Changeset 26912 in webkit for trunk/JavaScriptCore/kjs/JSImmediate.h

Timestamp:

Oct 22, 2007, 11:44:27 PM (18 years ago)

Author:

darin

Message:

Reviewed by Maciej.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=15636 some JavaScriptCore regression tests are failing due to numeric conversion

This should restore correctness and make speed better too, restoring some
of the optimization we lost in my last check-in.

• kjs/JSImmediate.h: (KJS::JSImmediate::getTruncatedInt32): Added. Uses the range checking idiom I used in my patch yesterday. (KJS::JSImmediate::getTruncatedUInt32): Ditto.

• kjs/internal.h: Removed getInt32 and added getTruncatedInt/UInt32.
• kjs/internal.cpp: (KJS::NumberImp::getUInt32): Changed to always use double, since I can't find a way to write this more efficiently for float. (KJS::NumberImp::getTruncatedInt32): Added. (KJS::NumberImp::getTruncatedUInt32): Added.

• kjs/value.h: Removed getInt32 and added getTruncatedInt/UInt32. (KJS::JSValue::getUInt32): (KJS::JSValue::getTruncatedInt32): Added. (KJS::JSValue::getTruncatedUInt32): Added. (KJS::JSValue::toInt32): Changed getInt32 call to getTruncatedInt32. (KJS::JSValue::toUInt32): Changed getUInt32 call to getTruncatedUInt32.
• kjs/value.cpp: (KJS::JSCell::getTruncatedInt32): Added. (KJS::JSCell::getTruncatedUInt32): Added. (KJS::JSValue::toInteger): Changed getUInt32 call to getTruncatedInt32. (KJS::JSValue::toInt32SlowCase): Removed extra getInt32 call I accidentally had left in here. (KJS::JSValue::toUInt32SlowCase): Ditto. (KJS::JSValue::toUInt16): Changed getUInt32 call to getTruncatedUInt32.

• JavaScriptCore.exp: Updated.

File:

• trunk/JavaScriptCore/kjs/JSImmediate.h (modified) (5 diffs)

trunk/JavaScriptCore/kjs/JSImmediate.h

@@ -88 +88 @@
     static JSType type(const JSValue*);
 
-    static bool getInt32(const JSValue*, int32_t&);
     static bool getUInt32(const JSValue*, uint32_t&);
+    static bool getTruncatedInt32(const JSValue*, int32_t&);
+    static bool getTruncatedUInt32(const JSValue*, uint32_t&);
 
     // It would nice just to use fromDouble() to create these values, but that would prevent them from
@@ -163 +164 @@
     }
 
-    static double toDouble(const JSValue* v)
+    static float toFloat(const JSValue* v)
     {
         ASSERT(isImmediate(v));
@@ -172 +173 @@
     }
 
-    static bool getInt32(const JSValue* v, int32_t& i)
-    {
-        ASSERT(isImmediate(v));
-
-        FloatUnion floatUnion;
-        floatUnion.asBits = static_cast<uint32_t>(unTag(v));
-        float f = floatUnion.asFloat;
+    static double toDouble(const JSValue* v)
+    {
+        return toFloat(v);
+    }
+
+    static bool getTruncatedInt32(const JSValue* v, int32_t& i)
+    {
+        float f = toFloat(v);
+        if (!(f >= -2147483648.0F && f < 2147483648.0F))
+            return false;
         i = static_cast<int32_t>(f);
-        return isNumber(v) && i == f;
-    }
-
-    static bool getUInt32(const JSValue* v, uint32_t& i)
-    {
-        ASSERT(isImmediate(v));
-
-        FloatUnion floatUnion;
-        floatUnion.asBits = static_cast<uint32_t>(unTag(v));
-        float f = floatUnion.asFloat;
+        return isNumber(v);
+    }
+
+    static bool getTruncatedUInt32(const JSValue* v, uint32_t& i)
+    {
+        float f = toFloat(v);
+        if (!(f >= 0.0F && f < 4294967296.0F))
+            return false;
         i = static_cast<uint32_t>(f);
-        return isNumber(v) && i == f;
+        return isNumber(v);
     }
 };
@@ -221 +223 @@
     }
 
-    static bool getInt32(const JSValue* v, int32_t& i)
+    static bool getTruncatedInt32(const JSValue* v, int32_t& i)
     {
         double d = toDouble(v);
+        if (!(d >= -2147483648.0 && d < 2147483648.0))
+            return false;
         i = static_cast<int32_t>(d);
-        return isNumber(v) && i == d;
-    }
-
-    static bool getUInt32(const JSValue* v, uint32_t& i)
+        return isNumber(v);
+    }
+
+    static bool getTruncatedUInt32(const JSValue* v, uint32_t& i)
     {
         double d = toDouble(v);
+        if (!(d >= 0.0 && d < 4294967296.0))
+            return false;
         i = static_cast<uint32_t>(d);
-        return isNumber(v) && i == d;
+        return isNumber(v);
     }
 };
@@ -263 +269 @@
 }
 
-inline bool JSImmediate::getInt32(const JSValue* v, int32_t& i)
-{
-    return FPBitValues<is32bit, is64bit>::getInt32(v, i);
-}
-
 inline bool JSImmediate::getUInt32(const JSValue* v, uint32_t& i)
 {
-    return FPBitValues<is32bit, is64bit>::getUInt32(v, i);
+    double d = toDouble(v);
+    i = static_cast<uint32_t>(d);
+    return isNumber(v) && i == d;
+}
+
+inline bool JSImmediate::getTruncatedInt32(const JSValue* v, int32_t& i)
+{
+    return FPBitValues<is32bit, is64bit>::getTruncatedInt32(v, i);
+}
+
+inline bool JSImmediate::getTruncatedUInt32(const JSValue* v, uint32_t& i)
+{
+    return FPBitValues<is32bit, is64bit>::getTruncatedUInt32(v, i);
 }