Changeset 26892 in webkit for trunk/JavaScriptCore/kjs/value.cpp

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.cpp (modified) (6 diffs)

trunk/JavaScriptCore/kjs/value.cpp

@@ -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 Apple Computer, Inc.
+ *  Copyright (C) 2003, 2007 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -42 +41 @@
 }
 
-bool JSCell::getUInt32(unsigned&) const
+bool JSCell::getInt32(int32_t&) const
+{
+    return false;
+}
+
+bool JSCell::getUInt32(uint32_t&) const
 {
     return false;
@@ -56 +60 @@
 }
 
-int32_t JSValue::toInt32(ExecState* exec) const
-{
-    bool ok;
-    return toInt32(exec, ok);
-}
-
-int32_t JSValue::toInt32(ExecState* exec, bool& ok) const
+int32_t JSValue::toInt32SlowCase(ExecState* exec, bool& ok) const
 {
     ok = true;
 
-    uint32_t i;
-    if (getUInt32(i))
+    int32_t i;
+    if (getInt32(i))
         return i;
 
     double d = roundValue(exec, const_cast<JSValue*>(this));
+    if (d >= -D32 / 2 && d < D32 / 2)
+        return static_cast<int32_t>(d);
+
     if (isNaN(d) || isInf(d)) {
         ok = false;
@@ -85 +86 @@
 }
 
-uint32_t JSValue::toUInt32(ExecState* exec) const
-{
-    bool ok;
-    return toUInt32(exec, ok);
-}
-
-uint32_t JSValue::toUInt32(ExecState* exec, bool& ok) const
+uint32_t JSValue::toUInt32SlowCase(ExecState* exec, bool& ok) const
 {
     ok = true;
@@ -100 +95 @@
 
     double d = roundValue(exec, const_cast<JSValue*>(this));
+    if (d >= 0.0 && d < D32)
+        return static_cast<uint32_t>(d);
+
     if (isNaN(d) || isInf(d)) {
         ok = false;
@@ -119 +117 @@
 
     double d = roundValue(exec, const_cast<JSValue*>(this));
+    if (d >= 0.0 && d < D16)
+        return static_cast<uint16_t>(d);
+
     if (isNaN(d) || isInf(d))
         return 0;