Changeset 38427 in webkit for trunk/JavaScriptCore/parser/Nodes.h


Ignore:
Timestamp:
Nov 15, 2008, 1:05:23 PM (17 years ago)
Author:
[email protected]
Message:

2008-11-15 Geoffrey Garen <​[email protected]>

Reviewed by Sam Weinig.


Renames:


CodeGenerator => BytecodeGenerator
emitCodeForBlock => emitBytecodeForBlock
generatedByteCode => generatedBytecode
generateCode => generateBytecode

  • JavaScriptCore.exp:
  • bytecompiler/CodeGenerator.cpp: (JSC::BytecodeGenerator::setDumpsGeneratedCode): (JSC::BytecodeGenerator::generate): (JSC::BytecodeGenerator::addVar): (JSC::BytecodeGenerator::addGlobalVar): (JSC::BytecodeGenerator::allocateConstants): (JSC::BytecodeGenerator::BytecodeGenerator): (JSC::BytecodeGenerator::addParameter): (JSC::BytecodeGenerator::registerFor): (JSC::BytecodeGenerator::constRegisterFor): (JSC::BytecodeGenerator::isLocal): (JSC::BytecodeGenerator::isLocalConstant): (JSC::BytecodeGenerator::newRegister): (JSC::BytecodeGenerator::newTemporary): (JSC::BytecodeGenerator::highestUsedRegister): (JSC::BytecodeGenerator::newLabelScope): (JSC::BytecodeGenerator::newLabel): (JSC::BytecodeGenerator::emitLabel): (JSC::BytecodeGenerator::emitBytecode): (JSC::BytecodeGenerator::retrieveLastBinaryOp): (JSC::BytecodeGenerator::retrieveLastUnaryOp): (JSC::BytecodeGenerator::rewindBinaryOp): (JSC::BytecodeGenerator::rewindUnaryOp): (JSC::BytecodeGenerator::emitJump): (JSC::BytecodeGenerator::emitJumpIfTrue): (JSC::BytecodeGenerator::emitJumpIfFalse): (JSC::BytecodeGenerator::addConstant): (JSC::BytecodeGenerator::addUnexpectedConstant): (JSC::BytecodeGenerator::addRegExp): (JSC::BytecodeGenerator::emitMove): (JSC::BytecodeGenerator::emitUnaryOp): (JSC::BytecodeGenerator::emitPreInc): (JSC::BytecodeGenerator::emitPreDec): (JSC::BytecodeGenerator::emitPostInc): (JSC::BytecodeGenerator::emitPostDec): (JSC::BytecodeGenerator::emitBinaryOp): (JSC::BytecodeGenerator::emitEqualityOp): (JSC::BytecodeGenerator::emitLoad): (JSC::BytecodeGenerator::emitUnexpectedLoad): (JSC::BytecodeGenerator::findScopedProperty): (JSC::BytecodeGenerator::emitInstanceOf): (JSC::BytecodeGenerator::emitResolve): (JSC::BytecodeGenerator::emitGetScopedVar): (JSC::BytecodeGenerator::emitPutScopedVar): (JSC::BytecodeGenerator::emitResolveBase): (JSC::BytecodeGenerator::emitResolveWithBase): (JSC::BytecodeGenerator::emitResolveFunction): (JSC::BytecodeGenerator::emitGetById): (JSC::BytecodeGenerator::emitPutById): (JSC::BytecodeGenerator::emitPutGetter): (JSC::BytecodeGenerator::emitPutSetter): (JSC::BytecodeGenerator::emitDeleteById): (JSC::BytecodeGenerator::emitGetByVal): (JSC::BytecodeGenerator::emitPutByVal): (JSC::BytecodeGenerator::emitDeleteByVal): (JSC::BytecodeGenerator::emitPutByIndex): (JSC::BytecodeGenerator::emitNewObject): (JSC::BytecodeGenerator::emitNewArray): (JSC::BytecodeGenerator::emitNewFunction): (JSC::BytecodeGenerator::emitNewRegExp): (JSC::BytecodeGenerator::emitNewFunctionExpression): (JSC::BytecodeGenerator::emitCall): (JSC::BytecodeGenerator::emitCallEval): (JSC::BytecodeGenerator::emitReturn): (JSC::BytecodeGenerator::emitUnaryNoDstOp): (JSC::BytecodeGenerator::emitConstruct): (JSC::BytecodeGenerator::emitPushScope): (JSC::BytecodeGenerator::emitPopScope): (JSC::BytecodeGenerator::emitDebugHook): (JSC::BytecodeGenerator::pushFinallyContext): (JSC::BytecodeGenerator::popFinallyContext): (JSC::BytecodeGenerator::breakTarget): (JSC::BytecodeGenerator::continueTarget): (JSC::BytecodeGenerator::emitComplexJumpScopes): (JSC::BytecodeGenerator::emitJumpScopes): (JSC::BytecodeGenerator::emitNextPropertyName): (JSC::BytecodeGenerator::emitCatch): (JSC::BytecodeGenerator::emitNewError): (JSC::BytecodeGenerator::emitJumpSubroutine): (JSC::BytecodeGenerator::emitSubroutineReturn): (JSC::BytecodeGenerator::emitPushNewScope): (JSC::BytecodeGenerator::beginSwitch): (JSC::BytecodeGenerator::endSwitch): (JSC::BytecodeGenerator::emitThrowExpressionTooDeepException):
  • bytecompiler/CodeGenerator.h:
  • jsc.cpp: (runWithScripts):
  • parser/Nodes.cpp: (JSC::ThrowableExpressionData::emitThrowError): (JSC::NullNode::emitBytecode): (JSC::BooleanNode::emitBytecode): (JSC::NumberNode::emitBytecode): (JSC::StringNode::emitBytecode): (JSC::RegExpNode::emitBytecode): (JSC::ThisNode::emitBytecode): (JSC::ResolveNode::isPure): (JSC::ResolveNode::emitBytecode): (JSC::ArrayNode::emitBytecode): (JSC::ObjectLiteralNode::emitBytecode): (JSC::PropertyListNode::emitBytecode): (JSC::BracketAccessorNode::emitBytecode): (JSC::DotAccessorNode::emitBytecode): (JSC::ArgumentListNode::emitBytecode): (JSC::NewExprNode::emitBytecode): (JSC::EvalFunctionCallNode::emitBytecode): (JSC::FunctionCallValueNode::emitBytecode): (JSC::FunctionCallResolveNode::emitBytecode): (JSC::FunctionCallBracketNode::emitBytecode): (JSC::FunctionCallDotNode::emitBytecode): (JSC::emitPreIncOrDec): (JSC::emitPostIncOrDec): (JSC::PostfixResolveNode::emitBytecode): (JSC::PostfixBracketNode::emitBytecode): (JSC::PostfixDotNode::emitBytecode): (JSC::PostfixErrorNode::emitBytecode): (JSC::DeleteResolveNode::emitBytecode): (JSC::DeleteBracketNode::emitBytecode): (JSC::DeleteDotNode::emitBytecode): (JSC::DeleteValueNode::emitBytecode): (JSC::VoidNode::emitBytecode): (JSC::TypeOfResolveNode::emitBytecode): (JSC::TypeOfValueNode::emitBytecode): (JSC::PrefixResolveNode::emitBytecode): (JSC::PrefixBracketNode::emitBytecode): (JSC::PrefixDotNode::emitBytecode): (JSC::PrefixErrorNode::emitBytecode): (JSC::UnaryOpNode::emitBytecode): (JSC::BinaryOpNode::emitBytecode): (JSC::EqualNode::emitBytecode): (JSC::StrictEqualNode::emitBytecode): (JSC::ReverseBinaryOpNode::emitBytecode): (JSC::ThrowableBinaryOpNode::emitBytecode): (JSC::InstanceOfNode::emitBytecode): (JSC::LogicalOpNode::emitBytecode): (JSC::ConditionalNode::emitBytecode): (JSC::emitReadModifyAssignment): (JSC::ReadModifyResolveNode::emitBytecode): (JSC::AssignResolveNode::emitBytecode): (JSC::AssignDotNode::emitBytecode): (JSC::ReadModifyDotNode::emitBytecode): (JSC::AssignErrorNode::emitBytecode): (JSC::AssignBracketNode::emitBytecode): (JSC::ReadModifyBracketNode::emitBytecode): (JSC::CommaNode::emitBytecode): (JSC::ConstDeclNode::emitCodeSingle): (JSC::ConstDeclNode::emitBytecode): (JSC::ConstStatementNode::emitBytecode): (JSC::statementListEmitCode): (JSC::BlockNode::emitBytecode): (JSC::EmptyStatementNode::emitBytecode): (JSC::DebuggerStatementNode::emitBytecode): (JSC::ExprStatementNode::emitBytecode): (JSC::VarStatementNode::emitBytecode): (JSC::IfNode::emitBytecode): (JSC::IfElseNode::emitBytecode): (JSC::DoWhileNode::emitBytecode): (JSC::WhileNode::emitBytecode): (JSC::ForNode::emitBytecode): (JSC::ForInNode::emitBytecode): (JSC::ContinueNode::emitBytecode): (JSC::BreakNode::emitBytecode): (JSC::ReturnNode::emitBytecode): (JSC::WithNode::emitBytecode): (JSC::CaseBlockNode::emitBytecodeForBlock): (JSC::SwitchNode::emitBytecode): (JSC::LabelNode::emitBytecode): (JSC::ThrowNode::emitBytecode): (JSC::TryNode::emitBytecode): (JSC::EvalNode::emitBytecode): (JSC::EvalNode::generateBytecode): (JSC::FunctionBodyNode::generateBytecode): (JSC::FunctionBodyNode::emitBytecode): (JSC::ProgramNode::emitBytecode): (JSC::ProgramNode::generateBytecode): (JSC::FuncDeclNode::emitBytecode): (JSC::FuncExprNode::emitBytecode):
  • parser/Nodes.h: (JSC::ExpressionNode::): (JSC::BooleanNode::): (JSC::NumberNode::): (JSC::StringNode::): (JSC::ProgramNode::): (JSC::EvalNode::): (JSC::FunctionBodyNode::):
  • runtime/Arguments.h: (JSC::Arguments::getArgumentsData): (JSC::JSActivation::copyRegisters):
  • runtime/JSActivation.cpp: (JSC::JSActivation::mark):
  • runtime/JSActivation.h: (JSC::JSActivation::JSActivationData::JSActivationData):
  • runtime/JSFunction.cpp: (JSC::JSFunction::~JSFunction):
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/parser/Nodes.h

    r38425 r38427  
    4545
    4646    class CodeBlock;
    47     class CodeGenerator;
     47    class BytecodeGenerator;
    4848    class FuncDeclNode;
    4949    class EvalCodeBlock;
    … …  
    147147            node, "1".
    148148        */
    149         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* dst = 0) JSC_FAST_CALL = 0;
     149        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* dst = 0) JSC_FAST_CALL = 0;
    150150
    151151        int lineNo() const { return m_line; }
    … …  
    166166        virtual bool isString() const JSC_FAST_CALL { return false; }
    167167        virtual bool isNull() const JSC_FAST_CALL { return false; }
    168         virtual bool isPure(CodeGenerator&) const JSC_FAST_CALL { return false; }       
     168        virtual bool isPure(BytecodeGenerator&) const JSC_FAST_CALL { return false; }       
    169169        virtual bool isLocation() const JSC_FAST_CALL { return false; }
    170170        virtual bool isResolveNode() const JSC_FAST_CALL { return false; }
    … …  
    209209        virtual bool isNull() const JSC_FAST_CALL { return true; }
    210210
    211         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     211        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    212212    };
    213213
    … …  
    220220        }
    221221
    222         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    223 
    224         virtual bool isPure(CodeGenerator&) const JSC_FAST_CALL { return true; }
     222        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     223
     224        virtual bool isPure(BytecodeGenerator&) const JSC_FAST_CALL { return true; }
    225225
    226226    private:
    … …  
    236236        }
    237237
    238         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     238        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    239239
    240240        virtual bool isNumber() const JSC_FAST_CALL { return true; }
    241         virtual bool isPure(CodeGenerator&) const JSC_FAST_CALL { return true; }
     241        virtual bool isPure(BytecodeGenerator&) const JSC_FAST_CALL { return true; }
    242242        double value() const JSC_FAST_CALL { return m_double; }
    243243        void setValue(double d) JSC_FAST_CALL { m_double = d; }
    … …  
    255255        }
    256256
    257         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     257        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    258258       
    259259        virtual bool isString() const JSC_FAST_CALL { return true; }
    260260        const Identifier& value() { return m_value; }
    261         virtual bool isPure(CodeGenerator&) const JSC_FAST_CALL { return true; }
     261        virtual bool isPure(BytecodeGenerator&) const JSC_FAST_CALL { return true; }
    262262
    263263    private:
    … …  
    293293
    294294    protected:
    295         RegisterID* emitThrowError(CodeGenerator&, ErrorType, const char* msg);
    296         RegisterID* emitThrowError(CodeGenerator&, ErrorType, const char* msg, const Identifier&);
     295        RegisterID* emitThrowError(BytecodeGenerator&, ErrorType, const char* msg);
     296        RegisterID* emitThrowError(BytecodeGenerator&, ErrorType, const char* msg, const Identifier&);
    297297
    298298    private:
    … …  
    371371        }
    372372
    373         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     373        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    374374
    375375    private:
    … …  
    385385        }
    386386
    387         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     387        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    388388    };
    389389
    … …  
    397397        }
    398398
    399         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    400 
    401         virtual bool isPure(CodeGenerator&) const JSC_FAST_CALL;
     399        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     400
     401        virtual bool isPure(BytecodeGenerator&) const JSC_FAST_CALL;
    402402        virtual bool isLocation() const JSC_FAST_CALL { return true; }
    403403        virtual bool isResolveNode() const JSC_FAST_CALL { return true; }
    … …  
    468468        virtual void releaseNodes(NodeReleaser&);
    469469
    470         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     470        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    471471
    472472    private:
    … …  
    518518        virtual void releaseNodes(NodeReleaser&);
    519519
    520         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     520        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    521521
    522522    private:
    … …  
    541541        virtual void releaseNodes(NodeReleaser&);
    542542
    543         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     543        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    544544
    545545    private:
    … …  
    560560        virtual void releaseNodes(NodeReleaser&);
    561561
    562         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     562        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    563563
    564564        virtual bool isLocation() const JSC_FAST_CALL { return true; }
    … …  
    585585        virtual void releaseNodes(NodeReleaser&);
    586586
    587         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     587        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    588588
    589589        virtual bool isLocation() const JSC_FAST_CALL { return true; }
    … …  
    615615        virtual void releaseNodes(NodeReleaser&);
    616616
    617         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     617        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    618618
    619619        RefPtr<ArgumentListNode> m_next;
    … …  
    658658        virtual void releaseNodes(NodeReleaser&);
    659659
    660         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     660        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    661661
    662662    private:
    … …  
    677677        virtual void releaseNodes(NodeReleaser&);
    678678
    679         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     679        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    680680
    681681    private:
    … …  
    696696        virtual void releaseNodes(NodeReleaser&);
    697697
    698         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     698        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    699699
    700700    private:
    … …  
    716716        virtual void releaseNodes(NodeReleaser&);
    717717
    718         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     718        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    719719
    720720    private:
    … …  
    739739        virtual void releaseNodes(NodeReleaser&);
    740740
    741         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     741        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    742742
    743743    private:
    … …  
    761761        virtual void releaseNodes(NodeReleaser&);
    762762
    763         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     763        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    764764
    765765    private:
    … …  
    790790        }
    791791
    792         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     792        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    793793
    794794    private:
    … …  
    810810        virtual void releaseNodes(NodeReleaser&);
    811811
    812         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     812        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    813813
    814814    private:
    … …  
    832832        virtual void releaseNodes(NodeReleaser&);
    833833
    834         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     834        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    835835
    836836    private:
    … …  
    853853        virtual void releaseNodes(NodeReleaser&);
    854854
    855         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     855        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    856856
    857857    private:
    … …  
    869869        }
    870870
    871         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     871        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    872872
    873873    private:
    … …  
    888888        virtual void releaseNodes(NodeReleaser&);
    889889
    890         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     890        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    891891
    892892    private:
    … …  
    908908        virtual void releaseNodes(NodeReleaser&);
    909909
    910         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     910        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    911911
    912912    private:
    … …  
    926926        virtual void releaseNodes(NodeReleaser&);
    927927
    928         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     928        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    929929
    930930    private:
    … …  
    943943        virtual void releaseNodes(NodeReleaser&);
    944944
    945         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     945        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    946946
    947947    private:
    … …  
    957957        }
    958958
    959         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     959        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    960960
    961961        const Identifier& identifier() const JSC_FAST_CALL { return m_ident; }
    … …  
    976976        virtual void releaseNodes(NodeReleaser&);
    977977
    978         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     978        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    979979
    980980    private:
    … …  
    990990        }
    991991
    992         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     992        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    993993
    994994    private:
    … …  
    10101010        virtual void releaseNodes(NodeReleaser&);
    10111011
    1012         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1012        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    10131013
    10141014    private:
    … …  
    10321032        virtual void releaseNodes(NodeReleaser&);
    10331033
    1034         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1034        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    10351035
    10361036    private:
    … …  
    10531053        virtual void releaseNodes(NodeReleaser&);
    10541054
    1055         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1055        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    10561056
    10571057    private:
    … …  
    10771077        virtual void releaseNodes(NodeReleaser&);
    10781078
    1079         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1079        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    10801080        virtual BytecodeID bytecode() const JSC_FAST_CALL = 0;
    10811081
    … …  
    11471147        virtual void releaseNodes(NodeReleaser&);
    11481148
    1149         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1149        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    11501150        virtual BytecodeID bytecode() const JSC_FAST_CALL = 0;
    11511151
    … …  
    11681168        }
    11691169
    1170         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1170        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    11711171    };
    11721172
    … …  
    13011301        {
    13021302        }
    1303         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1303        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    13041304    };
    13051305   
    … …  
    13131313        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_instanceof; }
    13141314
    1315         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1315        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    13161316    };
    13171317
    … …  
    13331333        }
    13341334
    1335         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1335        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    13361336        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_eq; }
    13371337    };
    … …  
    13541354        }
    13551355
    1356         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1356        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    13571357        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_stricteq; }
    13581358    };
    … …  
    14141414        virtual void releaseNodes(NodeReleaser&);
    14151415
    1416         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1416        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    14171417
    14181418    private:
    … …  
    14381438        virtual void releaseNodes(NodeReleaser&);
    14391439
    1440         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1440        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    14411441
    14421442    private:
    … …  
    14611461        virtual void releaseNodes(NodeReleaser&);
    14621462
    1463         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1463        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    14641464
    14651465    private:
    … …  
    14841484        virtual void releaseNodes(NodeReleaser&);
    14851485
    1486         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1486        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    14871487
    14881488    private:
    … …  
    15101510        virtual void releaseNodes(NodeReleaser&);
    15111511
    1512         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1512        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    15131513
    15141514    private:
    … …  
    15371537        virtual void releaseNodes(NodeReleaser&);
    15381538
    1539         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1539        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    15401540
    15411541    private:
    … …  
    15621562        virtual void releaseNodes(NodeReleaser&);
    15631563
    1564         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1564        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    15651565
    15661566    private:
    … …  
    15871587        virtual void releaseNodes(NodeReleaser&);
    15881588
    1589         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1589        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    15901590
    15911591    private:
    … …  
    16111611        virtual void releaseNodes(NodeReleaser&);
    16121612
    1613         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1613        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    16141614
    16151615    private:
    … …  
    16311631        virtual void releaseNodes(NodeReleaser&);
    16321632
    1633         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1633        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    16341634
    16351635    private:
    … …  
    16571657        RefPtr<ExpressionNode> m_init;
    16581658       
    1659         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    1660         virtual RegisterID* emitCodeSingle(CodeGenerator&) JSC_FAST_CALL;
     1659        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1660        virtual RegisterID* emitCodeSingle(BytecodeGenerator&) JSC_FAST_CALL;
    16611661    };
    16621662
    … …  
    16721672        virtual void releaseNodes(NodeReleaser&);
    16731673
    1674         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1674        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    16751675
    16761676    private:
    … …  
    17031703        virtual void releaseNodes(NodeReleaser&);
    17041704
    1705         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1705        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    17061706
    17071707        StatementVector& children() { return m_children; }
    … …  
    17201720        }
    17211721
    1722         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1722        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    17231723
    17241724        virtual bool isEmptyStatement() const JSC_FAST_CALL { return true; }
    … …  
    17321732        }
    17331733       
    1734         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1734        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    17351735    };
    17361736
    … …  
    17431743        }
    17441744
    1745         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1745        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    17461746
    17471747    private:
    … …  
    17601760        virtual void releaseNodes(NodeReleaser&);
    17611761
    1762         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1762        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    17631763
    17641764    private:
    … …  
    17781778        virtual void releaseNodes(NodeReleaser&);
    17791779
    1780         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1780        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    17811781
    17821782    protected:
    … …  
    17961796        virtual void releaseNodes(NodeReleaser&);
    17971797
    1798         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1798        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    17991799
    18001800    private:
    … …  
    18141814        virtual void releaseNodes(NodeReleaser&);
    18151815
    1816         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1816        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    18171817
    18181818        virtual bool isLoop() const JSC_FAST_CALL { return true; }
    … …  
    18351835        virtual void releaseNodes(NodeReleaser&);
    18361836
    1837         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1837        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    18381838
    18391839        virtual bool isLoop() const JSC_FAST_CALL { return true; }
    … …  
    18601860        virtual void releaseNodes(NodeReleaser&);
    18611861
    1862         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1862        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    18631863
    18641864        virtual bool isLoop() const JSC_FAST_CALL { return true; }
    … …  
    18801880        virtual void releaseNodes(NodeReleaser&);
    18811881
    1882         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1882        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    18831883
    18841884        virtual bool isLoop() const JSC_FAST_CALL { return true; }
    … …  
    19061906        }
    19071907       
    1908         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1908        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    19091909
    19101910    private:
    … …  
    19251925        }
    19261926       
    1927         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1927        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    19281928
    19291929    private:
    … …  
    19421942        virtual void releaseNodes(NodeReleaser&);
    19431943
    1944         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1944        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    19451945        virtual bool isReturnNode() const JSC_FAST_CALL { return true; }
    19461946
    … …  
    19631963        virtual void releaseNodes(NodeReleaser&);
    19641964
    1965         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1965        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    19661966
    19671967    private:
    … …  
    19841984        virtual void releaseNodes(NodeReleaser&);
    19851985
    1986         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     1986        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    19871987
    19881988    private:
    … …  
    20022002        virtual void releaseNodes(NodeReleaser&);
    20032003
    2004         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     2004        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    20052005
    20062006    private:
    … …  
    20222022        virtual void releaseNodes(NodeReleaser&);
    20232023
    2024         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* dst = 0) JSC_FAST_CALL;
     2024        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* dst = 0) JSC_FAST_CALL;
    20252025
    20262026    private:
    … …  
    21032103        {
    21042104            if (!m_code)
    2105                 generateCode(scopeChain);
     2105                generateBytecode(scopeChain);
    21062106            return *m_code;
    21072107        }
    … …  
    21102110        ProgramNode(JSGlobalData*, SourceElements*, VarStack*, FunctionStack*, const SourceCode&, CodeFeatures, int numConstants) JSC_FAST_CALL;
    21112111
    2112         void generateCode(ScopeChainNode*) JSC_FAST_CALL;
    2113         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     2112        void generateBytecode(ScopeChainNode*) JSC_FAST_CALL;
     2113        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    21142114
    21152115        Vector<size_t> m_varIndexes; // Storage indexes belonging to the nodes in m_varStack. (Recorded to avoid double lookup.)
    … …  
    21262126        {
    21272127            if (!m_code)
    2128                 generateCode(scopeChain);
     2128                generateBytecode(scopeChain);
    21292129            return *m_code;
    21302130        }
    … …  
    21332133        EvalNode(JSGlobalData*, SourceElements*, VarStack*, FunctionStack*, const SourceCode&, CodeFeatures, int numConstants) JSC_FAST_CALL;
    21342134
    2135         void generateCode(ScopeChainNode*) JSC_FAST_CALL;
    2136         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     2135        void generateBytecode(ScopeChainNode*) JSC_FAST_CALL;
     2136        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    21372137       
    21382138        OwnPtr<EvalCodeBlock> m_code;
    … …  
    21512151        Identifier* copyParameters();
    21522152
    2153         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     2153        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    21542154       
    21552155        CodeBlock& bytecode(ScopeChainNode* scopeChain) JSC_FAST_CALL
    … …  
    21572157            ASSERT(scopeChain);
    21582158            if (!m_code)
    2159                 generateCode(scopeChain);
     2159                generateBytecode(scopeChain);
    21602160            return *m_code;
    21612161        }
    21622162
    2163         CodeBlock& generatedByteCode() JSC_FAST_CALL
     2163        CodeBlock& generatedBytecode() JSC_FAST_CALL
    21642164        {
    21652165            ASSERT(m_code);
    … …  
    21962196        FunctionBodyNode(JSGlobalData*, SourceElements*, VarStack*, FunctionStack*, const SourceCode&, CodeFeatures, int numConstants) JSC_FAST_CALL;
    21972197
    2198         void generateCode(ScopeChainNode*) JSC_FAST_CALL;
     2198        void generateBytecode(ScopeChainNode*) JSC_FAST_CALL;
    21992199
    22002200        Identifier* m_parameters;
    … …  
    22182218        virtual void releaseNodes(NodeReleaser&);
    22192219
    2220         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     2220        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    22212221        JSFunction* makeFunction(ExecState*, ScopeChainNode*) JSC_FAST_CALL;
    22222222
    … …  
    22432243        virtual void releaseNodes(NodeReleaser&);
    22442244
    2245         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     2245        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    22462246
    22472247        JSFunction* makeFunction(ExecState*, ScopeChainNode*) JSC_FAST_CALL;
    … …  
    23222322        virtual void releaseNodes(NodeReleaser&);
    23232323
    2324         RegisterID* emitCodeForBlock(CodeGenerator&, RegisterID* input, RegisterID* dst = 0) JSC_FAST_CALL;
     2324        RegisterID* emitBytecodeForBlock(BytecodeGenerator&, RegisterID* input, RegisterID* dst = 0) JSC_FAST_CALL;
    23252325
    23262326    private:
    … …  
    23432343        virtual void releaseNodes(NodeReleaser&);
    23442344
    2345         virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     2345        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
    23462346
    23472347    private:
Note: See TracChangeset for help on using the changeset viewer.