Changeset 26892 in webkit for trunk/JavaScriptCore/kjs/value.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/value.h (modified) (9 diffs)

trunk/JavaScriptCore/kjs/value.h

@@ -1 +1 @@
 /*
- *  This file is part of the KDE libraries
  *  Copyright (C) 1999-2001 Harri Porten ([email protected])
  *  Copyright (C) 2001 Peter Kelly ([email protected])
- *  Copyright (C) 2003-2005 Apple Computer, Inc.
+ *  Copyright (C) 2003, 2004, 2005, 2007 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -29 +28 @@
 #include "ustring.h"
 #include <stddef.h> // for size_t
+#include <wtf/AlwaysInline.h>
 
 namespace KJS {
@@ -77 +77 @@
 
     // Extracting integer values.
+    bool getInt32(int32_t&) const;
     bool getUInt32(uint32_t&) const;
 
@@ -102 +103 @@
 
 private:
+    int32_t toInt32SlowCase(ExecState*, bool& ok) const;
+    uint32_t toUInt32SlowCase(ExecState*, bool& ok) const;
+
     // Implementation details.
     JSCell *asCell();
@@ -137 +141 @@
 
     // Extracting integer values.
+    virtual bool getInt32(int32_t&) const;
     virtual bool getUInt32(uint32_t&) const;
 
@@ -165 +170 @@
 extern const double Inf;
 
-
 inline JSValue *jsUndefined()
 {
@@ -186 +190 @@
 }
 
-inline JSValue *jsNumber(double d)
+ALWAYS_INLINE JSValue* jsNumber(double d)
 {
     JSValue *v = JSImmediate::fromDouble(d);
@@ -329 +333 @@
 }
 
+inline bool JSValue::getInt32(int32_t& v) const
+{
+    return JSImmediate::isImmediate(this) ? JSImmediate::toInt32(this, v) : asCell()->getInt32(v);
+}
+
 inline bool JSValue::getUInt32(uint32_t& v) const
 {
-    if (JSImmediate::isImmediate(this)) {
-        double d = JSImmediate::toDouble(this);
-        if (!(d >= 0) || d > 0xFFFFFFFFUL) // true for NaN
-            return false;
-        v = static_cast<uint32_t>(d);
-        return JSImmediate::isNumber(this);
-    }
-    return asCell()->getUInt32(v);
+    return JSImmediate::isImmediate(this) ? JSImmediate::toUInt32(this, v) : asCell()->getUInt32(v);
 }
 
@@ -382 +384 @@
 }
 
+ALWAYS_INLINE int32_t JSValue::toInt32(ExecState* exec) const
+{
+    int32_t i;
+    if (JSImmediate::isImmediate(this) && JSImmediate::toInt32(this, i))
+        return i;
+    bool ok;
+    return toInt32SlowCase(exec, ok);
+}
+
+inline uint32_t JSValue::toUInt32(ExecState* exec) const
+{
+    uint32_t i;
+    if (JSImmediate::isImmediate(this) && JSImmediate::toUInt32(this, i))
+        return i;
+    bool ok;
+    return toUInt32SlowCase(exec, ok);
+}
+
+inline int32_t JSValue::toInt32(ExecState* exec, bool& ok) const
+{
+    int32_t i;
+    if (JSImmediate::isImmediate(this) && JSImmediate::toInt32(this, i)) {
+        ok = true;
+        return i;
+    }
+    return toInt32SlowCase(exec, ok);
+}
+
+inline uint32_t JSValue::toUInt32(ExecState* exec, bool& ok) const
+{
+    uint32_t i;
+    if (JSImmediate::isImmediate(this) && JSImmediate::toUInt32(this, i)) {
+        ok = true;
+        return i;
+    }
+    return toUInt32SlowCase(exec, ok);
+}
+
 } // namespace