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

Timestamp:

Oct 5, 2005, 6:13:18 PM (20 years ago)

Author:

ggaren

Message:

• Darin and I rewrote our implementation of the SimpleNumber class to store number bit patterns in their floating point formats.

My tweaks reviewed by Darin.

~1% speedup on JS iBench.

• kjs/internal.h: removed obsolete jsNumber declarations.
• kjs/math_object.cpp: (MathFuncImp::callAsFunction): changed KJS::isNaN to isNaN
• kjs/nodes.cpp: (PostfixResolveNode::evaluate): removed obsolete knownToBeInteger (PostfixBracketNode::evaluate): ditto (PostfixDotNode::evaluate): ditto (PrefixResolveNode::evaluate): ditto (PrefixBracketNode::evaluate): ditto (PrefixDotNode::evaluate): ditto (NegateNode::evaluate): ditto (valueForReadModifyAssignment): ditto
• kjs/number_object.cpp: removed obsolete comment
• kjs/operations.cpp: (KJS::equal): removed unnecessary isNaN checks (KJS::strictEqual): ditto (KJS::add): removed obsolete knownToBeInteger (KJS::mult): ditto
• kjs/operations.h: removed include of "value.h" to prevent circular reference
• kjs/simple_number.h: removed unnecessary #includes (KJS::SimpleNumber::make): see above (KJS::SimpleNumber::is): ditto (KJS::SimpleNumber::value): ditto
• kjs/string_object.cpp: (StringProtoFuncImp::callAsFunction): changed KJS::isNaN to isNaN
• kjs/ustring.cpp: removed unnecessary isNaN check (KJS::UString::toUInt32): ditto
• kjs/value.cpp: (KJS::jsNumber): removed obsolete jsNumber definitions (KJS::ConstantValues::init): NaN is no longer a ConstantValue (KJS::ConstantValues::clear): ditto (KJS::ConstantValues::mark): ditto
• kjs/value.h: removed obsolete knownToBeInteger (KJS::jsNaN): now returns a SimpleNumber (KJS::ValueImp::getUInt32): changed to account for NaN being a SimpleNumber (KJS::ValueImp::toBoolean): ditto (KJS::ValueImp::toString): changed to account for +/- 0.0 (KJS::jsZero): changed to reflect that SimpleNumber::make takes a double (KJS::jsOne): ditto (KJS::jsTwo): ditto (KJS::Number): removed obsolete non-double constructor declarations

File:

• trunk/JavaScriptCore/kjs/value.cpp (modified) (5 diffs)

trunk/JavaScriptCore/kjs/value.cpp

@@ -45 +45 @@
 AllocatedValueImp *ConstantValues::jsTrue = NULL;
 AllocatedValueImp *ConstantValues::jsFalse = NULL;
-AllocatedValueImp *ConstantValues::NaN = NULL;
 
 static const double D16 = 65536.0;
@@ -183 +182 @@
 }
 
-ValueImp *jsNumber(int i)
-{
-    return SimpleNumber::fits(i) ? SimpleNumber::make(i) : new NumberImp(static_cast<double>(i));
-}
-
-ValueImp *jsNumber(unsigned i)
-{
-    return SimpleNumber::fits(i) ? SimpleNumber::make(i) : new NumberImp(static_cast<double>(i));
-}
-
-ValueImp *jsNumber(long i)
-{
-    return SimpleNumber::fits(i) ? SimpleNumber::make(i) : new NumberImp(static_cast<double>(i));
-}
-
-ValueImp *jsNumber(unsigned long i)
-{
-    return SimpleNumber::fits(i) ? SimpleNumber::make(i) : new NumberImp(static_cast<double>(i));
-}
-
-ValueImp *jsNumber(long long i)
-{
-    return SimpleNumber::fits(i) ? SimpleNumber::make(i) : new NumberImp(static_cast<double>(i));
-}
-
-ValueImp *jsNumber(unsigned long long i)
-{
-    return SimpleNumber::fits(i) ? SimpleNumber::make(i) : new NumberImp(static_cast<double>(i));
-}
-
 ValueImp *jsNumber(double d)
 {
-    return SimpleNumber::fits(d)
-        ? SimpleNumber::make(static_cast<long>(d))
-        : (isNaN(d) ? jsNaN() : new NumberImp(d));
-}
-
-ValueImp *jsNumber(double d, bool knownToBeInteger)
-{
-    return (knownToBeInteger ? SimpleNumber::integerFits(d) : SimpleNumber::fits(d))
-        ? SimpleNumber::make(static_cast<long>(d))
-        : ((!knownToBeInteger && isNaN(d)) ? jsNaN() : new NumberImp(d));
+  ValueImp *v = SimpleNumber::make(d);
+  return v ? v : new NumberImp(d);
 }
 
@@ -233 +194 @@
     jsTrue = new BooleanImp(true);
     jsFalse = new BooleanImp(false);
-    NaN = new NumberImp(::KJS::NaN);
 }
 
@@ -242 +202 @@
     jsTrue = NULL;
     jsFalse = NULL;
-    NaN = NULL;
 }
 
@@ -259 +218 @@
         if (!v->marked())
             v->mark();
-    if (AllocatedValueImp *v = NaN)
-        if (!v->marked())
-            v->mark();
-}
-
-}
+}
+
+}