Changeset 26945 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

Timestamp:

Oct 23, 2007, 7:01:53 PM (18 years ago)

Author:

oliver

Message:

Reduce branching in implementations of some operator implementations, yielding 1.3% boost to SunSpider.

Reviewed by Maciej

• kjs/nodes.cpp: (KJS::MultNode::evaluate): (KJS::DivNode::evaluate): (KJS::ModNode::evaluate): (KJS::add): (KJS::sub): (KJS::AddNode::evaluate): (KJS::SubNode::evaluate): (KJS::valueForReadModifyAssignment):
• kjs/operations.cpp:
• kjs/operations.h:

File:

• trunk/JavaScriptCore/kjs/nodes.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1194 +1194 @@
     JSValue *v2 = term2->evaluate(exec);
     KJS_CHECKEXCEPTIONVALUE
-        
-    return mult(exec, v1, v2, '*');
+
+    return jsNumber(v1->toNumber(exec) * v2->toNumber(exec));
 }
 
 // ECMA 11.5.2
 JSValue *DivNode::evaluate(ExecState *exec)
+{
+    JSValue *v1 = term1->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+        
+    JSValue *v2 = term2->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+
+    return jsNumber(v1->toNumber(exec) / v2->toNumber(exec));
+}
+
+// ECMA 11.5.3
+JSValue *ModNode::evaluate(ExecState *exec)
+{
+    JSValue *v1 = term1->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+        
+    JSValue *v2 = term2->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+
+    return jsNumber(fmod(v1->toNumber(exec), v2->toNumber(exec)));
+}
+
+// ------------------------------ Additive Nodes --------------------------------------
+
+
+// ECMA 11.6
+static inline JSValue *add(ExecState *exec, JSValue *v1, JSValue *v2)
+{
+    // exception for the Date exception in defaultValue()
+    JSValue *p1 = v1->toPrimitive(exec, UnspecifiedType);
+    JSValue *p2 = v2->toPrimitive(exec, UnspecifiedType);
+    
+    if (p1->isString() || p2->isString()) {
+        UString value = p1->toString(exec) + p2->toString(exec);
+        if (value.isNull()) {
+            JSObject *error = Error::create(exec, GeneralError, "Out of memory");
+            exec->setException(error);
+            return error;
+        } else
+            return jsString(value);
+    }
+    
+    return jsNumber(p1->toNumber(exec) + p2->toNumber(exec));
+}
+
+static inline JSValue *sub(ExecState *exec, JSValue *v1, JSValue *v2)
+{
+    JSValue *p1 = v1->toPrimitive(exec, NumberType);
+    JSValue *p2 = v2->toPrimitive(exec, NumberType);
+
+    return jsNumber(p1->toNumber(exec) - p2->toNumber(exec));
+}
+
+// ECMA 11.6.1
+JSValue *AddNode::evaluate(ExecState *exec)
+{
+  JSValue *v1 = term1->evaluate(exec);
+  KJS_CHECKEXCEPTIONVALUE
+
+  JSValue *v2 = term2->evaluate(exec);
+  KJS_CHECKEXCEPTIONVALUE
+
+  return add(exec, v1, v2);
+}
+
+
+// ECMA 11.6.2
+JSValue *SubNode::evaluate(ExecState *exec)
 {
     JSValue *v1 = term1->evaluate(exec);
@@ -1207 +1275 @@
     KJS_CHECKEXCEPTIONVALUE
         
-    return mult(exec, v1, v2, '/');
-}
-
-// ECMA 11.5.3
-JSValue *ModNode::evaluate(ExecState *exec)
-{
-    JSValue *v1 = term1->evaluate(exec);
-    KJS_CHECKEXCEPTIONVALUE
-        
-    JSValue *v2 = term2->evaluate(exec);
-    KJS_CHECKEXCEPTIONVALUE
-        
-    return mult(exec, v1, v2, '%');
-}
-
-// ------------------------------ Additive Nodes --------------------------------------
-
-// ECMA 11.6.1
-JSValue *AddNode::evaluate(ExecState *exec)
-{
-  JSValue *v1 = term1->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-
-  JSValue *v2 = term2->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-
-  return add(exec, v1, v2, '+');
-}
-
-
-// ECMA 11.6.2
-JSValue *SubNode::evaluate(ExecState *exec)
-{
-    JSValue *v1 = term1->evaluate(exec);
-    KJS_CHECKEXCEPTIONVALUE
-        
-    JSValue *v2 = term2->evaluate(exec);
-    KJS_CHECKEXCEPTIONVALUE
-        
-    return add(exec, v1, v2, '-');
+    return sub(exec, v1, v2);
 }
 
@@ -1521 +1550 @@
   switch (oper) {
   case OpMultEq:
-    v = mult(exec, v1, v2, '*');
+    v = jsNumber(v1->toNumber(exec) * v2->toNumber(exec));
     break;
   case OpDivEq:
-    v = mult(exec, v1, v2, '/');
+    v = jsNumber(v1->toNumber(exec) / v2->toNumber(exec));
     break;
   case OpPlusEq:
-    v = add(exec, v1, v2, '+');
+    v = add(exec, v1, v2);
     break;
   case OpMinusEq:
-    v = add(exec, v1, v2, '-');
+    v = sub(exec, v1, v2);
     break;
   case OpLShift: