Changeset 39038 in webkit for trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

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/bytecompiler/BytecodeGenerator.cpp (modified) (2 diffs)

trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

@@ -140 +140 @@
     }
 #endif
-    
-    m_codeBlock->instructions.shrinkToFit();
-    m_codeBlock->globalResolveInstructions.shrinkToFit();
-    m_codeBlock->propertyAccessInstructions.shrinkToFit();
-    m_codeBlock->callLinkInfos.shrinkToFit();
-    m_codeBlock->linkedCallerList.shrinkToFit();
-
-    m_codeBlock->identifiers.shrinkToFit();
-    m_codeBlock->functions.shrinkToFit();
-    m_codeBlock->functionExpressions.shrinkToFit();
-    m_codeBlock->constantRegisters.shrinkToFit();
-    m_codeBlock->unexpectedConstants.shrinkToFit();
-    m_codeBlock->regexps.shrinkToFit();
-    m_codeBlock->exceptionHandlers.shrinkToFit();
-    m_codeBlock->expressionInfo.shrinkToFit();
-    m_codeBlock->lineInfo.shrinkToFit();
-
-    m_codeBlock->immediateSwitchJumpTables.shrinkToFit();
-    m_codeBlock->characterSwitchJumpTables.shrinkToFit();
-    m_codeBlock->stringSwitchJumpTables.shrinkToFit();
-
+
+    m_codeBlock->shrinkToFit();
 }
 
@@ -1711 +1692 @@
     m_switchContextStack.removeLast();
     if (switchInfo.switchType == SwitchInfo::SwitchImmediate) {
-        instructions()[switchInfo.bytecodeOffset + 1] = m_codeBlock->immediateSwitchJumpTables.size();
+        instructions()[switchInfo.bytecodeOffset + 1] = m_codeBlock->numberOfImmediateSwitchJumpTables();
         instructions()[switchInfo.bytecodeOffset + 2] = defaultLabel->offsetFrom(switchInfo.bytecodeOffset + 3);
 
-        m_codeBlock->immediateSwitchJumpTables.append(SimpleJumpTable());
-        SimpleJumpTable& jumpTable = m_codeBlock->immediateSwitchJumpTables.last();
-
+        SimpleJumpTable& jumpTable = m_codeBlock->addImmediateSwitchJumpTable();
         prepareJumpTableForImmediateSwitch(jumpTable, switchInfo.bytecodeOffset + 3, clauseCount, labels, nodes, min, max);
     } else if (switchInfo.switchType == SwitchInfo::SwitchCharacter) {
-        instructions()[switchInfo.bytecodeOffset + 1] = m_codeBlock->characterSwitchJumpTables.size();
+        instructions()[switchInfo.bytecodeOffset + 1] = m_codeBlock->numberOfCharacterSwitchJumpTables();
         instructions()[switchInfo.bytecodeOffset + 2] = defaultLabel->offsetFrom(switchInfo.bytecodeOffset + 3);
         
-        m_codeBlock->characterSwitchJumpTables.append(SimpleJumpTable());
-        SimpleJumpTable& jumpTable = m_codeBlock->characterSwitchJumpTables.last();
-
+        SimpleJumpTable& jumpTable = m_codeBlock->addCharacterSwitchJumpTable();
         prepareJumpTableForCharacterSwitch(jumpTable, switchInfo.bytecodeOffset + 3, clauseCount, labels, nodes, min, max);
     } else {
         ASSERT(switchInfo.switchType == SwitchInfo::SwitchString);
-        instructions()[switchInfo.bytecodeOffset + 1] = m_codeBlock->stringSwitchJumpTables.size();
+        instructions()[switchInfo.bytecodeOffset + 1] = m_codeBlock->numberOfStringSwitchJumpTables();
         instructions()[switchInfo.bytecodeOffset + 2] = defaultLabel->offsetFrom(switchInfo.bytecodeOffset + 3);
 
-        m_codeBlock->stringSwitchJumpTables.append(StringJumpTable());
-        StringJumpTable& jumpTable = m_codeBlock->stringSwitchJumpTables.last();
-
+        StringJumpTable& jumpTable = m_codeBlock->addStringSwitchJumpTable();
         prepareJumpTableForStringSwitch(jumpTable, switchInfo.bytecodeOffset + 3, clauseCount, labels, nodes);
     }