X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/f9bf01c6616d5ddcf65b13b33cedf9e387ff7a63..a253471d7f8e4d91bf6ebabab00155c3b387d3d0:/runtime/Lookup.h diff --git a/runtime/Lookup.h b/runtime/Lookup.h index e673c09..64d06b5 100644 --- a/runtime/Lookup.h +++ b/runtime/Lookup.h @@ -22,28 +22,21 @@ #define Lookup_h #include "CallFrame.h" +#include "Intrinsic.h" #include "Identifier.h" #include "JSGlobalObject.h" -#include "JSObject.h" #include "PropertySlot.h" #include #include -// Bug #26843: Work around Metrowerks compiler bug -#if COMPILER(WINSCW) -#define JSC_CONST_HASHTABLE -#else -#define JSC_CONST_HASHTABLE const -#endif - namespace JSC { - // Hash table generated by the create_hash_table script. struct HashTableValue { const char* key; // property name unsigned char attributes; // JSObject attributes intptr_t value1; intptr_t value2; + Intrinsic intrinsic; }; // FIXME: There is no reason this get function can't be simpler. @@ -51,22 +44,30 @@ namespace JSC { typedef PropertySlot::GetValueFunc GetFunction; typedef void (*PutFunction)(ExecState*, JSObject* baseObject, JSValue value); - class HashEntry : public FastAllocBase { + class HashEntry { + WTF_MAKE_FAST_ALLOCATED; public: - void initialize(UString::Rep* key, unsigned char attributes, intptr_t v1, intptr_t v2) + void initialize(StringImpl* key, unsigned char attributes, intptr_t v1, intptr_t v2, Intrinsic intrinsic) { m_key = key; m_attributes = attributes; m_u.store.value1 = v1; m_u.store.value2 = v2; + m_u.function.intrinsic = intrinsic; m_next = 0; } - void setKey(UString::Rep* key) { m_key = key; } - UString::Rep* key() const { return m_key; } + void setKey(StringImpl* key) { m_key = key; } + StringImpl* key() const { return m_key; } unsigned char attributes() const { return m_attributes; } + Intrinsic intrinsic() const + { + ASSERT(m_attributes & Function); + return m_u.function.intrinsic; + } + NativeFunction function() const { ASSERT(m_attributes & Function); return m_u.function.functionValue; } unsigned char functionLength() const { ASSERT(m_attributes & Function); return static_cast(m_u.function.length); } @@ -79,7 +80,7 @@ namespace JSC { HashEntry* next() const { return m_next; } private: - UString::Rep* m_key; + StringImpl* m_key; unsigned char m_attributes; // JSObject attributes union { @@ -90,6 +91,7 @@ namespace JSC { struct { NativeFunction functionValue; intptr_t length; // number of arguments for function + Intrinsic intrinsic; } function; struct { GetFunction get; @@ -124,7 +126,7 @@ namespace JSC { createTable(&exec->globalData()); } - void deleteTable() const; + JS_EXPORT_PRIVATE void deleteTable() const; // Find an entry in the table, and return the entry. ALWAYS_INLINE const HashEntry* entry(JSGlobalData* globalData, const Identifier& identifier) const @@ -139,18 +141,75 @@ namespace JSC { return entry(identifier); } + class ConstIterator { + public: + ConstIterator(const HashTable* table, int position) + : m_table(table) + , m_position(position) + { + skipInvalidKeys(); + } + + const HashEntry* operator->() + { + return &m_table->table[m_position]; + } + + const HashEntry* operator*() + { + return &m_table->table[m_position]; + } + + bool operator!=(const ConstIterator& other) + { + ASSERT(m_table == other.m_table); + return m_position != other.m_position; + } + + ConstIterator& operator++() + { + ASSERT(m_position < m_table->compactSize); + ++m_position; + skipInvalidKeys(); + return *this; + } + + private: + void skipInvalidKeys() + { + ASSERT(m_position <= m_table->compactSize); + while (m_position < m_table->compactSize && !m_table->table[m_position].key()) + ++m_position; + ASSERT(m_position <= m_table->compactSize); + } + + const HashTable* m_table; + int m_position; + }; + + ConstIterator begin(JSGlobalData& globalData) const + { + initializeIfNeeded(&globalData); + return ConstIterator(this, 0); + } + ConstIterator end(JSGlobalData& globalData) const + { + initializeIfNeeded(&globalData); + return ConstIterator(this, compactSize); + } + private: ALWAYS_INLINE const HashEntry* entry(const Identifier& identifier) const { ASSERT(table); - const HashEntry* entry = &table[identifier.ustring().rep()->existingHash() & compactHashSizeMask]; + const HashEntry* entry = &table[identifier.impl()->existingHash() & compactHashSizeMask]; if (!entry->key()) return 0; do { - if (entry->key() == identifier.ustring().rep()) + if (entry->key() == identifier.impl()) return entry; entry = entry->next(); } while (entry); @@ -159,10 +218,10 @@ namespace JSC { } // Convert the hash table keys to identifiers. - void createTable(JSGlobalData*) const; + JS_EXPORT_PRIVATE void createTable(JSGlobalData*) const; }; - void setUpStaticFunctionSlot(ExecState*, const HashEntry*, JSObject* thisObject, const Identifier& propertyName, PropertySlot&); + JS_EXPORT_PRIVATE bool setUpStaticFunctionSlot(ExecState*, const HashEntry*, JSObject* thisObject, const Identifier& propertyName, PropertySlot&); /** * This method does it all (looking in the hashtable, checking for function @@ -176,13 +235,12 @@ namespace JSC { const HashEntry* entry = table->entry(exec, propertyName); if (!entry) // not found, forward to parent - return thisObj->ParentImp::getOwnPropertySlot(exec, propertyName, slot); + return ParentImp::getOwnPropertySlot(thisObj, exec, propertyName, slot); if (entry->attributes() & Function) - setUpStaticFunctionSlot(exec, entry, thisObj, propertyName, slot); - else - slot.setCustom(thisObj, entry->propertyGetter()); + return setUpStaticFunctionSlot(exec, entry, thisObj, propertyName, slot); + slot.setCacheableCustom(thisObj, entry->propertyGetter()); return true; } @@ -192,14 +250,17 @@ namespace JSC { const HashEntry* entry = table->entry(exec, propertyName); if (!entry) // not found, forward to parent - return thisObj->ParentImp::getOwnPropertyDescriptor(exec, propertyName, descriptor); + return ParentImp::getOwnPropertyDescriptor(thisObj, exec, propertyName, descriptor); PropertySlot slot; - if (entry->attributes() & Function) - setUpStaticFunctionSlot(exec, entry, thisObj, propertyName, slot); - else - slot.setCustom(thisObj, entry->propertyGetter()); + if (entry->attributes() & Function) { + bool present = setUpStaticFunctionSlot(exec, entry, thisObj, propertyName, slot); + if (present) + descriptor.setDescriptor(slot.getValue(exec, propertyName), entry->attributes()); + return present; + } + slot.setCustom(thisObj, entry->propertyGetter()); descriptor.setDescriptor(slot.getValue(exec, propertyName), entry->attributes()); return true; } @@ -212,15 +273,14 @@ namespace JSC { template inline bool getStaticFunctionSlot(ExecState* exec, const HashTable* table, JSObject* thisObj, const Identifier& propertyName, PropertySlot& slot) { - if (static_cast(thisObj)->ParentImp::getOwnPropertySlot(exec, propertyName, slot)) + if (ParentImp::getOwnPropertySlot(thisObj, exec, propertyName, slot)) return true; const HashEntry* entry = table->entry(exec, propertyName); if (!entry) return false; - setUpStaticFunctionSlot(exec, entry, thisObj, propertyName, slot); - return true; + return setUpStaticFunctionSlot(exec, entry, thisObj, propertyName, slot); } /** @@ -231,7 +291,7 @@ namespace JSC { template inline bool getStaticFunctionDescriptor(ExecState* exec, const HashTable* table, JSObject* thisObj, const Identifier& propertyName, PropertyDescriptor& descriptor) { - if (static_cast(thisObj)->ParentImp::getOwnPropertyDescriptor(exec, propertyName, descriptor)) + if (ParentImp::getOwnPropertyDescriptor(static_cast(thisObj), exec, propertyName, descriptor)) return true; const HashEntry* entry = table->entry(exec, propertyName); @@ -239,9 +299,10 @@ namespace JSC { return false; PropertySlot slot; - setUpStaticFunctionSlot(exec, entry, thisObj, propertyName, slot); - descriptor.setDescriptor(slot.getValue(exec, propertyName), entry->attributes()); - return true; + bool present = setUpStaticFunctionSlot(exec, entry, thisObj, propertyName, slot); + if (present) + descriptor.setDescriptor(slot.getValue(exec, propertyName), entry->attributes()); + return present; } /** @@ -254,11 +315,11 @@ namespace JSC { const HashEntry* entry = table->entry(exec, propertyName); if (!entry) // not found, forward to parent - return thisObj->ParentImp::getOwnPropertySlot(exec, propertyName, slot); + return ParentImp::getOwnPropertySlot(thisObj, exec, propertyName, slot); ASSERT(!(entry->attributes() & Function)); - slot.setCustom(thisObj, entry->propertyGetter()); + slot.setCacheableCustom(thisObj, entry->propertyGetter()); return true; } @@ -272,7 +333,7 @@ namespace JSC { const HashEntry* entry = table->entry(exec, propertyName); if (!entry) // not found, forward to parent - return thisObj->ParentImp::getOwnPropertyDescriptor(exec, propertyName, descriptor); + return ParentImp::getOwnPropertyDescriptor(thisObj, exec, propertyName, descriptor); ASSERT(!(entry->attributes() & Function)); PropertySlot slot; @@ -287,20 +348,20 @@ namespace JSC { * is found it sets the value and returns true, else it returns false. */ template - inline bool lookupPut(ExecState* exec, const Identifier& propertyName, JSValue value, const HashTable* table, ThisImp* thisObj) + inline bool lookupPut(ExecState* exec, const Identifier& propertyName, JSValue value, const HashTable* table, ThisImp* thisObj, bool shouldThrow = false) { const HashEntry* entry = table->entry(exec, propertyName); - + if (!entry) return false; - if (entry->attributes() & Function) { // function: put as override property - if (LIKELY(value.isCell())) - thisObj->putDirectFunction(propertyName, value.asCell()); - else - thisObj->putDirect(propertyName, value); - } else if (!(entry->attributes() & ReadOnly)) + // If this is a function put it as an override property. + if (entry->attributes() & Function) + thisObj->putDirect(exec->globalData(), propertyName, value); + else if (!(entry->attributes() & ReadOnly)) entry->propertyPutter()(exec, thisObj, value); + else if (shouldThrow) + throwTypeError(exec, StrictModeReadonlyPropertyWriteError); return true; } @@ -314,8 +375,8 @@ namespace JSC { template inline void lookupPut(ExecState* exec, const Identifier& propertyName, JSValue value, const HashTable* table, ThisImp* thisObj, PutPropertySlot& slot) { - if (!lookupPut(exec, propertyName, value, table, thisObj)) - thisObj->ParentImp::put(exec, propertyName, value, slot); // not found: forward to parent + if (!lookupPut(exec, propertyName, value, table, thisObj, slot.isStrictMode())) + ParentImp::put(thisObj, exec, propertyName, value, slot); // not found: forward to parent } } // namespace JSC