Changeset 34412 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

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/nodes.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -194 +194 @@
     : m_expectedReturnType(ObjectType)
 {
-    m_line = lexer().lineNo();
+    m_line = JSGlobalData::threadInstance().lexer->lineNo();
 }
 
@@ -200 +200 @@
     : m_expectedReturnType(expectedReturn)
 {
-    m_line = lexer().lineNo();
+    m_line = JSGlobalData::threadInstance().lexer->lineNo();
 }
 
@@ -444 +444 @@
     RefPtr<RegisterID> base = generator.tempDestination(dst);
     RegisterID* func = generator.newTemporary();
-    generator.emitResolveWithBase(base.get(), func, CommonIdentifiers::shared()->eval);
+    generator.emitResolveWithBase(base.get(), func, generator.propertyNames().eval);
     return generator.emitCallEval(generator.finalDestination(dst, base.get()), func, base.get(), m_args.get());
 }
@@ -1722 +1722 @@
 ScopeNode::ScopeNode(SourceElements* children, VarStack* varStack, FunctionStack* funcStack, bool usesEval, bool needsClosure)
     : BlockNode(children)
-    , m_sourceURL(parser().sourceURL())
-    , m_sourceId(parser().sourceId())
+    , m_sourceURL(JSGlobalData::threadInstance().parser->sourceURL())
+    , m_sourceId(JSGlobalData::threadInstance().parser->sourceId())
     , m_usesEval(usesEval)
     , m_needsClosure(needsClosure)