Changeset 2783 in webkit for trunk/JavaScriptCore/kjs/object.cpp

Timestamp:

Nov 20, 2002, 1:12:14 PM (23 years ago)

Author:

darin

Message:

• decrease ref/deref -- 5% speedup in iBench

• JavaScriptCore.pbproj/project.pbxproj: Added array_instance.h
• kjs/array_instance.h: Added so it can be shared by function.h.

• kjs/array_object.cpp:
• kjs/array_object.h:
• kjs/bool_object.cpp:
• kjs/bool_object.h:
• kjs/collector.cpp:
• kjs/date_object.cpp:
• kjs/date_object.h:
• kjs/error_object.cpp:
• kjs/function.cpp:
• kjs/function.h:
• kjs/function_object.cpp:
• kjs/internal.cpp:
• kjs/internal.h:
• kjs/math_object.cpp:
• kjs/nodes.cpp:
• kjs/number_object.cpp:
• kjs/object.cpp:
• kjs/object.h:
• kjs/object_object.cpp:
• kjs/property_map.cpp:
• kjs/reference.cpp:
• kjs/reference.h:
• kjs/regexp_object.cpp:
• kjs/string_object.cpp:
• kjs/string_object.h:
• kjs/value.cpp:
• kjs/value.h: Switched lots of interfaces so they don't require ref/deref.

File:

• trunk/JavaScriptCore/kjs/object.cpp (modified) (7 diffs)

trunk/JavaScriptCore/kjs/object.cpp

@@ -59 +59 @@
 }
 
+ObjectImp::ObjectImp(ObjectImp *proto)
+  : _proto(proto), _internalValue(0L), _scope(true)
+{
+  //fprintf(stderr,"ObjectImp::ObjectImp %p\n",(void*)this);
+}
+
 ObjectImp::ObjectImp() :
   _scope(true)
@@ -153 +159 @@
 }
 
-// This get method only looks at the property map.
-// A bit like hasProperty(recursive=false), this doesn't go to the prototype.
-// This is used e.g. by lookupOrCreateFunction (to cache a function, we don't want
-// to look up in the prototype, it might already exist there)
-ValueImp* ObjectImp::getDirect(const Identifier& propertyName) const
-{
-  return _prop.get(propertyName);
-}
-
 // ECMA 8.6.2.2
 void ObjectImp::put(ExecState *exec, const Identifier &propertyName,
@@ -168 +165 @@
   assert(!value.isNull());
   assert(value.type() != ListType);
+
+  // non-standard netscape extension
+  if (propertyName == specialPrototypePropertyName) {
+    setPrototype(value);
+    return;
+  }
 
   /* TODO: check for write permissions directly w/o this call */
@@ -178 +181 @@
     fprintf( stderr, "WARNING: canPut %s said NO\n", propertyName.ascii() );
 #endif
-    return;
-  }
-
-  // non-standard netscape extension
-  if (propertyName == specialPrototypePropertyName) {
-    setPrototype(value);
     return;
   }
@@ -395 +392 @@
       for (int i = 0; i < size; ++i, ++e) {
         if ( e->s && !(e->attr & DontEnum) )
-          list.append(Reference(Object(this), e->s)); /// ######### check for duplicates with the propertymap
+          list.append(Reference(this, e->s)); /// ######### check for duplicates with the propertymap
       }
     }
@@ -412 +409 @@
 {
   _internalValue = v.imp();
+}
+
+void ObjectImp::setInternalValue(ValueImp *v)
+{
+  v->setGcAllowed();
+  _internalValue = v;
 }
 
@@ -445 +448 @@
 }
 
+void ObjectImp::putDirect(const Identifier &propertyName, ValueImp *value, int attr)
+{
+    value->setGcAllowed();
+    _prop.put(propertyName, value, attr);
+}
+
+void ObjectImp::putDirect(const Identifier &propertyName, int value, int attr)
+{
+    _prop.put(propertyName, NumberImp::create(value), attr);
+}
 
 // ------------------------------ Error ----------------------------------------