X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/6fe7ccc865dc7d7541b93c5bcaf6368d2c98a174..ed1e77d3adeb83d26fd1dfb16dd84cabdcefd250:/runtime/Identifier.cpp diff --git a/runtime/Identifier.cpp b/runtime/Identifier.cpp index 182bcc4..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 @@ -23,251 +23,108 @@ #include "CallFrame.h" #include "JSObject.h" +#include "JSScope.h" #include "NumericStrings.h" -#include "ScopeChain.h" -#include // for placement new -#include // for strlen +#include "JSCInlines.h" +#include +#include #include #include #include +#include #include using WTF::ThreadSpecific; namespace JSC { -IdentifierTable* createIdentifierTable() +Ref Identifier::add(VM* vm, const char* c) { - return new IdentifierTable; -} - -void deleteIdentifierTable(IdentifierTable* table) -{ - delete table; -} - -struct IdentifierCStringTranslator { - static unsigned hash(const LChar* c) - { - return StringHasher::computeHash(c); - } - - static bool equal(StringImpl* r, const LChar* s) - { - return Identifier::equal(r, s); - } - - static void translate(StringImpl*& location, const LChar* c, unsigned hash) - { - size_t length = strlen(reinterpret_cast(c)); - LChar* d; - StringImpl* r = StringImpl::createUninitialized(length, d).leakRef(); - for (size_t i = 0; i != length; i++) - d[i] = c[i]; - r->setHash(hash); - location = r; - } -}; - -struct IdentifierLCharFromUCharTranslator { - static unsigned hash(const CharBuffer& buf) - { - return StringHasher::computeHash(buf.s, buf.length); - } - - static bool equal(StringImpl* str, const CharBuffer& buf) - { - return Identifier::equal(str, buf.s, buf.length); - } - - static void translate(StringImpl*& location, const CharBuffer& buf, unsigned hash) - { - LChar* d; - StringImpl* r = StringImpl::createUninitialized(buf.length, d).leakRef(); - for (unsigned i = 0; i != buf.length; i++) { - UChar c = buf.s[i]; - ASSERT(c <= 0xff); - d[i] = c; - } - r->setHash(hash); - location = r; - } -}; - -PassRefPtr Identifier::add(JSGlobalData* globalData, const char* c) -{ - if (!c) - return 0; - if (!c[0]) - return StringImpl::empty(); + ASSERT(c); + ASSERT(c[0]); if (!c[1]) - return add(globalData, globalData->smallStrings.singleCharacterStringRep(c[0])); - - IdentifierTable& identifierTable = *globalData->identifierTable; - LiteralIdentifierTable& literalIdentifierTable = identifierTable.literalTable(); + return *vm->smallStrings.singleCharacterStringRep(c[0]); - const LiteralIdentifierTable::iterator& iter = literalIdentifierTable.find(c); - if (iter != literalIdentifierTable.end()) - return iter->second; - - HashSet::AddResult addResult = identifierTable.add(reinterpret_cast(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.isNewEntry ? adoptRef(*addResult.iterator) : *addResult.iterator; - - 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); } -PassRefPtr Identifier::add8(JSGlobalData* globalData, const UChar* s, int length) +Ref Identifier::add8(VM* vm, const UChar* s, int length) { if (length == 1) { UChar c = s[0]; ASSERT(c <= 0xff); if (canUseSingleCharacterString(c)) - return add(globalData, globalData->smallStrings.singleCharacterStringRep(c)); + return *vm->smallStrings.singleCharacterStringRep(c); } - if (!length) - return StringImpl::empty(); - CharBuffer buf = {s, length}; - HashSet::AddResult addResult = globalData->identifierTable->add, IdentifierLCharFromUCharTranslator >(buf); - - // 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.isNewEntry ? adoptRef(*addResult.iterator) : *addResult.iterator; -} + return *StringImpl::empty(); -template -ALWAYS_INLINE uint32_t Identifier::toUInt32FromCharacters(const CharType* characters, unsigned length, bool& ok) -{ - // Get the first character, turning it into a digit. - uint32_t value = characters[0] - '0'; - if (value > 9) - return 0; - - // Check for leading zeros. If the first characher is 0, then the - // length of the string must be one - e.g. "042" is not equal to "42". - if (!value && length > 1) - return 0; - - while (--length) { - // Multiply value by 10, checking for overflow out of 32 bits. - if (value > 0xFFFFFFFFU / 10) - return 0; - value *= 10; - - // Get the next character, turning it into a digit. - uint32_t newValue = *(++characters) - '0'; - if (newValue > 9) - return 0; - - // Add in the old value, checking for overflow out of 32 bits. - newValue += value; - if (newValue < value) - return 0; - value = newValue; - } - - ok = true; - return value; -} - -uint32_t Identifier::toUInt32(const UString& string, bool& ok) -{ - ok = false; - - unsigned length = string.length(); - - // An empty string is not a number. - if (!length) - return 0; - - if (string.is8Bit()) - return toUInt32FromCharacters(string.characters8(), length, ok); - return toUInt32FromCharacters(string.characters16(), length, ok); -} - -PassRefPtr Identifier::addSlowCase(JSGlobalData* globalData, StringImpl* r) -{ - 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)[0]; - if (c <= maxSingleCharacterString) - r = globalData->smallStrings.singleCharacterStringRep(c); - if (r->isIdentifier()) - return r; - } - - return *globalData->identifierTable->add(r).iterator; -} - -PassRefPtr Identifier::addSlowCase(ExecState* exec, StringImpl* r) -{ - return addSlowCase(&exec->globalData(), r); + return *AtomicStringImpl::add(s, length); } Identifier Identifier::from(ExecState* exec, unsigned value) { - return Identifier(exec, exec->globalData().numericStrings.add(value)); + return Identifier(exec, exec->vm().numericStrings.add(value)); } Identifier Identifier::from(ExecState* exec, int value) { - return Identifier(exec, exec->globalData().numericStrings.add(value)); + return Identifier(exec, exec->vm().numericStrings.add(value)); } Identifier Identifier::from(ExecState* exec, double value) { - return Identifier(exec, exec->globalData().numericStrings.add(value)); + return Identifier(exec, exec->vm().numericStrings.add(value)); +} + +Identifier Identifier::from(VM* vm, unsigned value) +{ + return Identifier(vm, vm->numericStrings.add(value)); } -Identifier Identifier::from(JSGlobalData* globalData, unsigned value) +Identifier Identifier::from(VM* vm, int value) { - return Identifier(globalData, globalData->numericStrings.add(value)); + return Identifier(vm, vm->numericStrings.add(value)); } -Identifier Identifier::from(JSGlobalData* globalData, int value) +Identifier Identifier::from(VM* vm, double value) { - return Identifier(globalData, globalData->numericStrings.add(value)); + return Identifier(vm, vm->numericStrings.add(value)); } -Identifier Identifier::from(JSGlobalData* globalData, double value) +void Identifier::dump(PrintStream& out) const { - return Identifier(globalData, 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! -NO_RETURN_DUE_TO_CRASH void Identifier::checkCurrentIdentifierTable(JSGlobalData*) { CRASH(); } -NO_RETURN_DUE_TO_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