Changeset 34412 in webkit for trunk/JavaScriptCore/JavaScriptCore.xcodeproj

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/JavaScriptCore.xcodeproj/project.pbxproj (modified) (5 diffs)

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -234 +234 @@
                 E17863400D9BEC0000D74E75 /* InitializeThreading.h in Headers */ = {isa = PBXBuildFile; fileRef = E178633F0D9BEC0000D74E75 /* InitializeThreading.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 E178636D0D9BEEC300D74E75 /* InitializeThreading.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E178636C0D9BEEC300D74E75 /* InitializeThreading.cpp */; };
+                E18E3A580DF9278C00D90B34 /* JSGlobalData.h in Headers */ = {isa = PBXBuildFile; fileRef = E18E3A560DF9278C00D90B34 /* JSGlobalData.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                E18E3A590DF9278C00D90B34 /* JSGlobalData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E18E3A570DF9278C00D90B34 /* JSGlobalData.cpp */; };
                 E195679609E7CF1200B89D13 /* UnicodeIcu.h in Headers */ = {isa = PBXBuildFile; fileRef = E195678F09E7CF1200B89D13 /* UnicodeIcu.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 E195679809E7CF1200B89D13 /* Unicode.h in Headers */ = {isa = PBXBuildFile; fileRef = E195679409E7CF1200B89D13 /* Unicode.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -580 +582 @@
                 E178633F0D9BEC0000D74E75 /* InitializeThreading.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InitializeThreading.h; sourceTree = "<group>"; };
                 E178636C0D9BEEC300D74E75 /* InitializeThreading.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InitializeThreading.cpp; sourceTree = "<group>"; };
+                E18E3A560DF9278C00D90B34 /* JSGlobalData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSGlobalData.h; sourceTree = "<group>"; };
+                E18E3A570DF9278C00D90B34 /* JSGlobalData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGlobalData.cpp; sourceTree = "<group>"; };
                 E195678F09E7CF1200B89D13 /* UnicodeIcu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnicodeIcu.h; sourceTree = "<group>"; };
                 E195679409E7CF1200B89D13 /* Unicode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Unicode.h; sourceTree = "<group>"; };
@@ -1011 +1015 @@
                                 14DA818F0D99FD2000B0A4FB /* JSActivation.cpp */,
                                 14DA818E0D99FD2000B0A4FB /* JSActivation.h */,
+                                E18E3A560DF9278C00D90B34 /* JSGlobalData.h */,
+                                E18E3A570DF9278C00D90B34 /* JSGlobalData.cpp */,
                                 14DE0D680D02431400AACCA2 /* JSGlobalObject.cpp */,
                                 A8E894330CD0603F00367179 /* JSGlobalObject.h */,
@@ -1298 +1304 @@
                                 A7C31DA90DBEBA4300FDF8EB /* SegmentedVector.h in Headers */,
                                 1480DB9D0DDC227F003CFDF2 /* DebuggerCallFrame.h in Headers */,
+                                E18E3A580DF9278C00D90B34 /* JSGlobalData.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -1570 +1577 @@
                                 A72701B60DADE94900E548D7 /* ExceptionHelpers.cpp in Sources */,
                                 149559EE0DDCDDF700648087 /* DebuggerCallFrame.cpp in Sources */,
+                                E18E3A590DF9278C00D90B34 /* JSGlobalData.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;