Changeset 59791 in webkit for trunk/JavaScriptCore/interpreter/CallFrame.h

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/CallFrame.h (modified) (2 diffs)

trunk/JavaScriptCore/interpreter/CallFrame.h

@@ -25 +25 @@
 
 #include "JSGlobalData.h"
+#include "MacroAssemblerCodeRef.h"
 #include "RegisterFile.h"
 #include "ScopeChain.h"
@@ -108 +109 @@
 
         CallFrame* callerFrame() const { return this[RegisterFile::CallerFrame].callFrame(); }
+#if ENABLE(JIT)
+        ReturnAddressPtr returnPC() const { return ReturnAddressPtr(this[RegisterFile::ReturnPC].vPC()); }
+#else
         Instruction* returnPC() const { return this[RegisterFile::ReturnPC].vPC(); }
+#endif
 
         void setCallerFrame(CallFrame* callerFrame) { static_cast<Register*>(this)[RegisterFile::CallerFrame] = callerFrame; }