Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Unified Diff: src/arm/deoptimizer-arm.cc

Issue 12052053: Add StubFailureTrampolineFrames (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Remove extraneous change Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/arm/code-stubs-arm.cc ('k') | src/code-stubs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/arm/deoptimizer-arm.cc
diff --git a/src/arm/deoptimizer-arm.cc b/src/arm/deoptimizer-arm.cc
index ab35281d36205b89c08abea9786dd3d9dd7fd8a6..a822a8e239f142813ef5838a71cb51cd986949ca 100644
--- a/src/arm/deoptimizer-arm.cc
+++ b/src/arm/deoptimizer-arm.cc
@@ -455,22 +455,27 @@ void Deoptimizer::DoComputeArgumentsAdaptorFrame(TranslationIterator* iterator,
void Deoptimizer::DoCompiledStubFrame(TranslationIterator* iterator,
int frame_index) {
//
- // FROM TO <-fp
+ // FROM TO
// | .... | | .... |
// +-------------------------+ +-------------------------+
- // | JSFunction continuation | | parameter 1 |
+ // | JSFunction continuation | | JSFunction continuation |
// +-------------------------+ +-------------------------+
- // | | saved frame (fp) | | .... |
- // | +=========================+<-fp +-------------------------+
- // | | JSFunction context | | parameter n |
+ // | | saved frame (fp) | | saved frame (fp) |
+ // | +=========================+<-fp +=========================+<-fp
+ // | | JSFunction context | | JSFunction context |
// v +-------------------------+ +-------------------------|
- // | COMPILED_STUB marker | | JSFunction continuation |
- // +-------------------------+ +-------------------------+<-sp
- // | | r0 = number of parameters
- // | ... | r1 = failure handler address
- // | | fp = saved frame
- // +-------------------------+<-sp cp = JSFunction context
- //
+ // | COMPILED_STUB marker | | STUB_FAILURE marker |
+ // +-------------------------+ +-------------------------+
+ // | | | stub parameter 1 |
+ // | ... | +-------------------------+
+ // | | | ... |
+ // |-------------------------|<-sp +-------------------------+
+ // | stub parameter n |
+ // parameters in registers +-------------------------+<-sp
+ // and spilled to stack r0 = number of parameters
+ // r1 = failure handler address
+ // fp = saved frame
+ // cp = JSFunction context
//
ASSERT(compiled_code_->kind() == Code::COMPILED_STUB);
@@ -478,48 +483,65 @@ void Deoptimizer::DoCompiledStubFrame(TranslationIterator* iterator,
CodeStubInterfaceDescriptor* descriptor =
isolate_->code_stub_interface_descriptor(major_key);
- int output_frame_size =
- (1 + descriptor->register_param_count_) * kPointerSize;
+ int output_frame_size = StandardFrameConstants::kFixedFrameSize +
+ kPointerSize * descriptor->register_param_count_;
+
FrameDescription* output_frame =
new(output_frame_size) FrameDescription(output_frame_size, 0);
+ ASSERT(frame_index == 0);
+ output_[frame_index] = output_frame;
Code* notify_failure =
isolate_->builtins()->builtin(Builtins::kNotifyStubFailure);
output_frame->SetState(Smi::FromInt(FullCodeGenerator::NO_REGISTERS));
output_frame->SetContinuation(
- reinterpret_cast<uint32_t>(notify_failure->entry()));
+ reinterpret_cast<intptr_t>(notify_failure->entry()));
- Code* code;
- CEntryStub(1, kSaveFPRegs).FindCodeInCache(&code, isolate_);
- output_frame->SetPc(reinterpret_cast<intptr_t>(code->instruction_start()));
+ Code* trampoline = NULL;
+ StubFailureTrampolineStub().FindCodeInCache(&trampoline, isolate_);
+ ASSERT(trampoline != NULL);
+ output_frame->SetPc(reinterpret_cast<intptr_t>(
+ trampoline->instruction_start()));
unsigned input_frame_size = input_->GetFrameSize();
- intptr_t value = input_->GetFrameSlot(input_frame_size - kPointerSize);
- output_frame->SetFrameSlot(0, value);
- value = input_->GetFrameSlot(input_frame_size - 2 * kPointerSize);
- output_frame->SetRegister(fp.code(), value);
- output_frame->SetFp(value);
- value = input_->GetFrameSlot(input_frame_size - 3 * kPointerSize);
+
+ // JSFunction continuation
+ intptr_t input_frame_offset = input_frame_size - kPointerSize;
+ intptr_t output_frame_offset = output_frame_size - kPointerSize;
+ intptr_t value = input_->GetFrameSlot(input_frame_offset);
+ output_frame->SetFrameSlot(output_frame_offset, value);
+
+ // saved frame ptr
+ input_frame_offset -= kPointerSize;
+ value = input_->GetFrameSlot(input_frame_offset);
+ output_frame_offset -= kPointerSize;
+ output_frame->SetFrameSlot(output_frame_offset, value);
+
+ // Restore context
+ input_frame_offset -= kPointerSize;
+ value = input_->GetFrameSlot(input_frame_offset);
output_frame->SetRegister(cp.code(), value);
+ output_frame_offset -= kPointerSize;
+ output_frame->SetFrameSlot(output_frame_offset, value);
+
+ // Internal frame markers
+ output_frame_offset -= kPointerSize;
+ value = reinterpret_cast<intptr_t>(
+ Smi::FromInt(StackFrame::STUB_FAILURE_TRAMPOLINE));
+ output_frame->SetFrameSlot(output_frame_offset, value);
- int parameter_offset = kPointerSize * descriptor->register_param_count_;
for (int i = 0; i < descriptor->register_param_count_; ++i) {
- Translation::Opcode opcode =
- static_cast<Translation::Opcode>(iterator->Next());
- ASSERT(opcode == Translation::REGISTER);
- USE(opcode);
- int input_reg = iterator->Next();
- intptr_t reg_value = input_->GetRegister(input_reg);
- output_frame->SetFrameSlot(parameter_offset, reg_value);
- parameter_offset -= kPointerSize;
+ output_frame_offset -= kPointerSize;
+ DoTranslateCommand(iterator, 0, output_frame_offset);
}
+ value = input_->GetRegister(fp.code());
+ output_frame->SetRegister(fp.code(), value);
+ output_frame->SetFp(value);
+
ApiFunction function(descriptor->deoptimization_handler_);
ExternalReference xref(&function, ExternalReference::BUILTIN_CALL, isolate_);
intptr_t handler = reinterpret_cast<intptr_t>(xref.address());
output_frame->SetRegister(r0.code(), descriptor->register_param_count_);
output_frame->SetRegister(r1.code(), handler);
-
- ASSERT(frame_index == 0);
- output_[frame_index] = output_frame;
}
« no previous file with comments | « src/arm/code-stubs-arm.cc ('k') | src/code-stubs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698