Changeset 2753 in webkit for trunk/JavaScriptCore

Timestamp:

Nov 18, 2002, 11:57:11 PM (23 years ago)

Author:

darin

Message:

JavaScriptCore:

• reduced the creation of Value objects and hoisted the property map into Object for another gain of about 6%

• JavaScriptCore.pbproj/project.pbxproj: Made property_map.h public.
• kjs/array_object.cpp: (compareWithCompareFunctionForQSort): Don't wrap the ValueImp * in a Value just to add it to a list. (ArrayProtoFuncImp::call): Pass the globalObject directly so we don't have to ref/deref.
• kjs/function.cpp: (FunctionImp::call): Use a reference for the global object to avoid ref/deref. (GlobalFuncImp::call): Ditto.
• kjs/internal.cpp: (BooleanImp::toObject): Put the object directly into the list, don't create a Value. (StringImp::toObject): Ditto. (NumberImp::toObject): Ditto. (InterpreterImp::evaluate): Use a reference for the global object.
• kjs/internal.h: Return a reference for the global object.
• kjs/interpreter.cpp: (Interpreter::globalObject): Ditto.
• kjs/interpreter.h: Ditto.
• kjs/object.cpp: Use _prop directly in the object, not a separate pointer.
• kjs/object.h: Ditto.
• kjs/types.cpp: Added List methods that work directly with ValueImp. (List::append): Added a ValueImp version. (List::prepend): Ditto. (List::appendList): Work directly with the ValueImp's. (List::prependList): Ditto. (List::copy): Use appendList. (List::empty): Use a shared global List.
• kjs/types.h: Update for above changes.

WebCore:

• force-js-clean-timestamp: Another Object change.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• ChangeLog-2002-12-03 (modified) (1 diff)
• ChangeLog-2003-10-25 (modified) (1 diff)
• JavaScriptCore.pbproj/project.pbxproj (modified) (1 diff)
• kjs/array_object.cpp (modified) (2 diffs)
• kjs/function.cpp (modified) (2 diffs)
• kjs/internal.cpp (modified) (4 diffs)
• kjs/internal.h (modified) (1 diff)
• kjs/interpreter.cpp (modified) (1 diff)
• kjs/interpreter.h (modified) (1 diff)
• kjs/object.cpp (modified) (12 diffs)
• kjs/object.h (modified) (2 diffs)
• kjs/types.cpp (modified) (10 diffs)
• kjs/types.h (modified) (7 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2002-11-18  Darin Adler  <[email protected]>
+
+        - reduced the creation of Value objects and hoisted the property map
+        into Object for another gain of about 6%
+
+        * JavaScriptCore.pbproj/project.pbxproj: Made property_map.h public.
+        * kjs/array_object.cpp:
+        (compareWithCompareFunctionForQSort): Don't wrap the ValueImp * in a Value
+        just to add it to a list.
+        (ArrayProtoFuncImp::call): Pass the globalObject directly so we don't have
+        to ref/deref.
+        * kjs/function.cpp:
+        (FunctionImp::call): Use a reference for the global object to avoid ref/deref.
+        (GlobalFuncImp::call): Ditto.
+        * kjs/internal.cpp:
+        (BooleanImp::toObject): Put the object directly into the list, don't create a Value.
+        (StringImp::toObject): Ditto.
+        (NumberImp::toObject): Ditto.
+        (InterpreterImp::evaluate): Use a reference for the global object.
+        * kjs/internal.h: Return a reference for the global object.
+        * kjs/interpreter.cpp: (Interpreter::globalObject): Ditto.
+        * kjs/interpreter.h: Ditto.
+        * kjs/object.cpp: Use _prop directly in the object, not a separate pointer.
+        * kjs/object.h: Ditto.
+        * kjs/types.cpp: Added List methods that work directly with ValueImp.
+        (List::append): Added a ValueImp version.
+        (List::prepend): Ditto.
+        (List::appendList): Work directly with the ValueImp's.
+        (List::prependList): Ditto.
+        (List::copy): Use appendList.
+        (List::empty): Use a shared global List.
+        * kjs/types.h: Update for above changes.
+
 2002-11-18  Darin Adler  <[email protected]>
 

trunk/JavaScriptCore/ChangeLog-2002-12-03

@@ +1 @@
+2002-11-18  Darin Adler  <[email protected]>
+
+        - reduced the creation of Value objects and hoisted the property map
+        into Object for another gain of about 6%
+
+        * JavaScriptCore.pbproj/project.pbxproj: Made property_map.h public.
+        * kjs/array_object.cpp:
+        (compareWithCompareFunctionForQSort): Don't wrap the ValueImp * in a Value
+        just to add it to a list.
+        (ArrayProtoFuncImp::call): Pass the globalObject directly so we don't have
+        to ref/deref.
+        * kjs/function.cpp:
+        (FunctionImp::call): Use a reference for the global object to avoid ref/deref.
+        (GlobalFuncImp::call): Ditto.
+        * kjs/internal.cpp:
+        (BooleanImp::toObject): Put the object directly into the list, don't create a Value.
+        (StringImp::toObject): Ditto.
+        (NumberImp::toObject): Ditto.
+        (InterpreterImp::evaluate): Use a reference for the global object.
+        * kjs/internal.h: Return a reference for the global object.
+        * kjs/interpreter.cpp: (Interpreter::globalObject): Ditto.
+        * kjs/interpreter.h: Ditto.
+        * kjs/object.cpp: Use _prop directly in the object, not a separate pointer.
+        * kjs/object.h: Ditto.
+        * kjs/types.cpp: Added List methods that work directly with ValueImp.
+        (List::append): Added a ValueImp version.
+        (List::prepend): Ditto.
+        (List::appendList): Work directly with the ValueImp's.
+        (List::prependList): Ditto.
+        (List::copy): Use appendList.
+        (List::empty): Use a shared global List.
+        * kjs/types.h: Update for above changes.
+
 2002-11-18  Darin Adler  <[email protected]>
 

trunk/JavaScriptCore/ChangeLog-2003-10-25

@@ +1 @@
+2002-11-18  Darin Adler  <[email protected]>
+
+        - reduced the creation of Value objects and hoisted the property map
+        into Object for another gain of about 6%
+
+        * JavaScriptCore.pbproj/project.pbxproj: Made property_map.h public.
+        * kjs/array_object.cpp:
+        (compareWithCompareFunctionForQSort): Don't wrap the ValueImp * in a Value
+        just to add it to a list.
+        (ArrayProtoFuncImp::call): Pass the globalObject directly so we don't have
+        to ref/deref.
+        * kjs/function.cpp:
+        (FunctionImp::call): Use a reference for the global object to avoid ref/deref.
+        (GlobalFuncImp::call): Ditto.
+        * kjs/internal.cpp:
+        (BooleanImp::toObject): Put the object directly into the list, don't create a Value.
+        (StringImp::toObject): Ditto.
+        (NumberImp::toObject): Ditto.
+        (InterpreterImp::evaluate): Use a reference for the global object.
+        * kjs/internal.h: Return a reference for the global object.
+        * kjs/interpreter.cpp: (Interpreter::globalObject): Ditto.
+        * kjs/interpreter.h: Ditto.
+        * kjs/object.cpp: Use _prop directly in the object, not a separate pointer.
+        * kjs/object.h: Ditto.
+        * kjs/types.cpp: Added List methods that work directly with ValueImp.
+        (List::append): Added a ValueImp version.
+        (List::prepend): Ditto.
+        (List::appendList): Work directly with the ValueImp's.
+        (List::prependList): Ditto.
+        (List::copy): Use appendList.
+        (List::empty): Use a shared global List.
+        * kjs/types.h: Update for above changes.
+
 2002-11-18  Darin Adler  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj

@@ -1332 +1332 @@
                         isa = PBXBuildFile;
                         settings = {
+                                ATTRIBUTES = (
+                                        Private,
+                                );
                         };
                 };

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -230 +230 @@
     
     args->arguments.clear();
-    args->arguments.append(Value(*(ValueImp **)a));
-    args->arguments.append(Value(*(ValueImp **)b));
+    args->arguments.append(*(ValueImp **)a);
+    args->arguments.append(*(ValueImp **)b);
     return args->compareFunction->call(args->exec, args->globalObject, args->arguments)
         .toInt32(args->exec);
@@ -531 +531 @@
                 l.append(jObj);
                 l.append(minObj);
-                Object thisObj = exec->interpreter()->globalObject();
-                cmp = sortFunction.call(exec,thisObj, l ).toInt32(exec);
+                cmp = sortFunction.call(exec, exec->interpreter()->globalObject(), l).toInt32(exec);
             } else {
               cmp = (jObj.toString(exec) < minObj.toString(exec)) ? -1 : 1;

trunk/JavaScriptCore/kjs/function.cpp

@@ -80 +80 @@
 Value FunctionImp::call(ExecState *exec, Object &thisObj, const List &args)
 {
-  Object globalObj = exec->interpreter()->globalObject();
+  Object &globalObj = exec->interpreter()->globalObject();
 
   Debugger *dbg = exec->interpreter()->imp()->debugger();
@@ -369 +369 @@
 
       // enter a new execution context
-      Object glob(exec->interpreter()->globalObject());
       Object thisVal(Object::dynamicCast(exec->context().thisValue()));
-      ContextImp *ctx = new ContextImp(glob,
+      ContextImp *ctx = new ContextImp(exec->interpreter()->globalObject(),
                                        exec,
                                        thisVal,

trunk/JavaScriptCore/kjs/internal.cpp

@@ -187 +187 @@
 {
   List args;
-  args.append(Boolean(const_cast<BooleanImp*>(this)));
+  args.append(const_cast<BooleanImp*>(this));
   return Object::dynamicCast(exec->interpreter()->builtinBoolean().construct(exec,args));
 }
@@ -216 +216 @@
 {
   List args;
-  args.append(Value(const_cast<StringImp*>(this)));
+  args.append(const_cast<StringImp*>(this));
   return Object::dynamicCast(exec->interpreter()->builtinString().construct(exec,args));
 }
@@ -245 +245 @@
 {
   List args;
-  args.append(Number(const_cast<NumberImp*>(this)));
+  args.append(const_cast<NumberImp*>(this));
   return Object::dynamicCast(exec->interpreter()->builtinNumber().construct(exec,args));
 }
@@ -735 +735 @@
   progNode->ref();
 
-  Object globalObj = globalObject();
+  Object &globalObj = globalObject();
   Object thisObj = globalObject();
 

trunk/JavaScriptCore/kjs/internal.h

@@ -241 +241 @@
     ~InterpreterImp();
 
-    Object globalObject() const { return global; }
+    Object &globalObject() const { return const_cast<Object &>(global); }
     Interpreter* interpreter() const { return m_interpreter; }
 

trunk/JavaScriptCore/kjs/interpreter.cpp

@@ -109 +109 @@
 }
 
-Object Interpreter::globalObject() const
+Object &Interpreter::globalObject() const
 {
   return rep->globalObject();

trunk/JavaScriptCore/kjs/interpreter.h

@@ -146 +146 @@
      * execution performed by this interpreter
      */
-    Object globalObject() const;
+    Object &globalObject() const;
 
     void initGlobalObject();

trunk/JavaScriptCore/kjs/object.cpp

@@ -38 +38 @@
 #include "error_object.h"
 #include "nodes.h"
-#include "property_map.h"
 
 namespace KJS {
@@ -62 +61 @@
 
 ObjectImp::ObjectImp(const Object &proto)
-  : _prop(0), _proto(static_cast<ObjectImp*>(proto.imp())), _internalValue(0L), _scope(true)
+  : _proto(static_cast<ObjectImp*>(proto.imp())), _internalValue(0L), _scope(true)
 {
   //fprintf(stderr,"ObjectImp::ObjectImp %p\n",(void*)this);
-  _prop = new PropertyMap();
 }
 
@@ -72 +70 @@
 {
   //fprintf(stderr,"ObjectImp::ObjectImp %p\n",(void*)this);
-  _prop = 0;
   _proto = NullImp::staticNull;
   _internalValue = 0L;
-  _prop = new PropertyMap();
 }
 
@@ -81 +77 @@
 {
   //fprintf(stderr,"ObjectImp::~ObjectImp %p\n",(void*)this);
-  delete _prop;
 }
 
@@ -92 +87 @@
     _proto->mark();
 
-  _prop->mark();
+  _prop.mark();
 
   if (_internalValue && !_internalValue->marked())
@@ -171 +166 @@
 ValueImp* ObjectImp::getDirect(const UString& propertyName) const
 {
-  return _prop->get(propertyName);
+  return _prop.get(propertyName);
 }
 
@@ -199 +194 @@
   }
 
-  _prop->put(propertyName,value.imp(),attr);
+  _prop.put(propertyName,value.imp(),attr);
 }
 
@@ -212 +207 @@
 {
   int attributes;
-  ValueImp *v = _prop->get(propertyName, attributes);
+  ValueImp *v = _prop.get(propertyName, attributes);
   if (v)
     return!(attributes & ReadOnly);
@@ -229 +224 @@
 bool ObjectImp::hasProperty(ExecState *exec, const UString &propertyName) const
 {
-  if (_prop->get(propertyName))
+  if (_prop.get(propertyName))
     return true;
 
@@ -254 +249 @@
 {
   int attributes;
-  ValueImp *v = _prop->get(propertyName, attributes);
+  ValueImp *v = _prop.get(propertyName, attributes);
   if (v) {
     if ((attributes & DontDelete))
       return false;
-    _prop->remove(propertyName);
+    _prop.remove(propertyName);
     return true;
   }
@@ -276 +271 @@
 void ObjectImp::deleteAllProperties( ExecState * )
 {
-  _prop->clear();
+  _prop.clear();
 }
 
@@ -397 +392 @@
     list = static_cast<ObjectImp*>(_proto)->propList(exec,recursive);
 
-  _prop->addEnumerablesToReferenceList(list, Object(this));
+  _prop.addEnumerablesToReferenceList(list, Object(this));
 
   // Add properties from the static hashtable of properties

trunk/JavaScriptCore/kjs/object.h

@@ -41 +41 @@
 #include "types.h"
 #include "reference_list.h"
+#include "property_map.h"
 
 namespace KJS {
 
-  class PropertyMap;
   class HashTable;
   class HashEntry;
@@ -583 +583 @@
   private:
     const HashEntry* findPropertyHashEntry( const UString& propertyName ) const;
-    PropertyMap *_prop;
+    PropertyMap _prop;
     ValueImp *_proto;
     ValueImp *_internalValue;

trunk/JavaScriptCore/kjs/types.cpp

@@ -47 +47 @@
     ListNode(const Value &val, ListNode *p, ListNode *n)
       : member(val.imp()), prev(p), next(n) {};
+    ListNode(ValueImp *val, ListNode *p, ListNode *n)
+      : member(val), prev(p), next(n) {};
     ValueImp *member;
     ListNode *prev, *next;
@@ -62 +64 @@
 // ------------------------------ ListIterator ---------------------------------
 
-ListIterator::ListIterator(ListNode *n) : node(n)
-{
-}
-
-ListIterator::ListIterator(const List &l)
-  : node(l.hook->next)
-{
-}
-
 ValueImp* ListIterator::operator->() const
 {
@@ -76 +69 @@
 }
 
-//    operator Value* () const { return node->member; }
 Value ListIterator::operator*() const
 {
@@ -82 +74 @@
 }
 
-//    operator Value*() const { return node->member; }
 Value ListIterator::operator++()
 {
@@ -107 +98 @@
   --*this;
   return Value(n->member);
-}
-
-bool ListIterator::operator==(const ListIterator &it) const
-{
-  return (node==it.node);
-}
-
-bool ListIterator::operator!=(const ListIterator &it) const
-{
-  return (node!=it.node);
 }
 
@@ -183 +164 @@
 }
 
+void List::append(ValueImp *val)
+{
+  ListNode *n = new ListNode(val, hook->prev, hook);
+  if (!m_needsMarking) {
+    val->ref();
+  }
+  hook->prev->next = n;
+  hook->prev = n;
+}
+
 void List::prepend(const Value& val)
 {
@@ -193 +184 @@
 }
 
+void List::prepend(ValueImp *val)
+{
+  ListNode *n = new ListNode(val, hook->prev, hook);
+  if (!m_needsMarking) {
+    val->ref();
+  }
+  hook->next->prev = n;
+  hook->next = n;
+}
+
 void List::appendList(const List& lst)
 {
-  ListIterator it = lst.begin();
-  ListIterator e = lst.end();
-  while(it != e) {
-    append(*it);
-    ++it;
+  ListNode *otherHook = lst.hook;
+  ListNode *o = otherHook->next;
+  while (o != otherHook) {
+    append(o->member);
+    o = o->next;
   }
 }
@@ -205 +206 @@
 void List::prependList(const List& lst)
 {
-  ListIterator it = lst.end();
-  ListIterator e = lst.begin();
-  while(it != e) {
-    --it;
-    prepend(*it);
+  ListNode *otherHook = lst.hook;
+  ListNode *o = otherHook->prev;
+  while (o != otherHook) {
+    prepend(o->member);
+    o = o->prev;
   }
 }
@@ -261 +262 @@
 {
   List newList;
-
-  ListIterator e = end();
-  ListIterator it = begin();
-
-  while(it != e) {
-    newList.append(*it);
-    ++it;
-  }
-
+  newList.appendList(*this);
   return newList;
 }
@@ -316 +309 @@
 }
 
-const List List::empty()
-{
-  return List();
+const List &List::empty()
+{
+  static List l;
+  return l;
 }
 

trunk/JavaScriptCore/kjs/types.h

@@ -43 +43 @@
   class ListIterator {
     friend class List;
-    ListIterator();
-    ListIterator(ListNode *n);
+    ListIterator() : node(0) { }
+    ListIterator(ListNode *n) : node(n) { }
   public:
     /**
@@ -56 +56 @@
      */
     ValueImp* operator->() const;
-    //    operator Value* () const { return node->member; }
     Value operator*() const;
-    /**
-     * Conversion to @ref KJS::Value*
-     * @return A pointer to the element the iterator operates on.
-     */
-    //    operator Value*() const { return node->member; }
     /**
      * Postfix increment operator.
@@ -85 +79 @@
      * False otherwise.
      */
-    bool operator==(const ListIterator &it) const;
+    bool operator==(const ListIterator &it) const { return node == it.node; }
     /**
      * Check for inequality with another iterator.
      * @return True if the two iterators operate on different list elements.
      */
-    bool operator!=(const ListIterator &it) const;
+    bool operator!=(const ListIterator &it) const { return node != it.node; }
   private:
     ListNode *node;
@@ -120 +114 @@
      */
     void append(const Value& val);
+    void append(ValueImp *val);
     /**
      * Insert an object at the beginning of the list.
@@ -126 +121 @@
      */
     void prepend(const Value& val);
+    void prepend(ValueImp *val);
     /**
      * Appends the items of another list at the end of this one.
@@ -147 +143 @@
      */
     void remove(const Value &val);
+    void remove(ValueImp *val);
     /**
      * Remove all elements from the list.
@@ -190 +187 @@
      * function has a @ref KJS::List parameter.
      */
-    static const List empty();
+    static const List &empty();
 #ifdef KJS_DEBUG_MEM
     static void globalClear();