JavaScriptCore-1218.33.tar.gz

[apple/javascriptcore.git] / runtime / SmallStrings.h

diff --git a/runtime/SmallStrings.h b/runtime/SmallStrings.h
index cc11d0ace5c1e56ccf885304d2ccdcd4843f8f97..f0004302163ad53855424c72df94928d20fffbea 100644 (file)
--- a/runtime/SmallStrings.h
+++ b/runtime/SmallStrings.h
@@ -26,47 +26,85 @@
 #ifndef SmallStrings_h
 #define SmallStrings_h
 
-#include "UString.h"
+#include "WriteBarrier.h"
+
+#include <wtf/FixedArray.h>
+#include <wtf/Noncopyable.h>
 #include <wtf/OwnPtr.h>
 
+#define JSC_COMMON_STRINGS_EACH_NAME(macro) \
+    macro(boolean) \
+    macro(false) \
+    macro(function) \
+    macro(number) \
+    macro(null) \
+    macro(object) \
+    macro(undefined) \
+    macro(string) \
+    macro(true)
+
+namespace WTF {
+class StringImpl;
+}
+
 namespace JSC {
 
-    class JSGlobalData;
+    class HeapRootVisitor;
+    class VM;
     class JSString;
-    class MarkStack;
     class SmallStringsStorage;
+    class SlotVisitor;
 
-    class SmallStrings : public Noncopyable {
+    static const unsigned maxSingleCharacterString = 0xFF;
+
+    class SmallStrings {
+        WTF_MAKE_NONCOPYABLE(SmallStrings);
     public:
         SmallStrings();
         ~SmallStrings();
 
-        JSString* emptyString(JSGlobalData* globalData)
+        JSString* emptyString()
         {
-            if (!m_emptyString)
-                createEmptyString(globalData);
             return m_emptyString;
         }
-        JSString* singleCharacterString(JSGlobalData* globalData, unsigned char character)
+
+        JSString* singleCharacterString(VM* vm, unsigned char character)
         {
             if (!m_singleCharacterStrings[character])
-                createSingleCharacterString(globalData, character);
+                createSingleCharacterString(vm, character);
             return m_singleCharacterStrings[character];
         }
 
-        UString::Rep* singleCharacterStringRep(unsigned char character);
+        JS_EXPORT_PRIVATE WTF::StringImpl* singleCharacterStringRep(unsigned char character);
 
-        void markChildren(MarkStack&);
-        void clear();
+        void finalizeSmallStrings();
 
-        unsigned count() const;
+        JSString** singleCharacterStrings() { return &m_singleCharacterStrings[0]; }
+
+        void initializeCommonStrings(VM&);
+        void visitStrongReferences(SlotVisitor&);
+
+#define JSC_COMMON_STRINGS_ACCESSOR_DEFINITION(name) \
+        JSString* name##String() const \
+        { \
+            return m_##name; \
+        }
+        JSC_COMMON_STRINGS_EACH_NAME(JSC_COMMON_STRINGS_ACCESSOR_DEFINITION)
+#undef JSC_COMMON_STRINGS_ACCESSOR_DEFINITION
 
     private:
-        void createEmptyString(JSGlobalData*);
-        void createSingleCharacterString(JSGlobalData*, unsigned char);
+        static const unsigned singleCharacterStringCount = maxSingleCharacterString + 1;
+
+        JS_EXPORT_PRIVATE void createEmptyString(VM*);
+        JS_EXPORT_PRIVATE void createSingleCharacterString(VM*, unsigned char);
+
+        void initialize(VM* vm, JSString*& string, const char* value) const;
 
         JSString* m_emptyString;
-        JSString* m_singleCharacterStrings[0x100];
+#define JSC_COMMON_STRINGS_ATTRIBUTE_DECLARATION(name) JSString* m_##name;
+        JSC_COMMON_STRINGS_EACH_NAME(JSC_COMMON_STRINGS_ATTRIBUTE_DECLARATION)
+#undef JSC_COMMON_STRINGS_ATTRIBUTE_DECLARATION
+        JSString* m_singleCharacterStrings[singleCharacterStringCount];
         OwnPtr<SmallStringsStorage> m_storage;
     };