Changeset 39038 in webkit for trunk/JavaScriptCore/interpreter

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/interpreter/Interpreter.cpp (modified) (6 diffs)

trunk/JavaScriptCore/interpreter/Interpreter.cpp

@@ -3209 +3209 @@
         else {
             int32_t value = JSImmediate::getTruncatedInt32(scrutinee);
-            vPC += callFrame->codeBlock()->immediateSwitchJumpTables[tableIndex].offsetForValue(value, defaultOffset);
+            vPC += callFrame->codeBlock()->immediateSwitchJumpTable(tableIndex).offsetForValue(value, defaultOffset);
         }
         NEXT_INSTRUCTION();
@@ -3232 +3232 @@
                 vPC += defaultOffset;
             else
-                vPC += callFrame->codeBlock()->characterSwitchJumpTables[tableIndex].offsetForValue(value->data()[0], defaultOffset);
+                vPC += callFrame->codeBlock()->characterSwitchJumpTable(tableIndex).offsetForValue(value->data()[0], defaultOffset);
         }
         NEXT_INSTRUCTION();
@@ -3251 +3251 @@
             vPC += defaultOffset;
         else 
-            vPC += callFrame->codeBlock()->stringSwitchJumpTables[tableIndex].offsetForValue(asString(scrutinee)->value().rep(), defaultOffset);
+            vPC += callFrame->codeBlock()->stringSwitchJumpTable(tableIndex).offsetForValue(asString(scrutinee)->value().rep(), defaultOffset);
         NEXT_INSTRUCTION();
     }
@@ -5971 +5971 @@
     if (JSImmediate::isNumber(scrutinee)) {
         int32_t value = JSImmediate::getTruncatedInt32(scrutinee);
-        return codeBlock->immediateSwitchJumpTables[tableIndex].ctiForValue(value);
-    }
-
-    return codeBlock->immediateSwitchJumpTables[tableIndex].ctiDefault;
+        return codeBlock->immediateSwitchJumpTable(tableIndex).ctiForValue(value);
+    }
+
+    return codeBlock->immediateSwitchJumpTable(tableIndex).ctiDefault;
 }
 
@@ -5986 +5986 @@
     CodeBlock* codeBlock = callFrame->codeBlock();
 
-    void* result = codeBlock->characterSwitchJumpTables[tableIndex].ctiDefault;
+    void* result = codeBlock->characterSwitchJumpTable(tableIndex).ctiDefault;
 
     if (scrutinee->isString()) {
         UString::Rep* value = asString(scrutinee)->value().rep();
         if (value->size() == 1)
-            result = codeBlock->characterSwitchJumpTables[tableIndex].ctiForValue(value->data()[0]);
+            result = codeBlock->characterSwitchJumpTable(tableIndex).ctiForValue(value->data()[0]);
     }
 
@@ -6006 +6006 @@
     CodeBlock* codeBlock = callFrame->codeBlock();
 
-    void* result = codeBlock->stringSwitchJumpTables[tableIndex].ctiDefault;
+    void* result = codeBlock->stringSwitchJumpTable(tableIndex).ctiDefault;
 
     if (scrutinee->isString()) {
         UString::Rep* value = asString(scrutinee)->value().rep();
-        result = codeBlock->stringSwitchJumpTables[tableIndex].ctiForValue(value);
+        result = codeBlock->stringSwitchJumpTable(tableIndex).ctiForValue(value);
     }