X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/f9bf01c6616d5ddcf65b13b33cedf9e387ff7a63..refs/heads/master:/runtime/Identifier.cpp

diff --git a/runtime/Identifier.cpp b/runtime/Identifier.cpp
index 76e762c..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,276 +22,109 @@
 #include "Identifier.h"
 
 #include "CallFrame.h"
-#include <new> // for placement new
-#include <string.h> // for strlen
+#include "JSObject.h"
+#include "JSScope.h"
+#include "NumericStrings.h"
+#include "JSCInlines.h"
+#include <new>
+#include <string.h>
 #include <wtf/Assertions.h>
 #include <wtf/FastMalloc.h>
 #include <wtf/HashSet.h>
+#include <wtf/text/ASCIIFastPath.h>
+#include <wtf/text/StringHash.h>
 
 using WTF::ThreadSpecific;
 
 namespace JSC {
 
-typedef HashMap<const char*, RefPtr<UString::Rep>, PtrHash<const char*> > LiteralIdentifierTable;
-
-class IdentifierTable : public FastAllocBase {
-public:
-    ~IdentifierTable()
-    {
-        HashSet<UString::Rep*>::iterator end = m_table.end();
-        for (HashSet<UString::Rep*>::iterator iter = m_table.begin(); iter != end; ++iter)
-            (*iter)->setIsIdentifier(false);
-    }
-    
-    std::pair<HashSet<UString::Rep*>::iterator, bool> add(UString::Rep* value)
-    {
-        std::pair<HashSet<UString::Rep*>::iterator, bool> result = m_table.add(value);
-        (*result.first)->setIsIdentifier(true);
-        return result;
-    }
-
-    template<typename U, typename V>
-    std::pair<HashSet<UString::Rep*>::iterator, bool> add(U value)
-    {
-        std::pair<HashSet<UString::Rep*>::iterator, bool> result = m_table.add<U, V>(value);
-        (*result.first)->setIsIdentifier(true);
-        return result;
-    }
-
-    void remove(UString::Rep* r) { m_table.remove(r); }
-
-    LiteralIdentifierTable& literalTable() { return m_literalTable; }
-
-private:
-    HashSet<UString::Rep*> m_table;
-    LiteralIdentifierTable m_literalTable;
-};
-
-IdentifierTable* createIdentifierTable()
-{
-    return new IdentifierTable;
-}
-
-void deleteIdentifierTable(IdentifierTable* table)
+Ref<StringImpl> Identifier::add(VM* vm, const char* c)
 {
-    delete table;
-}
-
-bool Identifier::equal(const UString::Rep* r, const char* s)
-{
-    int length = r->size();
-    const UChar* d = r->data();
-    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, int length)
-{
-    if (r->size() != length)
-        return false;
-    const UChar* d = r->data();
-    for (int i = 0; i != length; ++i)
-        if (d[i] != s[i])
-            return false;
-    return true;
-}
-
-struct CStringTranslator {
-    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<unsigned char>(c[i]); // use unsigned char to zero-extend instead of sign-extend
-        r->setHash(hash);
-        location = r;
-    }
-};
-
-PassRefPtr<UString::Rep> Identifier::add(JSGlobalData* globalData, const char* c)
-{
-    if (!c) {
-        UString::Rep::null().hash();
-        return &UString::Rep::null();
-    }
-    if (!c[0]) {
-        UString::Rep::empty().hash();
-        return &UString::Rep::empty();
-    }
+    ASSERT(c);
+    ASSERT(c[0]);
     if (!c[1])
-        return add(globalData, globalData->smallStrings.singleCharacterStringRep(static_cast<unsigned char>(c[0])));
-
-    IdentifierTable& identifierTable = *globalData->identifierTable;
-    LiteralIdentifierTable& literalIdentifierTable = identifierTable.literalTable();
-
-    const LiteralIdentifierTable::iterator& iter = literalIdentifierTable.find(c);
-    if (iter != literalIdentifierTable.end())
-        return iter->second;
+        return *vm->smallStrings.singleCharacterStringRep(c[0]);
 
-    pair<HashSet<UString::Rep*>::iterator, bool> addResult = identifierTable.add<const char*, CStringTranslator>(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<UString::Rep> addedString = addResult.second ? adoptRef(*addResult.first) : *addResult.first;
-
-    literalIdentifierTable.add(c, addedString.get());
-
-    return addedString.release();
+    return *AtomicStringImpl::add(c);
 }
 
-PassRefPtr<UString::Rep> Identifier::add(ExecState* exec, const char* c)
+Ref<StringImpl> 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 UCharBufferTranslator {
-    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<UString::Rep> Identifier::add(JSGlobalData* globalData, const UChar* s, int length)
+Ref<StringImpl> 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) {
-        UString::Rep::empty().hash();
-        return &UString::Rep::empty();
-    }
-    UCharBuffer buf = {s, length}; 
-    pair<HashSet<UString::Rep*>::iterator, bool> addResult = globalData->identifierTable->add<UCharBuffer, UCharBufferTranslator>(buf);
+    if (!length)
+        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<UString::Rep> Identifier::add(ExecState* exec, const UChar* s, int length)
+Identifier Identifier::from(ExecState* exec, unsigned value)
 {
-    return add(&exec->globalData(), s, length);
-}
-
-PassRefPtr<UString::Rep> Identifier::addSlowCase(JSGlobalData* globalData, UString::Rep* r)
-{
-    ASSERT(!r->isIdentifier());
-    if (r->size() == 1) {
-        UChar c = r->data()[0];
-        if (c <= 0xFF)
-            r = globalData->smallStrings.singleCharacterStringRep(c);
-            if (r->isIdentifier()) {
-#ifndef NDEBUG
-                checkSameIdentifierTable(globalData, r);
-#endif
-                return r;
-            }
-    }
-    if (!r->size()) {
-        UString::Rep::empty().hash();
-        return &UString::Rep::empty();
-    }
-    return *globalData->identifierTable->add(r).first;
+    return Identifier(exec, exec->vm().numericStrings.add(value));
 }
 
-PassRefPtr<UString::Rep> Identifier::addSlowCase(ExecState* exec, UString::Rep* r)
+Identifier Identifier::from(ExecState* exec, int value)
 {
-    return addSlowCase(&exec->globalData(), r);
+    return Identifier(exec, exec->vm().numericStrings.add(value));
 }
 
-void Identifier::remove(UString::Rep* r)
+Identifier Identifier::from(ExecState* exec, double value)
 {
-    currentIdentifierTable()->remove(r);
+    return Identifier(exec, exec->vm().numericStrings.add(value));
 }
 
-#ifndef NDEBUG
-
-void Identifier::checkSameIdentifierTable(ExecState* exec, UString::Rep*)
+Identifier Identifier::from(VM* vm, unsigned value)
 {
-    ASSERT_UNUSED(exec, exec->globalData().identifierTable == currentIdentifierTable());
+    return Identifier(vm, vm->numericStrings.add(value));
 }
 
-void Identifier::checkSameIdentifierTable(JSGlobalData* globalData, UString::Rep*)
+Identifier Identifier::from(VM* vm, int value)
 {
-    ASSERT_UNUSED(globalData, globalData->identifierTable == currentIdentifierTable());
+    return Identifier(vm, vm->numericStrings.add(value));
 }
 
-#else
-
-void Identifier::checkSameIdentifierTable(ExecState*, UString::Rep*)
+Identifier Identifier::from(VM* vm, double value)
 {
+    return Identifier(vm, vm->numericStrings.add(value));
 }
 
-void Identifier::checkSameIdentifierTable(JSGlobalData*, UString::Rep*)
+void Identifier::dump(PrintStream& out) const
 {
+    if (impl())
+        out.print(impl());
+    else
+        out.print("<null identifier>");
 }
 
-#endif
-
-ThreadSpecific<ThreadIdentifierTableData>* g_identifierTableSpecific = 0;
-ThreadIdentifierTableData* g_identifierTableMain = 0;
-
-#if ENABLE(JSC_MULTIPLE_THREADS)
+#ifndef NDEBUG
 
-pthread_once_t createIdentifierTableSpecificOnce = PTHREAD_ONCE_INIT;
-static void createIdentifierTableSpecificCallback()
+void Identifier::checkCurrentAtomicStringTable(VM* vm)
 {
-    ASSERT(!g_identifierTableSpecific);
-    g_identifierTableSpecific = new ThreadSpecific<ThreadIdentifierTableData>();
-    ASSERT(!g_identifierTableMain);
-    g_identifierTableMain = new ThreadIdentifierTableData();
+    // Check the identifier table accessible through the threadspecific matches the
+    // vm's identifier table.
+    ASSERT_UNUSED(vm, vm->atomicStringTable() == wtfThreadData().atomicStringTable());
 }
-void createIdentifierTableSpecific()
+
+void Identifier::checkCurrentAtomicStringTable(ExecState* exec)
 {
-    pthread_once(&createIdentifierTableSpecificOnce, createIdentifierTableSpecificCallback);
-    ASSERT(g_identifierTableSpecific);
-    ASSERT(g_identifierTableMain);
+    checkCurrentAtomicStringTable(&exec->vm());
 }
 
-#else 
+#else
 
-void createIdentifierTableSpecific()
-{
-    ASSERT(!g_identifierTableSpecific);
-    g_identifierTableSpecific = new ThreadSpecific<ThreadIdentifierTableData>();
-    ASSERT(!g_identifierTableMain);
-    g_identifierTableMain = new ThreadIdentifierTableData();
-}
+// These only exists so that our exports are the same for debug and release builds.
+// 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