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

CpuProfiler: x64. put right address to the stack, so the callee would be able to resolve it into the right deopt_info.

Browse Source 
'from' is using for Code object lookup and will be used for
inline_id lookup. see https://codereview.chromium.org/1012633002
So we should be able to map it.

BUG=chromium:452067
LOG=n

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

Cr-Commit-Position: refs/heads/master@{#27253}
This commit is contained in:
loislo 2015-03-18 01:31:20 -07:00 committed by Commit bot
parent bcf51d25aa
commit cc3337c1c2
1 changed files with 53 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/x64/lithium-codegen-x64.cc
View File

@ -297,10 +297,10 @@ void LCodeGen::GenerateBodyInstructionPost(LInstruction* instr) {
bool LCodeGen::GenerateJumpTable() { bool LCodeGen::GenerateJumpTable() {
if (jump_table_.length() == 0) return !is_aborted();
Label needs_frame; Label needs_frame;
if (jump_table_.length() > 0) { Comment(";;; -------------------- Jump table --------------------");
Comment(";;; -------------------- Jump table --------------------");
}
for (int i = 0; i < jump_table_.length(); i++) { for (int i = 0; i < jump_table_.length(); i++) {
Deoptimizer::JumpTableEntry* table_entry = &jump_table_[i]; Deoptimizer::JumpTableEntry* table_entry = &jump_table_[i];
__ bind(&table_entry->label); __ bind(&table_entry->label);
@ -309,23 +309,7 @@ bool LCodeGen::GenerateJumpTable() {
if (table_entry->needs_frame) { if (table_entry->needs_frame) {
DCHECK(!info()->saves_caller_doubles()); DCHECK(!info()->saves_caller_doubles());
__ Move(kScratchRegister, ExternalReference::ForDeoptEntry(entry)); __ Move(kScratchRegister, ExternalReference::ForDeoptEntry(entry));
if (needs_frame.is_bound()) { __ call(&needs_frame);
__ jmp(&needs_frame);
} else {
__ bind(&needs_frame);
__ movp(rsi, MemOperand(rbp, StandardFrameConstants::kContextOffset));
__ pushq(rbp);
__ movp(rbp, rsp);
__ Push(rsi);
// This variant of deopt can only be used with stubs. Since we don't
// have a function pointer to install in the stack frame that we're
// building, install a special marker there instead.
DCHECK(info()->IsStub());
__ Move(rsi, Smi::FromInt(StackFrame::STUB));
__ Push(rsi);
__ movp(rsi, MemOperand(rsp, kPointerSize));
__ call(kScratchRegister);
}
} else { } else {
if (info()->saves_caller_doubles()) { if (info()->saves_caller_doubles()) {
DCHECK(info()->IsStub()); DCHECK(info()->IsStub());
@ -334,6 +318,55 @@ bool LCodeGen::GenerateJumpTable() {
__ call(entry, RelocInfo::RUNTIME_ENTRY); __ call(entry, RelocInfo::RUNTIME_ENTRY);
} }
} }
if (needs_frame.is_linked()) {
__ bind(&needs_frame);
/* stack layout
4: return address <-- rsp
3: garbage
2: garbage
1: garbage
0: garbage
*/
// Reserve space for context and stub marker.
__ subp(rsp, Immediate(2 * kPointerSize));
__ Push(MemOperand(rsp, 2 * kPointerSize)); // Copy return address.
__ Push(kScratchRegister); // Save entry address for ret(0)
/* stack layout
4: return address
3: garbage
2: garbage
1: return address
0: entry address <-- rsp
*/
// Remember context pointer.
__ movp(kScratchRegister,
MemOperand(rbp, StandardFrameConstants::kContextOffset));
// Save context pointer into the stack frame.
__ movp(MemOperand(rsp, 3 * kPointerSize), kScratchRegister);
// Create a stack frame.
__ movp(MemOperand(rsp, 4 * kPointerSize), rbp);
__ leap(rbp, MemOperand(rsp, 4 * kPointerSize));
// This variant of deopt can only be used with stubs. Since we don't
// have a function pointer to install in the stack frame that we're
// building, install a special marker there instead.
DCHECK(info()->IsStub());
__ Move(MemOperand(rsp, 2 * kPointerSize), Smi::FromInt(StackFrame::STUB));
/* stack layout
4: old ebp
3: context pointer
2: stub marker
1: return address
0: entry address <-- rsp
*/
__ ret(0);
}
return !is_aborted(); return !is_aborted();
} }