Ignore:
Timestamp:
Nov 15, 2008, 2:33:58 PM (17 years ago)
Author:
[email protected]
Message:

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

Reviewed by Sam Weinig.


Renamed LabelID to Label, Label::isForwardLabel to Label::isForward.

  • VM/LabelID.h: (JSC::Label::Label): (JSC::Label::isForward):
  • bytecompiler/CodeGenerator.cpp: (JSC::BytecodeGenerator::newLabel): (JSC::BytecodeGenerator::emitLabel): (JSC::BytecodeGenerator::emitJump): (JSC::BytecodeGenerator::emitJumpIfTrue): (JSC::BytecodeGenerator::emitJumpIfFalse): (JSC::BytecodeGenerator::pushFinallyContext): (JSC::BytecodeGenerator::emitComplexJumpScopes): (JSC::BytecodeGenerator::emitJumpScopes): (JSC::BytecodeGenerator::emitNextPropertyName): (JSC::BytecodeGenerator::emitCatch): (JSC::BytecodeGenerator::emitJumpSubroutine): (JSC::prepareJumpTableForImmediateSwitch): (JSC::prepareJumpTableForCharacterSwitch): (JSC::prepareJumpTableForStringSwitch): (JSC::BytecodeGenerator::endSwitch):
  • bytecompiler/CodeGenerator.h:
  • bytecompiler/LabelScope.h: (JSC::LabelScope::LabelScope): (JSC::LabelScope::breakTarget): (JSC::LabelScope::continueTarget):
  • parser/Nodes.cpp: (JSC::LogicalOpNode::emitBytecode): (JSC::ConditionalNode::emitBytecode): (JSC::IfNode::emitBytecode): (JSC::IfElseNode::emitBytecode): (JSC::DoWhileNode::emitBytecode): (JSC::WhileNode::emitBytecode): (JSC::ForNode::emitBytecode): (JSC::ForInNode::emitBytecode): (JSC::ReturnNode::emitBytecode): (JSC::CaseBlockNode::emitBytecodeForBlock): (JSC::TryNode::emitBytecode):
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/parser/Nodes.cpp

    r38428 r38430  
    11871187{
    11881188    RefPtr<RegisterID> temp = generator.tempDestination(dst);
    1189     RefPtr<LabelID> target = generator.newLabel();
     1189    RefPtr<Label> target = generator.newLabel();
    11901190   
    11911191    generator.emitNode(temp.get(), m_expr1.get());
    … …  
    12171217{
    12181218    RefPtr<RegisterID> newDst = generator.finalDestination(dst);
    1219     RefPtr<LabelID> beforeElse = generator.newLabel();
    1220     RefPtr<LabelID> afterElse = generator.newLabel();
     1219    RefPtr<Label> beforeElse = generator.newLabel();
     1220    RefPtr<Label> afterElse = generator.newLabel();
    12211221
    12221222    RegisterID* cond = generator.emitNode(m_logical.get());
    … …  
    16751675RegisterID* IfNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst)
    16761676{
    1677     RefPtr<LabelID> afterThen = generator.newLabel();
     1677    RefPtr<Label> afterThen = generator.newLabel();
    16781678
    16791679    RegisterID* cond = generator.emitNode(m_condition.get());
    … …  
    17051705RegisterID* IfElseNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst)
    17061706{
    1707     RefPtr<LabelID> beforeElse = generator.newLabel();
    1708     RefPtr<LabelID> afterElse = generator.newLabel();
     1707    RefPtr<Label> beforeElse = generator.newLabel();
     1708    RefPtr<Label> afterElse = generator.newLabel();
    17091709
    17101710    RegisterID* cond = generator.emitNode(m_condition.get());
    … …  
    17471747    RefPtr<LabelScope> scope = generator.newLabelScope(LabelScope::Loop);
    17481748
    1749     RefPtr<LabelID> topOfLoop = generator.newLabel();
     1749    RefPtr<Label> topOfLoop = generator.newLabel();
    17501750    generator.emitLabel(topOfLoop.get());
    17511751
    … …  
    17851785    generator.emitJump(scope->continueTarget());
    17861786
    1787     RefPtr<LabelID> topOfLoop = generator.newLabel();
     1787    RefPtr<Label> topOfLoop = generator.newLabel();
    17881788    generator.emitLabel(topOfLoop.get());
    17891789
    … …  
    18311831        generator.emitNode(ignoredResult(), m_expr1.get());
    18321832
    1833     RefPtr<LabelID> condition = generator.newLabel();
     1833    RefPtr<Label> condition = generator.newLabel();
    18341834    generator.emitJump(condition.get());
    18351835
    1836     RefPtr<LabelID> topOfLoop = generator.newLabel();
     1836    RefPtr<Label> topOfLoop = generator.newLabel();
    18371837    generator.emitLabel(topOfLoop.get());
    18381838
    … …  
    19041904        return emitThrowError(generator, ReferenceError, "Left side of for-in statement is not a reference.");
    19051905
    1906     RefPtr<LabelID> continueTarget = generator.newLabel();
     1906    RefPtr<Label> continueTarget = generator.newLabel();
    19071907
    19081908    generator.emitDebugHook(WillExecuteStatement, firstLine(), lastLine());
    … …  
    19141914    generator.emitJump(scope->continueTarget());
    19151915
    1916     RefPtr<LabelID> loopStart = generator.newLabel();
     1916    RefPtr<Label> loopStart = generator.newLabel();
    19171917    generator.emitLabel(loopStart.get());
    19181918
    … …  
    20132013    RegisterID* r0 = m_value ? generator.emitNode(dst, m_value.get()) : generator.emitLoad(dst, jsUndefined());
    20142014    if (generator.scopeDepth()) {
    2015         RefPtr<LabelID> l0 = generator.newLabel();
     2015        RefPtr<Label> l0 = generator.newLabel();
    20162016        generator.emitJumpScopes(l0.get(), 0);
    20172017        generator.emitLabel(l0.get());
    … …  
    21622162RegisterID* CaseBlockNode::emitBytecodeForBlock(BytecodeGenerator& generator, RegisterID* switchExpression, RegisterID* dst)
    21632163{
    2164     RefPtr<LabelID> defaultLabel;
    2165     Vector<RefPtr<LabelID>, 8> labelVector;
     2164    RefPtr<Label> defaultLabel;
     2165    Vector<RefPtr<Label>, 8> labelVector;
    21662166    Vector<ExpressionNode*, 8> literalVector;
    21672167    int32_t min_num = std::numeric_limits<int32_t>::max();
    … …  
    23102310RegisterID* TryNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst)
    23112311{
    2312     RefPtr<LabelID> tryStartLabel = generator.newLabel();
    2313     RefPtr<LabelID> tryEndLabel = generator.newLabel();
    2314     RefPtr<LabelID> finallyStart;
     2312    RefPtr<Label> tryStartLabel = generator.newLabel();
     2313    RefPtr<Label> tryEndLabel = generator.newLabel();
     2314    RefPtr<Label> finallyStart;
    23152315    RefPtr<RegisterID> finallyReturnAddr;
    23162316    if (m_finallyBlock) {
    … …  
    23242324
    23252325    if (m_catchBlock) {
    2326         RefPtr<LabelID> handlerEndLabel = generator.newLabel();
     2326        RefPtr<Label> handlerEndLabel = generator.newLabel();
    23272327        generator.emitJump(handlerEndLabel.get());
    23282328        RefPtr<RegisterID> exceptionRegister = generator.emitCatch(generator.newTemporary(), tryStartLabel.get(), tryEndLabel.get());
    … …  
    23402340        // approach to not clobbering anything important
    23412341        RefPtr<RegisterID> highestUsedRegister = generator.highestUsedRegister();
    2342         RefPtr<LabelID> finallyEndLabel = generator.newLabel();
     2342        RefPtr<Label> finallyEndLabel = generator.newLabel();
    23432343        generator.emitJumpSubroutine(finallyReturnAddr.get(), finallyStart.get());
    23442344        // Use a label to record the subtle fact that sret will return to the
Note: See TracChangeset for help on using the changeset viewer.