AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[Arm]: Fix liveedit support if --enable_ool_constant_pool is true.

Browse Source 
If the out of line constant pool is enabled, there is an extra value on the stack frame (the
constant pool pointer).  This change fixes GenerateFrameDropperLiveEdit to pull the function
pointer and pop the stack frame correctly whether or not the constant pool pointer is on the
frame.

R=yangguo@chromium.org

Review URL: https://codereview.chromium.org/338053003

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22084 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
rmcilroy@chromium.org 2014-06-30 11:06:03 +00:00
parent d1190c503d
commit c1e6743739
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/arm/debug-arm.cc
View File

@ -298,21 +298,26 @@ void DebugCodegen::GenerateFrameDropperLiveEdit(MacroAssembler* masm) {
__ mov(r1, Operand::Zero()); __ mov(r1, Operand::Zero());
__ str(r1, MemOperand(ip, 0)); __ str(r1, MemOperand(ip, 0));
// We do not know our frame height, but set sp based on fp. // Load the function pointer off of our current stack frame.
__ sub(sp, fp, Operand(kPointerSize)); __ ldr(r1, MemOperand(fp,
StandardFrameConstants::kConstantPoolOffset - kPointerSize));
__ Pop(lr, fp, r1); // Return address, Frame, Function. // Pop return address, frame and constant pool pointer (if
// FLAG_enable_ool_constant_pool).
__ LeaveFrame(StackFrame::INTERNAL);
// Load context from the function. { ConstantPoolUnavailableScope constant_pool_unavailable(masm);
__ ldr(cp, FieldMemOperand(r1, JSFunction::kContextOffset)); // Load context from the function.
__ ldr(cp, FieldMemOperand(r1, JSFunction::kContextOffset));
// Get function code. // Get function code.
__ ldr(ip, FieldMemOperand(r1, JSFunction::kSharedFunctionInfoOffset)); __ ldr(ip, FieldMemOperand(r1, JSFunction::kSharedFunctionInfoOffset));
__ ldr(ip, FieldMemOperand(ip, SharedFunctionInfo::kCodeOffset)); __ ldr(ip, FieldMemOperand(ip, SharedFunctionInfo::kCodeOffset));
__ add(ip, ip, Operand(Code::kHeaderSize - kHeapObjectTag)); __ add(ip, ip, Operand(Code::kHeaderSize - kHeapObjectTag));
// Re-run JSFunction, r1 is function, cp is context. // Re-run JSFunction, r1 is function, cp is context.
__ Jump(ip); __ Jump(ip);
}
} }