Changeset 39123 in webkit for trunk/JavaScriptCore/interpreter/Interpreter.cpp

Timestamp:

Dec 8, 2008, 9:27:10 PM (16 years ago)

Author:

[email protected]

Message:

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

Reviewed by Cameron Zwarich.

Fix for <rdar://problem/6428332> Remove the CTI return address table from CodeBlock

Step 1:

Remove use of jitReturnAddressVPCMap when looking for vPC to store Structures
in for cached lookup. Instead, use the offset in the StructureStubInfo that is
already required.

• bytecode/CodeBlock.cpp: (JSC::CodeBlock::dumpStatistics): Fix extraneous semicolon.
• interpreter/Interpreter.cpp: (JSC::Interpreter::tryCTICachePutByID): (JSC::Interpreter::tryCTICacheGetByID): (JSC::Interpreter::cti_op_get_by_id_self_fail): (JSC::Interpreter::cti_op_get_by_id_proto_list):
• jit/JIT.h: (JSC::JIT::compileGetByIdSelf): (JSC::JIT::compileGetByIdProto): (JSC::JIT::compileGetByIdChain): (JSC::JIT::compilePutByIdReplace): (JSC::JIT::compilePutByIdTransition):
• jit/JITPropertyAccess.cpp: (JSC::JIT::privateCompilePutByIdTransition): (JSC::JIT::patchGetByIdSelf): (JSC::JIT::patchPutByIdReplace): (JSC::JIT::privateCompilePatchGetArrayLength): Remove extra call to getStubInfo. (JSC::JIT::privateCompileGetByIdSelf): (JSC::JIT::privateCompileGetByIdProto): (JSC::JIT::privateCompileGetByIdChain): (JSC::JIT::privateCompilePutByIdReplace):

File:

• trunk/JavaScriptCore/interpreter/Interpreter.cpp (modified) (12 diffs)

trunk/JavaScriptCore/interpreter/Interpreter.cpp

@@ -4082 +4082 @@
     }
 
-    // In the interpreter the last structure is trapped here; in CTI we use the
-    // *_second method to achieve a similar (but not quite the same) effect.
-
-    unsigned vPCIndex = codeBlock->jitReturnAddressVPCMap().get(returnAddress);
-    Instruction* vPC = codeBlock->instructions().begin() + vPCIndex;
-
-    // Cache hit: Specialize instruction and ref Structures.
-
     // If baseCell != base, then baseCell must be a proxy for another object.
     if (baseCell != slot.base()) {
@@ -4095 +4087 @@
         return;
     }
+
+    StructureStubInfo* stubInfo = &codeBlock->getStubInfo(returnAddress);
+    Instruction* vPC = codeBlock->instructions().begin() + stubInfo->bytecodeIndex;
+
+    // Cache hit: Specialize instruction and ref Structures.
 
     // Structure transition, cache transition info
@@ -4113 +4110 @@
         vPC[7] = slot.cachedOffset();
         codeBlock->refStructures(vPC);
-        JIT::compilePutByIdTransition(callFrame->scopeChain()->globalData, codeBlock, structure->previousID(), structure, slot.cachedOffset(), chain, returnAddress);
+        JIT::compilePutByIdTransition(callFrame->scopeChain()->globalData, codeBlock, stubInfo, structure->previousID(), structure, slot.cachedOffset(), chain, returnAddress);
         return;
     }
@@ -4124 +4121 @@
 #if USE(CTI_REPATCH_PIC)
     UNUSED_PARAM(callFrame);
-    JIT::patchPutByIdReplace(codeBlock, structure, slot.cachedOffset(), returnAddress);
+    JIT::patchPutByIdReplace(stubInfo, structure, slot.cachedOffset(), returnAddress);
 #else
-    JIT::compilePutByIdReplace(callFrame->scopeChain()->globalData, callFrame, codeBlock, structure, slot.cachedOffset(), returnAddress);
+    JIT::compilePutByIdReplace(callFrame->scopeChain()->globalData, callFrame, codeBlock, stubInfo, structure, slot.cachedOffset(), returnAddress);
 #endif
 }
@@ -4173 +4170 @@
     // *_second method to achieve a similar (but not quite the same) effect.
 
-    unsigned vPCIndex = codeBlock->jitReturnAddressVPCMap().get(returnAddress);
-    Instruction* vPC = codeBlock->instructions().begin() + vPCIndex;
+    StructureStubInfo* stubInfo = &codeBlock->getStubInfo(returnAddress);
+    Instruction* vPC = codeBlock->instructions().begin() + stubInfo->bytecodeIndex;
 
     // Cache hit: Specialize instruction and ref Structures.
@@ -4186 +4183 @@
         
 #if USE(CTI_REPATCH_PIC)
-        JIT::patchGetByIdSelf(codeBlock, structure, slot.cachedOffset(), returnAddress);
+        JIT::patchGetByIdSelf(stubInfo, structure, slot.cachedOffset(), returnAddress);
 #else
-        JIT::compileGetByIdSelf(callFrame->scopeChain()->globalData, callFrame, codeBlock, structure, slot.cachedOffset(), returnAddress);
+        JIT::compileGetByIdSelf(callFrame->scopeChain()->globalData, callFrame, codeBlock, stubInfo, structure, slot.cachedOffset(), returnAddress);
 #endif
         return;
@@ -4212 +4209 @@
         codeBlock->refStructures(vPC);
 
-        JIT::compileGetByIdProto(callFrame->scopeChain()->globalData, callFrame, codeBlock, structure, slotBaseObject->structure(), slot.cachedOffset(), returnAddress);
+        JIT::compileGetByIdProto(callFrame->scopeChain()->globalData, callFrame, codeBlock, stubInfo, structure, slotBaseObject->structure(), slot.cachedOffset(), returnAddress);
         return;
     }
@@ -4234 +4231 @@
     codeBlock->refStructures(vPC);
 
-    JIT::compileGetByIdChain(callFrame->scopeChain()->globalData, callFrame, codeBlock, structure, chain, count, slot.cachedOffset(), returnAddress);
+    JIT::compileGetByIdChain(callFrame->scopeChain()->globalData, callFrame, codeBlock, stubInfo, structure, chain, count, slot.cachedOffset(), returnAddress);
 }
 
@@ -4580 +4577 @@
 
         CodeBlock* codeBlock = callFrame->codeBlock();
-        unsigned vPCIndex = codeBlock->jitReturnAddressVPCMap().get(CTI_RETURN_ADDRESS);
-        Instruction* vPC = codeBlock->instructions().begin() + vPCIndex;
+        StructureStubInfo* stubInfo = &codeBlock->getStubInfo(CTI_RETURN_ADDRESS);
+        Instruction* vPC = codeBlock->instructions().begin() + stubInfo->bytecodeIndex;
 
         ASSERT(slot.slotBase()->isObject());
-
-        StructureStubInfo* stubInfo = &codeBlock->getStubInfo(CTI_RETURN_ADDRESS);
 
         PolymorphicAccessStructureList* polymorphicStructureList;
@@ -4664 +4659 @@
     Structure* structure = asCell(baseValue)->structure();
     CodeBlock* codeBlock = callFrame->codeBlock();
-    Instruction* vPC = codeBlock->instructions().begin() + codeBlock->jitReturnAddressVPCMap().get(CTI_RETURN_ADDRESS);
+    StructureStubInfo* stubInfo = &codeBlock->getStubInfo(CTI_RETURN_ADDRESS);
+    Instruction* vPC = codeBlock->instructions().begin() + stubInfo->bytecodeIndex;
 
     ASSERT(slot.slotBase()->isObject());
@@ -4680 +4676 @@
         }
 
-        StructureStubInfo* stubInfo = &codeBlock->getStubInfo(CTI_RETURN_ADDRESS);
         int listIndex;
         PolymorphicAccessStructureList* prototypeStructureList = getPolymorphicAccessStructureListSlot(ARG_globalData->interpreter, stubInfo, vPC, listIndex);
@@ -4694 +4689 @@
         ASSERT(chain);
 
-        StructureStubInfo* stubInfo = &codeBlock->getStubInfo(CTI_RETURN_ADDRESS);
         int listIndex;
         PolymorphicAccessStructureList* prototypeStructureList = getPolymorphicAccessStructureListSlot(ARG_globalData->interpreter, stubInfo, vPC, listIndex);