Changeset 2738 in webkit for trunk/JavaScriptCore

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.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• ChangeLog-2002-12-03 (modified) (1 diff)
• ChangeLog-2003-10-25 (modified) (1 diff)
• kjs/array_object.cpp (modified) (2 diffs)
• kjs/array_object.h (modified) (1 diff)
• kjs/interpreter.cpp (modified) (1 diff)
• kjs/interpreter.h (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2002-11-18  Darin Adler  <[email protected]>
+
+        - 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.
+
 2002-11-18  Darin Adler  <[email protected]>
 

trunk/JavaScriptCore/ChangeLog-2002-12-03

@@ +1 @@
+2002-11-18  Darin Adler  <[email protected]>
+
+        - 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.
+
 2002-11-18  Darin Adler  <[email protected]>
 

trunk/JavaScriptCore/ChangeLog-2003-10-25

@@ +1 @@
+2002-11-18  Darin Adler  <[email protected]>
+
+        - 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.
+
 2002-11-18  Darin Adler  <[email protected]>
 

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;
 }
 

trunk/JavaScriptCore/kjs/array_object.h

@@ -56 +56 @@
     void setLength(unsigned newLength);
     
+    unsigned pushUndefinedObjectsToEnd();
+    
     unsigned length;
     unsigned capacity;

trunk/JavaScriptCore/kjs/interpreter.cpp

@@ -318 +318 @@
 #endif
 
-// ------------------------------ ExecState --------------------------------------
-
-namespace KJS {
-  class ExecStateImp
-  {
-  public:
-    ExecStateImp(Interpreter *interp, ContextImp *con)
-      : interpreter(interp), context(con) {};
-    Interpreter *interpreter;
-    ContextImp *context;
-    Value exception;
-  };
-};
-
-ExecState::~ExecState()
-{
-  delete rep;
-}
-
-Interpreter *ExecState::interpreter() const
-{
-  return rep->interpreter;
-}
-
-const Context ExecState::context() const
-{
-  return rep->context;
-}
-
-void ExecState::setException(const Value &e)
-{
-  rep->exception = e;
-}
-
-void ExecState::clearException()
-{
-  rep->exception = Value();
-}
-
-Value ExecState::exception() const
-{
-  return rep->exception;
-}
-
-bool ExecState::hadException() const
-{
-  return !rep->exception.isNull();
-}
-
-ExecState::ExecState(Interpreter *interp, ContextImp *con)
-{
-  rep = new ExecStateImp(interp,con);
-}
-
 void Interpreter::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }

trunk/JavaScriptCore/kjs/interpreter.h

@@ -369 +369 @@
     friend class GlobalFuncImp;
   public:
-    virtual ~ExecState();
-
     /**
      * Returns the interpreter associated with this execution state
@@ -376 +374 @@
      * @return The interpreter executing the script
      */
-    Interpreter *interpreter() const;
+    Interpreter *interpreter() const { return _interpreter; }
 
     /**
@@ -383 +381 @@
      * @return The current execution state context
      */
-    const Context context() const;
-
-    void setException(const Value &e);
-    void clearException();
-    Value exception() const;
-    bool hadException() const;
+    const Context context() const { return _context; }
+
+    void setException(const Value &e) { _exception = e; }
+    void clearException() { _exception = Value(); }
+    Value exception() const { return _exception; }
+    bool hadException() const { return !_exception.isNull(); }
 
   private:
-    ExecState(Interpreter *interp, ContextImp *con);
-    ExecStateImp *rep;
+    ExecState(Interpreter *interp, ContextImp *con)
+        : _interpreter(interp), _context(con) { }
+    Interpreter *_interpreter;
+    ContextImp *_context;
+    Value _exception;
   };