Changeset 10757 in webkit for trunk/JavaScriptCore/kjs/nodes.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/nodes.cpp (modified) (10 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -663 +663 @@
         ValueImp *v = slot.getValue(exec, m_ident);
 
-        bool knownToBeInteger;
-        double n = v->toNumber(exec, knownToBeInteger);
+        double n = v->toNumber(exec);
         
         double newValue = (m_oper == OpPlusPlus) ? n + 1 : n - 1;
-        base->put(exec, m_ident, jsNumber(newValue, knownToBeInteger));
+        base->put(exec, m_ident, jsNumber(newValue));
         
-        return jsNumber(n, knownToBeInteger);
+        return jsNumber(n);
     }
 
@@ -695 +694 @@
     KJS_CHECKEXCEPTIONVALUE
 
-    bool knownToBeInteger;
-    double n = v->toNumber(exec, knownToBeInteger);
+    double n = v->toNumber(exec);
 
     double newValue = (m_oper == OpPlusPlus) ? n + 1 : n - 1;
-    base->put(exec, propertyIndex, jsNumber(newValue, knownToBeInteger));
+    base->put(exec, propertyIndex, jsNumber(newValue));
         
-    return jsNumber(n, knownToBeInteger);
+    return jsNumber(n);
   }
 
@@ -709 +707 @@
   KJS_CHECKEXCEPTIONVALUE
 
-  bool knownToBeInteger;
-  double n = v->toNumber(exec, knownToBeInteger);
+  double n = v->toNumber(exec);
   
   double newValue = (m_oper == OpPlusPlus) ? n + 1 : n - 1;
-  base->put(exec, propertyName, jsNumber(newValue, knownToBeInteger));
+  base->put(exec, propertyName, jsNumber(newValue));
         
-  return jsNumber(n, knownToBeInteger);
+  return jsNumber(n);
 }
 
@@ -730 +727 @@
   KJS_CHECKEXCEPTIONVALUE
 
-  bool knownToBeInteger;
-  double n = v->toNumber(exec, knownToBeInteger);
+  double n = v->toNumber(exec);
   
   double newValue = (m_oper == OpPlusPlus) ? n + 1 : n - 1;
-  base->put(exec, m_ident, jsNumber(newValue, knownToBeInteger));
+  base->put(exec, m_ident, jsNumber(newValue));
         
-  return jsNumber(n, knownToBeInteger);
+  return jsNumber(n);
 }
 
@@ -893 +889 @@
         ValueImp *v = slot.getValue(exec, m_ident);
 
-        bool knownToBeInteger;
-        double n = v->toNumber(exec, knownToBeInteger);
+        double n = v->toNumber(exec);
         
         double newValue = (m_oper == OpPlusPlus) ? n + 1 : n - 1;
-        ValueImp *n2 = jsNumber(newValue, knownToBeInteger);
+        ValueImp *n2 = jsNumber(newValue);
         base->put(exec, m_ident, n2);
 
@@ -926 +921 @@
     KJS_CHECKEXCEPTIONVALUE
 
-    bool knownToBeInteger;
-    double n = v->toNumber(exec, knownToBeInteger);
+    double n = v->toNumber(exec);
 
     double newValue = (m_oper == OpPlusPlus) ? n + 1 : n - 1;
-    ValueImp *n2 = jsNumber(newValue, knownToBeInteger);
+    ValueImp *n2 = jsNumber(newValue);
     base->put(exec, propertyIndex, n2);
 
@@ -941 +935 @@
   KJS_CHECKEXCEPTIONVALUE
 
-  bool knownToBeInteger;
-  double n = v->toNumber(exec, knownToBeInteger);
+  double n = v->toNumber(exec);
   
   double newValue = (m_oper == OpPlusPlus) ? n + 1 : n - 1;
-  ValueImp *n2 = jsNumber(newValue, knownToBeInteger);
+  ValueImp *n2 = jsNumber(newValue);
   base->put(exec, propertyName, n2);
 
@@ -963 +956 @@
   KJS_CHECKEXCEPTIONVALUE
 
-  bool knownToBeInteger;
-  double n = v->toNumber(exec, knownToBeInteger);
+  double n = v->toNumber(exec);
   
   double newValue = (m_oper == OpPlusPlus) ? n + 1 : n - 1;
-  ValueImp *n2 = jsNumber(newValue, knownToBeInteger);
+  ValueImp *n2 = jsNumber(newValue);
   base->put(exec, m_ident, n2);
 
@@ -992 +984 @@
   KJS_CHECKEXCEPTIONVALUE
 
-  bool knownToBeInteger;
-  double n = v->toNumber(exec, knownToBeInteger);
-  return jsNumber(-n, knownToBeInteger && n != 0);
+  double n = v->toNumber(exec);
+  return jsNumber(-n);
 }
 
@@ -1258 +1249 @@
     break;
   case OpModEq: {
-    bool d1KnownToBeInteger;
-    double d1 = v1->toNumber(exec, d1KnownToBeInteger);
-    bool d2KnownToBeInteger;
-    double d2 = v2->toNumber(exec, d2KnownToBeInteger);
-    v = jsNumber(fmod(d1, d2), d1KnownToBeInteger && d2KnownToBeInteger && d2 != 0);
+    double d1 = v1->toNumber(exec);
+    double d2 = v2->toNumber(exec);
+    v = jsNumber(fmod(d1, d2));
   }
     break;