Changeset 38430 in webkit for trunk/JavaScriptCore/bytecompiler/CodeGenerator.h

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:

• trunk/JavaScriptCore/bytecompiler/CodeGenerator.h (modified) (7 diffs)

trunk/JavaScriptCore/bytecompiler/CodeGenerator.h

@@ -52 +52 @@
 
     struct FinallyContext {
-        LabelID* finallyAddr;
+        Label* finallyAddr;
         RegisterID* retAddrDst;
     };
@@ -151 +151 @@
 
         PassRefPtr<LabelScope> newLabelScope(LabelScope::Type, const Identifier* = 0);
-        PassRefPtr<LabelID> newLabel();
+        PassRefPtr<Label> newLabel();
 
         // The emitNode functions are just syntactic sugar for calling
@@ -282 +282 @@
         RegisterID* emitConstruct(RegisterID* dst, RegisterID* func, ArgumentsNode*, unsigned divot, unsigned startOffset, unsigned endOffset);
 
-        PassRefPtr<LabelID> emitLabel(LabelID*);
-        PassRefPtr<LabelID> emitJump(LabelID* target);
-        PassRefPtr<LabelID> emitJumpIfTrue(RegisterID* cond, LabelID* target);
-        PassRefPtr<LabelID> emitJumpIfFalse(RegisterID* cond, LabelID* target);
-        PassRefPtr<LabelID> emitJumpScopes(LabelID* target, int targetScopeDepth);
-
-        PassRefPtr<LabelID> emitJumpSubroutine(RegisterID* retAddrDst, LabelID*);
+        PassRefPtr<Label> emitLabel(Label*);
+        PassRefPtr<Label> emitJump(Label* target);
+        PassRefPtr<Label> emitJumpIfTrue(RegisterID* cond, Label* target);
+        PassRefPtr<Label> emitJumpIfFalse(RegisterID* cond, Label* target);
+        PassRefPtr<Label> emitJumpScopes(Label* target, int targetScopeDepth);
+
+        PassRefPtr<Label> emitJumpSubroutine(RegisterID* retAddrDst, Label*);
         void emitSubroutineReturn(RegisterID* retAddrSrc);
 
         RegisterID* emitGetPropertyNames(RegisterID* dst, RegisterID* base) { return emitUnaryOp(op_get_pnames, dst, base, ResultType::unknown()); }
-        RegisterID* emitNextPropertyName(RegisterID* dst, RegisterID* iter, LabelID* target);
-
-        RegisterID* emitCatch(RegisterID*, LabelID* start, LabelID* end);
+        RegisterID* emitNextPropertyName(RegisterID* dst, RegisterID* iter, Label* target);
+
+        RegisterID* emitCatch(RegisterID*, Label* start, Label* end);
         void emitThrow(RegisterID* exc) { emitUnaryNoDstOp(op_throw, exc); }
         RegisterID* emitNewError(RegisterID* dst, ErrorType type, JSValue* message);
@@ -306 +306 @@
         int scopeDepth() { return m_dynamicScopeDepth + m_finallyDepth; }
 
-        void pushFinallyContext(LabelID* target, RegisterID* returnAddrDst);
+        void pushFinallyContext(Label* target, RegisterID* returnAddrDst);
         void popFinallyContext();
 
@@ -313 +313 @@
 
         void beginSwitch(RegisterID*, SwitchInfo::SwitchType);
-        void endSwitch(uint32_t clauseCount, RefPtr<LabelID>*, ExpressionNode**, LabelID* defaultLabel, int32_t min, int32_t range);
+        void endSwitch(uint32_t clauseCount, RefPtr<Label>*, ExpressionNode**, Label* defaultLabel, int32_t min, int32_t range);
 
         CodeType codeType() const { return m_codeType; }
@@ -324 +324 @@
         void rewindUnaryOp();
 
-        PassRefPtr<LabelID> emitComplexJumpScopes(LabelID* target, ControlFlowContext* topScope, ControlFlowContext* bottomScope);
+        PassRefPtr<Label> emitComplexJumpScopes(Label* target, ControlFlowContext* topScope, ControlFlowContext* bottomScope);
 
         struct JSValueHashTraits : HashTraits<JSValue*> {
@@ -424 +424 @@
         SegmentedVector<RegisterID, 512> m_globals;
         SegmentedVector<LabelScope, 256> m_labelScopes;
-        SegmentedVector<LabelID, 256> m_labels;
+        SegmentedVector<Label, 256> m_labels;
         RefPtr<RegisterID> m_lastConstant;
         int m_finallyDepth;