Changeset 34412 in webkit for trunk/JavaScriptCore/kjs/JSGlobalObject.h

Timestamp:

Jun 6, 2008, 11:03:24 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin.

Combine per-thread objects into one, to make it easier to support legacy clients (for
which they shouldn't be really per-thread).

No change on SunSpider total.

• JavaScriptCore.xcodeproj/project.pbxproj: Added JSGlobalData.{h,cpp}

• kjs/JSGlobalData.cpp: Added. (KJS::JSGlobalData::JSGlobalData): (KJS::JSGlobalData::~JSGlobalData): (KJS::JSGlobalData::threadInstance):
• kjs/JSGlobalData.h: Added. This class encapsulates all data that should be per-thread (or shared between legacy clients). It will also keep a Heap pointer, but right now, Heap (Collector) methods are all static.

• kjs/identifier.h: (KJS::Identifier::Identifier): Added a constructor explicitly taking JSGlobalData to access IdentifierTable. Actually, all of them should, but this will be a separate patch.

• kjs/identifier.cpp: (KJS::IdentifierTable::literalTable): (KJS::createIdentifierTable): (KJS::deleteIdentifierTable): (KJS::Identifier::add): (KJS::Identifier::addSlowCase): Combined IdentifierTable and LiteralIdentifierTable into a single class for simplicity.

• kjs/grammar.y: kjsyyparse now takes JSGlobalData, not just a Lexer.

• kjs/nodes.cpp: (KJS::Node::Node): (KJS::EvalFunctionCallNode::emitCode): (KJS::ScopeNode::ScopeNode): Changed to access Lexer and Parser via JSGlobalData::threadInstance(). This is also a temporary measure, they will need to use JSGlobalData explicitly.

• VM/CodeGenerator.cpp: (KJS::CodeGenerator::CodeGenerator):
• VM/CodeGenerator.h:
• VM/Machine.cpp: (KJS::callEval):
• kjs/CommonIdentifiers.cpp: (KJS::CommonIdentifiers::CommonIdentifiers):
• kjs/CommonIdentifiers.h:
• kjs/DebuggerCallFrame.cpp: (KJS::DebuggerCallFrame::evaluate):
• kjs/ExecState.cpp: (KJS::ExecState::ExecState):
• kjs/ExecState.h: (KJS::ExecState::globalData): (KJS::ExecState::identifierTable): (KJS::ExecState::propertyNames): (KJS::ExecState::emptyList): (KJS::ExecState::lexer): (KJS::ExecState::parser): (KJS::ExecState::arrayTable): (KJS::ExecState::dateTable): (KJS::ExecState::mathTable): (KJS::ExecState::numberTable): (KJS::ExecState::RegExpImpTable): (KJS::ExecState::RegExpObjectImpTable): (KJS::ExecState::stringTable):
• kjs/InitializeThreading.cpp: (KJS::initializeThreadingOnce):
• kjs/JSGlobalObject.cpp: (KJS::JSGlobalObject::init):
• kjs/JSGlobalObject.h: (KJS::JSGlobalObject::JSGlobalObjectData::JSGlobalObjectData): (KJS::JSGlobalObject::head): (KJS::JSGlobalObject::globalData):
• kjs/Parser.cpp: (KJS::Parser::parse):
• kjs/Parser.h:
• kjs/function.cpp: (KJS::FunctionImp::getParameterName): (KJS::IndexToNameMap::unMap): (KJS::globalFuncEval):
• kjs/function_object.cpp: (KJS::FunctionObjectImp::construct):
• kjs/interpreter.cpp: (KJS::Interpreter::checkSyntax): (KJS::Interpreter::evaluate):
• kjs/lexer.cpp: (kjsyylex):
• kjs/lexer.h:
• kjs/testkjs.cpp: (prettyPrintScript): Updated for the above changes. Most of threadInstance uses here will need to be replaced with explicitly passed pointers to support legacy JSC clients.

• JavaScriptCore.exp: Removed KJS::parser().

File:

• trunk/JavaScriptCore/kjs/JSGlobalObject.h (modified) (6 diffs)

trunk/JavaScriptCore/kjs/JSGlobalObject.h

@@ -24 +24 @@
 #define KJS_GlobalObject_h
 
+#include "JSGlobalData.h"
 #include "JSVariableObject.h"
 #include "RegisterFile.h"
@@ -72 +73 @@
     class UriErrorPrototype;
     struct ActivationStackNode;
-    struct ThreadClassInfoHashTables;
 
     typedef Vector<ExecState*, 16> ExecStateStack;
@@ -84 +84 @@
                 : JSVariableObjectData(&symbolTable, registerFileStack.globalBasePointer(), 0)
                 , globalScopeChain(globalObject, thisValue)
-                , globalExec(new ExecState(globalObject, thisValue, globalScopeChain.node()))
             {
             }
@@ -143 +142 @@
             unsigned pageGroupIdentifier;
 
-            PerThreadData perThreadData;
+            JSGlobalData* globalData;
 
             HashSet<ProgramCodeBlock*> codeBlocks;
@@ -176 +175 @@
         virtual void defineSetter(ExecState*, const Identifier& propertyName, JSObject* setterFunc);
 
-        // Linked list of all global objects.
-        static JSGlobalObject* head() { return s_head; }
+        // Per-thread linked list of all global objects.
+        static JSGlobalObject*& head() { return JSGlobalData::threadInstance().head; }
         JSGlobalObject* next() { return d()->next; }
 
@@ -260 +259 @@
 
         // Per-thread hash tables, cached on the global object for faster access.
-        const PerThreadData* perThreadData() const { return &d()->perThreadData; }
-
-        // Initialize and/or retrieve per-thread hash tables - use perThreadData() for faster access instead.
-        static ThreadClassInfoHashTables* threadClassInfoHashTables();
+        JSGlobalData* globalData() { return d()->globalData; }
 
         void init(JSObject* thisValue);