Changeset 38430 in webkit for trunk/JavaScriptCore/bytecompiler

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):

Location:

trunk/JavaScriptCore/bytecompiler

Files:

• CodeGenerator.cpp (modified) (20 diffs)
• CodeGenerator.h (modified) (7 diffs)
• LabelScope.h (modified) (3 diffs)

trunk/JavaScriptCore/bytecompiler/CodeGenerator.cpp

@@ -485 +485 @@
 }
 
-PassRefPtr<LabelID> BytecodeGenerator::newLabel()
+PassRefPtr<Label> BytecodeGenerator::newLabel()
 {
     // Reclaim free label IDs.
@@ -496 +496 @@
 }
 
-PassRefPtr<LabelID> BytecodeGenerator::emitLabel(LabelID* l0)
+PassRefPtr<Label> BytecodeGenerator::emitLabel(Label* l0)
 {
     unsigned newLabelIndex = instructions().size();
@@ -552 +552 @@
 }
 
-PassRefPtr<LabelID> BytecodeGenerator::emitJump(LabelID* target)
-{
-    emitOpcode(target->isForwardLabel() ? op_jmp : op_loop);
+PassRefPtr<Label> BytecodeGenerator::emitJump(Label* target)
+{
+    emitOpcode(target->isForward() ? op_jmp : op_loop);
     instructions().append(target->offsetFrom(instructions().size()));
     return target;
 }
 
-PassRefPtr<LabelID> BytecodeGenerator::emitJumpIfTrue(RegisterID* cond, LabelID* target)
-{
-    if (m_lastOpcodeID == op_less && !target->isForwardLabel()) {
+PassRefPtr<Label> BytecodeGenerator::emitJumpIfTrue(RegisterID* cond, Label* target)
+{
+    if (m_lastOpcodeID == op_less && !target->isForward()) {
         int dstIndex;
         int src1Index;
@@ -576 +576 @@
             return target;
         }
-    } else if (m_lastOpcodeID == op_lesseq && !target->isForwardLabel()) {
+    } else if (m_lastOpcodeID == op_lesseq && !target->isForward()) {
         int dstIndex;
         int src1Index;
@@ -591 +591 @@
             return target;
         }
-    } else if (m_lastOpcodeID == op_eq_null && target->isForwardLabel()) {
+    } else if (m_lastOpcodeID == op_eq_null && target->isForward()) {
         int dstIndex;
         int srcIndex;
@@ -604 +604 @@
             return target;
         }
-    } else if (m_lastOpcodeID == op_neq_null && target->isForwardLabel()) {
+    } else if (m_lastOpcodeID == op_neq_null && target->isForward()) {
         int dstIndex;
         int srcIndex;
@@ -619 +619 @@
     }
 
-    emitOpcode(target->isForwardLabel() ? op_jtrue : op_loop_if_true);
+    emitOpcode(target->isForward() ? op_jtrue : op_loop_if_true);
     instructions().append(cond->index());
     instructions().append(target->offsetFrom(instructions().size()));
@@ -625 +625 @@
 }
 
-PassRefPtr<LabelID> BytecodeGenerator::emitJumpIfFalse(RegisterID* cond, LabelID* target)
-{
-    ASSERT(target->isForwardLabel());
+PassRefPtr<Label> BytecodeGenerator::emitJumpIfFalse(RegisterID* cond, Label* target)
+{
+    ASSERT(target->isForward());
 
     if (m_lastOpcodeID == op_less) {
@@ -1414 +1414 @@
 }
 
-void BytecodeGenerator::pushFinallyContext(LabelID* target, RegisterID* retAddrDst)
+void BytecodeGenerator::pushFinallyContext(Label* target, RegisterID* retAddrDst)
 {
     ControlFlowContext scope;
@@ -1501 +1501 @@
 }
 
-PassRefPtr<LabelID> BytecodeGenerator::emitComplexJumpScopes(LabelID* target, ControlFlowContext* topScope, ControlFlowContext* bottomScope)
+PassRefPtr<Label> BytecodeGenerator::emitComplexJumpScopes(Label* target, ControlFlowContext* topScope, ControlFlowContext* bottomScope)
 {
     while (topScope > bottomScope) {
@@ -1529 +1529 @@
             // Otherwise we just use jmp_scopes to pop a group of scopes and go
             // to the next instruction
-            RefPtr<LabelID> nextInsn = newLabel();
+            RefPtr<Label> nextInsn = newLabel();
             instructions().append(nextInsn->offsetFrom(instructions().size()));
             emitLabel(nextInsn.get());
@@ -1546 +1546 @@
 }
 
-PassRefPtr<LabelID> BytecodeGenerator::emitJumpScopes(LabelID* target, int targetScopeDepth)
+PassRefPtr<Label> BytecodeGenerator::emitJumpScopes(Label* target, int targetScopeDepth)
 {
     ASSERT(scopeDepth() - targetScopeDepth >= 0);
-    ASSERT(target->isForwardLabel());
+    ASSERT(target->isForward());
 
     size_t scopeDelta = scopeDepth() - targetScopeDepth;
@@ -1565 +1565 @@
 }
 
-RegisterID* BytecodeGenerator::emitNextPropertyName(RegisterID* dst, RegisterID* iter, LabelID* target)
+RegisterID* BytecodeGenerator::emitNextPropertyName(RegisterID* dst, RegisterID* iter, Label* target)
 {
     emitOpcode(op_next_pname);
@@ -1574 +1574 @@
 }
 
-RegisterID* BytecodeGenerator::emitCatch(RegisterID* targetRegister, LabelID* start, LabelID* end)
+RegisterID* BytecodeGenerator::emitCatch(RegisterID* targetRegister, Label* start, Label* end)
 {
     HandlerInfo info = { start->offsetFrom(0), end->offsetFrom(0), instructions().size(), m_dynamicScopeDepth, 0 };
@@ -1592 +1592 @@
 }
 
-PassRefPtr<LabelID> BytecodeGenerator::emitJumpSubroutine(RegisterID* retAddrDst, LabelID* finally)
+PassRefPtr<Label> BytecodeGenerator::emitJumpSubroutine(RegisterID* retAddrDst, Label* finally)
 {
     emitOpcode(op_jsr);
@@ -1655 +1655 @@
 }
 
-static void prepareJumpTableForImmediateSwitch(SimpleJumpTable& jumpTable, int32_t switchAddress, uint32_t clauseCount, RefPtr<LabelID>* labels, ExpressionNode** nodes, int32_t min, int32_t max)
+static void prepareJumpTableForImmediateSwitch(SimpleJumpTable& jumpTable, int32_t switchAddress, uint32_t clauseCount, RefPtr<Label>* labels, ExpressionNode** nodes, int32_t min, int32_t max)
 {
     jumpTable.min = min;
@@ -1663 +1663 @@
         // We're emitting this after the clause labels should have been fixed, so 
         // the labels should not be "forward" references
-        ASSERT(!labels[i]->isForwardLabel());
+        ASSERT(!labels[i]->isForward());
         jumpTable.add(keyForImmediateSwitch(nodes[i], min, max), labels[i]->offsetFrom(switchAddress)); 
     }
@@ -1681 +1681 @@
 }
 
-static void prepareJumpTableForCharacterSwitch(SimpleJumpTable& jumpTable, int32_t switchAddress, uint32_t clauseCount, RefPtr<LabelID>* labels, ExpressionNode** nodes, int32_t min, int32_t max)
+static void prepareJumpTableForCharacterSwitch(SimpleJumpTable& jumpTable, int32_t switchAddress, uint32_t clauseCount, RefPtr<Label>* labels, ExpressionNode** nodes, int32_t min, int32_t max)
 {
     jumpTable.min = min;
@@ -1689 +1689 @@
         // We're emitting this after the clause labels should have been fixed, so 
         // the labels should not be "forward" references
-        ASSERT(!labels[i]->isForwardLabel());
+        ASSERT(!labels[i]->isForward());
         jumpTable.add(keyForCharacterSwitch(nodes[i], min, max), labels[i]->offsetFrom(switchAddress)); 
     }
 }
 
-static void prepareJumpTableForStringSwitch(StringJumpTable& jumpTable, int32_t switchAddress, uint32_t clauseCount, RefPtr<LabelID>* labels, ExpressionNode** nodes)
+static void prepareJumpTableForStringSwitch(StringJumpTable& jumpTable, int32_t switchAddress, uint32_t clauseCount, RefPtr<Label>* labels, ExpressionNode** nodes)
 {
     for (uint32_t i = 0; i < clauseCount; ++i) {
         // We're emitting this after the clause labels should have been fixed, so 
         // the labels should not be "forward" references
-        ASSERT(!labels[i]->isForwardLabel());
+        ASSERT(!labels[i]->isForward());
         
         ASSERT(nodes[i]->isString());
@@ -1712 +1712 @@
 }
 
-void BytecodeGenerator::endSwitch(uint32_t clauseCount, RefPtr<LabelID>* labels, ExpressionNode** nodes, LabelID* defaultLabel, int32_t min, int32_t max)
+void BytecodeGenerator::endSwitch(uint32_t clauseCount, RefPtr<Label>* labels, ExpressionNode** nodes, Label* defaultLabel, int32_t min, int32_t max)
 {
     SwitchInfo switchInfo = m_switchContextStack.last();

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;

trunk/JavaScriptCore/bytecompiler/LabelScope.h

@@ -41 +41 @@
         enum Type { Loop, Switch, NamedLabel };
 
-        LabelScope(Type type, const Identifier* name, int scopeDepth, PassRefPtr<LabelID> breakTarget, PassRefPtr<LabelID> continueTarget)
+        LabelScope(Type type, const Identifier* name, int scopeDepth, PassRefPtr<Label> breakTarget, PassRefPtr<Label> continueTarget)
             : m_refCount(0)
             , m_type(type)
@@ -59 +59 @@
         int refCount() const { return m_refCount; }
 
-        LabelID* breakTarget() const { return m_breakTarget.get(); }
-        LabelID* continueTarget() const { return m_continueTarget.get(); }
+        Label* breakTarget() const { return m_breakTarget.get(); }
+        Label* continueTarget() const { return m_continueTarget.get(); }
 
         Type type() const { return m_type; }
@@ -71 +71 @@
         const Identifier* m_name;
         int m_scopeDepth;
-        RefPtr<LabelID> m_breakTarget;
-        RefPtr<LabelID> m_continueTarget;
+        RefPtr<Label> m_breakTarget;
+        RefPtr<Label> m_continueTarget;
     };