X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/4e4e5a6f2694187498445a6ac6f1634ce8141119..ed1e77d3adeb83d26fd1dfb16dd84cabdcefd250:/runtime/Identifier.cpp diff --git a/runtime/Identifier.cpp b/runtime/Identifier.cpp index f2642a9..d26d956 100644 --- a/runtime/Identifier.cpp +++ b/runtime/Identifier.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -22,232 +22,109 @@ #include "Identifier.h" #include "CallFrame.h" +#include "JSObject.h" +#include "JSScope.h" #include "NumericStrings.h" -#include // for placement new -#include // for strlen +#include "JSCInlines.h" +#include +#include #include #include #include -#include +#include #include using WTF::ThreadSpecific; namespace JSC { -IdentifierTable::~IdentifierTable() +Ref Identifier::add(VM* vm, const char* c) { - HashSet::iterator end = m_table.end(); - for (HashSet::iterator iter = m_table.begin(); iter != end; ++iter) - (*iter)->setIsIdentifier(false); -} -std::pair::iterator, bool> IdentifierTable::add(StringImpl* value) -{ - std::pair::iterator, bool> result = m_table.add(value); - (*result.first)->setIsIdentifier(true); - return result; -} -template -std::pair::iterator, bool> IdentifierTable::add(U value) -{ - std::pair::iterator, bool> result = m_table.add(value); - (*result.first)->setIsIdentifier(true); - return result; -} - -IdentifierTable* createIdentifierTable() -{ - return new IdentifierTable; -} - -void deleteIdentifierTable(IdentifierTable* table) -{ - delete table; -} - -bool Identifier::equal(const UString::Rep* r, const char* s) -{ - int length = r->length(); - const UChar* d = r->characters(); - for (int i = 0; i != length; ++i) - if (d[i] != (unsigned char)s[i]) - return false; - return s[length] == 0; -} - -bool Identifier::equal(const UString::Rep* r, const UChar* s, unsigned length) -{ - if (r->length() != length) - return false; - const UChar* d = r->characters(); - for (unsigned i = 0; i != length; ++i) - if (d[i] != s[i]) - return false; - return true; -} - -struct IdentifierCStringTranslator { - static unsigned hash(const char* c) - { - return UString::Rep::computeHash(c); - } - - static bool equal(UString::Rep* r, const char* s) - { - return Identifier::equal(r, s); - } - - static void translate(UString::Rep*& location, const char* c, unsigned hash) - { - size_t length = strlen(c); - UChar* d; - UString::Rep* r = UString::Rep::createUninitialized(length, d).releaseRef(); - for (size_t i = 0; i != length; i++) - d[i] = static_cast(c[i]); // use unsigned char to zero-extend instead of sign-extend - r->setHash(hash); - location = r; - } -}; - -PassRefPtr Identifier::add(JSGlobalData* globalData, const char* c) -{ - if (!c) - return UString::null().rep(); - if (!c[0]) - return UString::Rep::empty(); + ASSERT(c); + ASSERT(c[0]); if (!c[1]) - return add(globalData, globalData->smallStrings.singleCharacterStringRep(static_cast(c[0]))); - - IdentifierTable& identifierTable = *globalData->identifierTable; - LiteralIdentifierTable& literalIdentifierTable = identifierTable.literalTable(); - - const LiteralIdentifierTable::iterator& iter = literalIdentifierTable.find(c); - if (iter != literalIdentifierTable.end()) - return iter->second; - - pair::iterator, bool> addResult = identifierTable.add(c); - - // If the string is newly-translated, then we need to adopt it. - // The boolean in the pair tells us if that is so. - RefPtr addedString = addResult.second ? adoptRef(*addResult.first) : *addResult.first; + return *vm->smallStrings.singleCharacterStringRep(c[0]); - literalIdentifierTable.add(c, addedString.get()); - - return addedString.release(); + return *AtomicStringImpl::add(c); } -PassRefPtr Identifier::add(ExecState* exec, const char* c) +Ref Identifier::add(ExecState* exec, const char* c) { - return add(&exec->globalData(), c); + return add(&exec->vm(), c); } -struct UCharBuffer { - const UChar* s; - unsigned int length; -}; - -struct IdentifierUCharBufferTranslator { - static unsigned hash(const UCharBuffer& buf) - { - return UString::Rep::computeHash(buf.s, buf.length); - } - - static bool equal(UString::Rep* str, const UCharBuffer& buf) - { - return Identifier::equal(str, buf.s, buf.length); - } - - static void translate(UString::Rep*& location, const UCharBuffer& buf, unsigned hash) - { - UChar* d; - UString::Rep* r = UString::Rep::createUninitialized(buf.length, d).releaseRef(); - for (unsigned i = 0; i != buf.length; i++) - d[i] = buf.s[i]; - r->setHash(hash); - location = r; - } -}; - -PassRefPtr Identifier::add(JSGlobalData* globalData, const UChar* s, int length) +Ref Identifier::add8(VM* vm, const UChar* s, int length) { if (length == 1) { UChar c = s[0]; - if (c <= 0xFF) - return add(globalData, globalData->smallStrings.singleCharacterStringRep(c)); + ASSERT(c <= 0xff); + if (canUseSingleCharacterString(c)) + return *vm->smallStrings.singleCharacterStringRep(c); } if (!length) - return UString::Rep::empty(); - UCharBuffer buf = {s, length}; - pair::iterator, bool> addResult = globalData->identifierTable->add(buf); + return *StringImpl::empty(); - // If the string is newly-translated, then we need to adopt it. - // The boolean in the pair tells us if that is so. - return addResult.second ? adoptRef(*addResult.first) : *addResult.first; + return *AtomicStringImpl::add(s, length); } -PassRefPtr Identifier::add(ExecState* exec, const UChar* s, int length) +Identifier Identifier::from(ExecState* exec, unsigned value) { - return add(&exec->globalData(), s, length); + return Identifier(exec, exec->vm().numericStrings.add(value)); } -PassRefPtr Identifier::addSlowCase(JSGlobalData* globalData, UString::Rep* r) +Identifier Identifier::from(ExecState* exec, int value) { - ASSERT(!r->isIdentifier()); - // The empty & null strings are static singletons, and static strings are handled - // in ::add() in the header, so we should never get here with a zero length string. - ASSERT(r->length()); - - if (r->length() == 1) { - UChar c = r->characters()[0]; - if (c <= 0xFF) - r = globalData->smallStrings.singleCharacterStringRep(c); - if (r->isIdentifier()) - return r; - } + return Identifier(exec, exec->vm().numericStrings.add(value)); +} - return *globalData->identifierTable->add(r).first; +Identifier Identifier::from(ExecState* exec, double value) +{ + return Identifier(exec, exec->vm().numericStrings.add(value)); } -PassRefPtr Identifier::addSlowCase(ExecState* exec, UString::Rep* r) +Identifier Identifier::from(VM* vm, unsigned value) { - return addSlowCase(&exec->globalData(), r); + return Identifier(vm, vm->numericStrings.add(value)); } -Identifier Identifier::from(ExecState* exec, unsigned value) +Identifier Identifier::from(VM* vm, int value) { - return Identifier(exec, exec->globalData().numericStrings.add(value)); + return Identifier(vm, vm->numericStrings.add(value)); } -Identifier Identifier::from(ExecState* exec, int value) +Identifier Identifier::from(VM* vm, double value) { - return Identifier(exec, exec->globalData().numericStrings.add(value)); + return Identifier(vm, vm->numericStrings.add(value)); } -Identifier Identifier::from(ExecState* exec, double value) +void Identifier::dump(PrintStream& out) const { - return Identifier(exec, exec->globalData().numericStrings.add(value)); + if (impl()) + out.print(impl()); + else + out.print(""); } #ifndef NDEBUG -void Identifier::checkCurrentIdentifierTable(JSGlobalData* globalData) +void Identifier::checkCurrentAtomicStringTable(VM* vm) { // Check the identifier table accessible through the threadspecific matches the - // globalData's identifier table. - ASSERT_UNUSED(globalData, globalData->identifierTable == wtfThreadData().currentIdentifierTable()); + // vm's identifier table. + ASSERT_UNUSED(vm, vm->atomicStringTable() == wtfThreadData().atomicStringTable()); } -void Identifier::checkCurrentIdentifierTable(ExecState* exec) +void Identifier::checkCurrentAtomicStringTable(ExecState* exec) { - checkCurrentIdentifierTable(&exec->globalData()); + checkCurrentAtomicStringTable(&exec->vm()); } #else // These only exists so that our exports are the same for debug and release builds. -// This would be an ASSERT_NOT_REACHED(), but we're in NDEBUG only code here! -void Identifier::checkCurrentIdentifierTable(JSGlobalData*) { CRASH(); } -void Identifier::checkCurrentIdentifierTable(ExecState*) { CRASH(); } +// This would be an RELEASE_ASSERT_NOT_REACHED(), but we're in NDEBUG only code here! +NO_RETURN_DUE_TO_CRASH void Identifier::checkCurrentAtomicStringTable(VM*) { CRASH(); } +NO_RETURN_DUE_TO_CRASH void Identifier::checkCurrentAtomicStringTable(ExecState*) { CRASH(); } #endif