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

Timestamp:

May 19, 2010, 4:24:31 PM (15 years ago)

Author:

[email protected]

Message:

2010-05-19 Geoffrey Garen <​[email protected]>

Reviewed by Sam Weinig.

Slight refactoring to CodeBlock bytecode access
​https://bugs.webkit.org/show_bug.cgi?id=39384

• bytecode/CodeBlock.h: (JSC::CodeBlock::bytecodeOffset):
• interpreter/CallFrame.h: (JSC::ExecState::returnPC):
• interpreter/Interpreter.cpp: (JSC::Interpreter::unwindCallFrame): (JSC::Interpreter::retrieveLastCaller): Moved bytecode access into a CodeBlock helper function. Changed CallFrame to accurately represent how the returnPC is stored in JIT vs Interpreter.

File:

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

trunk/JavaScriptCore/interpreter/Interpreter.cpp

@@ -71 +71 @@
 
 namespace JSC {
-
-static ALWAYS_INLINE unsigned bytecodeOffsetForPC(CallFrame* callFrame, CodeBlock* codeBlock, void* pc)
-{
-#if ENABLE(JIT)
-    return codeBlock->bytecodeOffset(callFrame, ReturnAddressPtr(pc));
-#else
-    UNUSED_PARAM(callFrame);
-    return static_cast<Instruction*>(pc) - codeBlock->instructions().begin();
-#endif
-}
 
 // Returns the depth of the scope chain within a given call frame.
@@ -552 +542 @@
         scopeChain->deref();
 
-    void* returnPC = callFrame->returnPC();
-    callFrame = callFrame->callerFrame();
-    if (callFrame->hasHostCallFrameFlag())
+    CallFrame* callerFrame = callFrame->callerFrame();
+    if (callerFrame->hasHostCallFrameFlag())
         return false;
 
-    codeBlock = callFrame->codeBlock();
-    bytecodeOffset = bytecodeOffsetForPC(callFrame, codeBlock, returnPC);
+    codeBlock = callerFrame->codeBlock();
+    bytecodeOffset = codeBlock->bytecodeOffset(callerFrame, callFrame->returnPC());
+    callFrame = callerFrame;
     return true;
 }
@@ -4466 +4456 @@
         return;
 
-    unsigned bytecodeOffset = bytecodeOffsetForPC(callerFrame, callerCodeBlock, callFrame->returnPC());
+    unsigned bytecodeOffset = callerCodeBlock->bytecodeOffset(callerFrame, callFrame->returnPC());
     lineNumber = callerCodeBlock->lineNumberForBytecodeOffset(callerFrame, bytecodeOffset - 1);
     sourceID = callerCodeBlock->ownerExecutable()->sourceID();