Changeset 26961 in webkit

Timestamp:

Oct 24, 2007 1:53:45 AM (17 years ago)

Author:

oliver

Message:

Remove old relation method, replace with specialised LessThan and lessThenEq functions for a 0.5-0.6% improvement in SunSpider

Reviewed by Darin

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/nodes.cpp (modified) (5 diffs)
• kjs/operations.cpp (modified) (1 diff)
• kjs/operations.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-10-24  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Darin.
+
+        Remove old relation method, replace with specialised LessThan and lessThenEq functions for a 0.5-0.6% improvement in SunSpider
+
+        * kjs/nodes.cpp:
+        (KJS::lessThan):
+        (KJS::lessThanEq):
+        (KJS::LessNode::evaluate):
+        (KJS::GreaterNode::evaluate):
+        (KJS::LessEqNode::evaluate):
+        (KJS::GreaterEqNode::evaluate):
+        * kjs/operations.cpp:
+        * kjs/operations.h:
+
 2007-10-24  Eric Seidel  <eric@webkit.org>
 

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1327 +1327 @@
 // ------------------------------ Relational Nodes -------------------------------
 
+static inline JSValue* lessThan(ExecState *exec, JSValue* v1, JSValue* v2) 
+{
+  JSValue *p1 = v1->toPrimitive(exec, NumberType);
+  JSValue *p2 = v2->toPrimitive(exec, NumberType);
+    
+  if (p1->isString() && p2->isString())
+    return jsBoolean(p1->toString(exec) < p2->toString(exec));
+    
+  return jsBoolean(p1->toNumber(exec) < p2->toNumber(exec));
+}
+
+static inline JSValue* lessThanEq(ExecState *exec, JSValue* v1, JSValue* v2) 
+{
+  JSValue *p1 = v1->toPrimitive(exec, NumberType);
+  JSValue *p2 = v2->toPrimitive(exec, NumberType);
+    
+  if (p1->isString() && p2->isString())
+    return jsBoolean(!(p2->toString(exec) < p1->toString(exec)));
+
+  return jsBoolean(p1->toNumber(exec) <= p2->toNumber(exec));
+}
+
 // ECMA 11.8.1
 JSValue *LessNode::evaluate(ExecState *exec)
@@ -1334 +1356 @@
   JSValue *v2 = expr2->evaluate(exec);
   KJS_CHECKEXCEPTIONVALUE
-  int r = relation(exec, v1, v2);
-  if (r < 0)
-      return jsBoolean(false);
-  return jsBoolean(r == 1);
+  return lessThan(exec, v1, v2);
 }
 
@@ -1347 +1366 @@
   JSValue *v2 = expr2->evaluate(exec);
   KJS_CHECKEXCEPTIONVALUE
-  int r = relation(exec, v2, v1);
-  if (r < 0)
-      return jsBoolean(false);
-  return jsBoolean(r == 1);
+  return lessThan(exec, v2, v1);
 }
 
@@ -1360 +1376 @@
   JSValue *v2 = expr2->evaluate(exec);
   KJS_CHECKEXCEPTIONVALUE
-  int r = relation(exec, v2, v1);
-  if (r < 0)
-      return jsBoolean(false);
-  return jsBoolean(r == 0);
+  return lessThanEq(exec, v1, v2);
 }
 
@@ -1373 +1386 @@
   JSValue *v2 = expr2->evaluate(exec);
   KJS_CHECKEXCEPTIONVALUE
-  int r = relation(exec, v1, v2);
-  if (r < 0)
-      return jsBoolean(false);
-  return jsBoolean(r == 0);
+  return lessThanEq(exec, v2, v1);
 }
 

trunk/JavaScriptCore/kjs/operations.cpp

@@ -190 +190 @@
 }
 
-int relation(ExecState *exec, JSValue *v1, JSValue *v2)
-{
-    JSValue *p1 = v1->toPrimitive(exec,NumberType);
-    JSValue *p2 = v2->toPrimitive(exec,NumberType);
-    
-    if (p1->isString() && p2->isString())
-        return p1->toString(exec) < p2->toString(exec) ? 1 : 0;
-    
-    double n1 = p1->toNumber(exec);
-    double n2 = p2->toNumber(exec);
-    if (n1 < n2)
-        return 1;
-    if (n1 >= n2)
-        return 0;
-    return -1; // must be NaN, so undefined
-}
-
 int maxInt(int d1, int d2)
 {

trunk/JavaScriptCore/kjs/operations.h

@@ -45 +45 @@
   bool equal(ExecState *exec, JSValue *v1, JSValue *v2);
   bool strictEqual(ExecState *exec, JSValue *v1, JSValue *v2);
-  /**
-   * This operator performs an abstract relational comparison of the two
-   * arguments that can be of arbitrary type. If possible, conversions to the
-   * string or number type will take place before the comparison.
-   *
-   * @return 1 if v1 is "less-than" v2, 0 if the relation is "greater-than-or-
-   * equal". -1 if the result is undefined.
-   */
-  int relation(ExecState *exec, JSValue *v1, JSValue *v2);
   int maxInt(int d1, int d2);
   int minInt(int d1, int d2);