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

Timestamp:

Oct 22, 2007, 11:39:46 AM (18 years ago)

Author:

darin

Message:

Reviewed by Eric Seidel.

• ​http://bugs.webkit.org/show_bug.cgi?id=15617 improve speed of integer conversions

Makes SunSpider 6% faster.

• kjs/JSImmediate.h: Added toInt32 and toUInt32, with separate versions for 32-bit and 64-bit.
• kjs/value.h: (KJS::JSValue::getUInt32): Call JSImmediate::toUInt32.

• kjs/internal.h: Added getInt32.
• kjs/internal.cpp: (KJS::NumberImp::getInt32): Added. (KJS::NumberImp::getUInt32): Replaced with more-optimal implementation stolen from JSValue.

• kjs/value.h: (KJS::jsNumber): Marked ALWAYS_INLINE, because this wasn't getting inlined. (KJS::JSValue::getInt32): Added. (KJS::JSValue::getUInt32): Changed to call the new JSImmediate::toUInt32 to avoid converting from float to double. (KJS::JSValue::toInt32): Made inline, separated out the slow case. (KJS::JSValue::toUInt32): Ditto.
• kjs/value.cpp: (KJS::JSCell::getInt32): Added. (KJS::JSValue::toInt32SlowCase): Renamed from toInt32. Changed to use the new getInt32. Added a faster case for in-range numbers. (KJS::JSValue::toUInt32SlowCase): Ditto. (KJS::JSValue::toUInt16): Added a faster case for in-range numbers.

• JavaScriptCore.exp: Updated for changes.

File:

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

trunk/JavaScriptCore/kjs/JSImmediate.h

@@ -1 +1 @@
 /*
- *  This file is part of the KDE libraries
- *  Copyright (C) 2003-2006 Apple Computer, Inc
+ *  Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *  Copyright (C) 2006 Alexey Proskuryakov ([email protected])
  *
@@ -83 +82 @@
 
     static JSValue* fromDouble(double d);
-    static double toDouble(const JSValue* v);
-    static bool toBoolean(const JSValue* v);
+    static double toDouble(const JSValue*);
+    static bool toBoolean(const JSValue*);
     static JSObject* toObject(const JSValue*, ExecState*);
     static UString toString(const JSValue*);
     static JSType type(const JSValue*);
-    
+
+    static bool toInt32(const JSValue*, int32_t&);
+    static bool toUInt32(const JSValue*, uint32_t&);
+
     // It would nice just to use fromDouble() to create these values, but that would prevent them from
     // turning into compile-time constants.
@@ -170 +172 @@
         return floatUnion.asFloat;
     }
+
+    static bool toInt32(const JSValue* v, int32_t& i)
+    {
+        ASSERT(isImmediate(v));
+
+        FloatUnion floatUnion;
+        floatUnion.asBits = static_cast<uint32_t>(unTag(v));
+        float f = floatUnion.asFloat;
+        if (!(f >= -2147483648.0F && f < 2147483648.0F))
+            return false;
+        i = static_cast<int32_t>(f);
+        return isNumber(v);
+    }
+
+    static bool toUInt32(const JSValue* v, uint32_t& i)
+    {
+        ASSERT(isImmediate(v));
+
+        FloatUnion floatUnion;
+        floatUnion.asBits = static_cast<uint32_t>(unTag(v));
+        float f = floatUnion.asFloat;
+        if (!(f >= 0.0F && f < 4294967296.0F))
+            return false;
+        i = static_cast<uint32_t>(f);
+        return isNumber(v);
+    }
 };
 
@@ -196 +224 @@
         doubleUnion.asBits = unTag(v);
         return doubleUnion.asDouble;
+    }
+
+    static bool toInt32(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);
+    }
+
+    static bool toUInt32(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);
     }
 };
@@ -226 +272 @@
 }
 
+inline bool JSImmediate::toInt32(const JSValue* v, int32_t& i)
+{
+    return FPBitValues<is32bit, is64bit>::toInt32(v, i);
+}
+
+inline bool JSImmediate::toUInt32(const JSValue* v, uint32_t& i)
+{
+    return FPBitValues<is32bit, is64bit>::toUInt32(v, i);
+}
+
 } // namespace KJS