Changeset 39038 in webkit for trunk/JavaScriptCore/bytecode/CodeBlock.h

Timestamp:

Dec 5, 2008, 12:27:58 PM (16 years ago)

Author:

[email protected]

Message:

2008-12-05 Sam Weinig <​[email protected]>

Reviewed by Geoffrey Garen.

Encapsulate access to jump tables in the CodeBlock in preparation
of moving them to a rare data structure.

• bytecode/CodeBlock.cpp: (JSC::CodeBlock::dump): (JSC::CodeBlock::shrinkToFit):
• bytecode/CodeBlock.h: (JSC::CodeBlock::numberOfImmediateSwitchJumpTables): (JSC::CodeBlock::addImmediateSwitchJumpTable): (JSC::CodeBlock::immediateSwitchJumpTable): (JSC::CodeBlock::numberOfCharacterSwitchJumpTables): (JSC::CodeBlock::addCharacterSwitchJumpTable): (JSC::CodeBlock::characterSwitchJumpTable): (JSC::CodeBlock::numberOfStringSwitchJumpTables): (JSC::CodeBlock::addStringSwitchJumpTable): (JSC::CodeBlock::stringSwitchJumpTable):
• bytecompiler/BytecodeGenerator.cpp: (JSC::BytecodeGenerator::generate): (JSC::BytecodeGenerator::endSwitch):
• interpreter/Interpreter.cpp: (JSC::Interpreter::privateExecute): (JSC::Interpreter::cti_op_switch_imm): (JSC::Interpreter::cti_op_switch_char): (JSC::Interpreter::cti_op_switch_string):
• jit/JIT.cpp: (JSC::JIT::privateCompileMainPass):

File:

• trunk/JavaScriptCore/bytecode/CodeBlock.h (modified) (3 diffs)

trunk/JavaScriptCore/bytecode/CodeBlock.h

@@ -311 +311 @@
         }
 
+        void shrinkToFit();
+
+        size_t numberOfImmediateSwitchJumpTables() const { return m_immediateSwitchJumpTables.size(); }
+        SimpleJumpTable& addImmediateSwitchJumpTable() { m_immediateSwitchJumpTables.append(SimpleJumpTable()); return m_immediateSwitchJumpTables.last(); }
+        SimpleJumpTable& immediateSwitchJumpTable(int tableIndex) { return m_immediateSwitchJumpTables[tableIndex]; }
+
+        size_t numberOfCharacterSwitchJumpTables() const { return m_characterSwitchJumpTables.size(); }
+        SimpleJumpTable& addCharacterSwitchJumpTable() { m_characterSwitchJumpTables.append(SimpleJumpTable()); return m_characterSwitchJumpTables.last(); }
+        SimpleJumpTable& characterSwitchJumpTable(int tableIndex) { return m_characterSwitchJumpTables[tableIndex]; }
+
+        size_t numberOfStringSwitchJumpTables() const { return m_stringSwitchJumpTables.size(); }
+        StringJumpTable& addStringSwitchJumpTable() { m_stringSwitchJumpTables.append(StringJumpTable()); return m_stringSwitchJumpTables.last(); }
+        StringJumpTable& stringSwitchJumpTable(int tableIndex) { return m_stringSwitchJumpTables[tableIndex]; }
+
         ScopeNode* ownerNode;
         JSGlobalData* globalData;
@@ -351 +365 @@
         Vector<LineInfo> lineInfo;
 
-        Vector<SimpleJumpTable> immediateSwitchJumpTables;
-        Vector<SimpleJumpTable> characterSwitchJumpTables;
-        Vector<StringJumpTable> stringSwitchJumpTables;
-
 #if ENABLE(JIT)
         HashMap<void*, unsigned> ctiReturnAddressVPCMap;
@@ -369 +379 @@
 #endif
 
+        Vector<SimpleJumpTable> m_immediateSwitchJumpTables;
+        Vector<SimpleJumpTable> m_characterSwitchJumpTables;
+        Vector<StringJumpTable> m_stringSwitchJumpTables;
     };