Changeset 2738 in webkit for trunk/JavaScriptCore/kjs/array_object.cpp

Timestamp:

Nov 18, 2002, 2:49:26 PM (23 years ago)

Author:

darin

Message:

• simplified the ExecState class, which was showing up in profiles

Sped up JavaScript iBench by 6%.

• kjs/interpreter.h: Removed the level of indirection, and made it all inline.
• kjs/interpreter.cpp: Removed ExecState implementation from here altogether.

• fixed an oversight in my sort speedup

• kjs/array_object.h: Add pushUndefinedObjectsToEnd.
• kjs/array_object.cpp: (ArrayInstanceImp::sort): Call pushUndefinedObjectsToEnd. (ArrayInstanceImp::pushUndefinedObjectsToEnd): Added. Pushes all undefined to the end of the array.

File:

• trunk/JavaScriptCore/kjs/array_object.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -203 +203 @@
 void ArrayInstanceImp::sort(ExecState *exec)
 {
+    int lengthNotIncludingUndefined = pushUndefinedObjectsToEnd();
+    
     execForCompareByStringForQSort = exec;
-    qsort(storage, length, sizeof(ValueImp *), compareByStringForQSort);
+    qsort(storage, lengthNotIncludingUndefined, sizeof(ValueImp *), compareByStringForQSort);
     execForCompareByStringForQSort = 0;
 }
@@ -236 +238 @@
 void ArrayInstanceImp::sort(ExecState *exec, Object &compareFunction)
 {
+    int lengthNotIncludingUndefined = pushUndefinedObjectsToEnd();
+    
     CompareWithCompareFunctionArguments args(exec, compareFunction.imp());
     compareWithCompareFunctionArguments = &args;
-    qsort(storage, length, sizeof(ValueImp *), compareWithCompareFunctionForQSort);
+    qsort(storage, lengthNotIncludingUndefined, sizeof(ValueImp *), compareWithCompareFunctionForQSort);
     compareWithCompareFunctionArguments = 0;
+}
+
+unsigned ArrayInstanceImp::pushUndefinedObjectsToEnd()
+{
+    ValueImp *undefined = UndefinedImp::staticUndefined;
+
+    unsigned o = 0;
+    for (unsigned i = 0; i != length; ++i) {
+        ValueImp *v = storage[i];
+        if (v && v != undefined) {
+            if (o != i)
+                storage[o] = v;
+            o++;
+        }
+    }
+    if (o != length)
+        memset(storage + o, 0, sizeof(ValueImp *) * (length - o));
+    return o;
 }