Reviewers: danno, Paul Lind, kisg,
Description:
MIPS: Generalize calling to C++ on stub deopt
Port r13320 (916d70a6)
Original commit message:
Remove code specific to KeyedLoadICs in DoCompiledStubFrame on all
platforms,
driving stub frame translation by the register parameter information found
in a
stub's CodeStubInterfaceDescriptor.
BUG=
TEST=
Please review this at https://chromiumcodereview.appspot.com/11783046/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/mips/builtins-mips.cc
M src/mips/code-stubs-mips.cc
M src/mips/deoptimizer-mips.cc
Index: src/mips/builtins-mips.cc
diff --git a/src/mips/builtins-mips.cc b/src/mips/builtins-mips.cc
index
c7b0c3f09ddd40507cacfa5fa8e7ff1ec4fac62b..793968edf684e3fef36bff30dd1c6bf9a8921a6a
100644
--- a/src/mips/builtins-mips.cc
+++ b/src/mips/builtins-mips.cc
@@ -1297,7 +1297,7 @@ CODE_AGE_LIST(DEFINE_CODE_AGE_BUILTIN_GENERATOR)
#undef DEFINE_CODE_AGE_BUILTIN_GENERATOR
-void Builtins::Generate_NotifyICMiss(MacroAssembler* masm) {
+void Builtins::Generate_NotifyStubFailure(MacroAssembler* masm) {
{
FrameScope scope(masm, StackFrame::INTERNAL);
@@ -1306,7 +1306,7 @@ void Builtins::Generate_NotifyICMiss(MacroAssembler*
masm) {
// registers.
__ MultiPush(kJSCallerSaved | kCalleeSaved);
// Pass the function and deoptimization type to the runtime system.
- __ CallRuntime(Runtime::kNotifyICMiss, 0);
+ __ CallRuntime(Runtime::kNotifyStubFailure, 0);
__ MultiPop(kJSCallerSaved | kCalleeSaved);
}
Index: src/mips/code-stubs-mips.cc
diff --git a/src/mips/code-stubs-mips.cc b/src/mips/code-stubs-mips.cc
index
9f0d535416c6c8c3c04b2c3bc63ed94f067b690a..d9361b3364fd9fa08f3f5457575854c4e51f2ade
100644
--- a/src/mips/code-stubs-mips.cc
+++ b/src/mips/code-stubs-mips.cc
@@ -45,7 +45,7 @@ void
KeyedLoadFastElementStub::InitializeInterfaceDescriptor(
descriptor->register_param_count_ = 2;
descriptor->register_params_ = registers;
descriptor->deoptimization_handler_ =
- isolate->builtins()->KeyedLoadIC_Miss();
+ FUNCTION_ADDR(KeyedLoadIC_Miss);
}
Index: src/mips/deoptimizer-mips.cc
diff --git a/src/mips/deoptimizer-mips.cc b/src/mips/deoptimizer-mips.cc
index
901689467f6dab1696728c57235f99340365060b..634aecd9e0364467fde09abc41d2732e5f85c68a
100644
--- a/src/mips/deoptimizer-mips.cc
+++ b/src/mips/deoptimizer-mips.cc
@@ -451,35 +451,39 @@ void
Deoptimizer::DoCompiledStubFrame(TranslationIterator* iterator,
// FROM TO
<-fp
// | .... | | .... |
// +-------------------------+ +-------------------------+
- // | JSFunction continuation | | JSFunction continuation |
+ // | JSFunction continuation | | parameter 1 |
+ // +-------------------------+ +-------------------------+
+ // | | saved frame (fp) | | .... |
+ // | +=========================+<-fp +-------------------------+
+ // | | JSFunction context | | parameter n |
+ // v +-------------------------+ +-------------------------|
+ // | COMPILED_STUB marker | | JSFunction continuation |
// +-------------------------+
+-------------------------+<-sp
- // | | saved frame (fp) |
- // | +=========================+<-fp
- // | | JSFunction context |
- // v +-------------------------+
- // | COMPILED_STUB marker | fp = saved frame
- // +-------------------------+ f8 = JSFunction context
- // | |
- // | ... |
- // | |
- // +-------------------------+<-sp
+ // | | a0 = number of parameters
+ // | ... | a1 = failure handler address
+ // | | fp = saved frame
+ // +-------------------------+<-sp cp = JSFunction context
//
//
- int output_frame_size = 1 * kPointerSize;
- FrameDescription* output_frame =
- new(output_frame_size) FrameDescription(output_frame_size, 0);
- Code* notify_miss =
- isolate_->builtins()->builtin(Builtins::kNotifyICMiss);
- output_frame->SetState(Smi::FromInt(FullCodeGenerator::NO_REGISTERS));
- output_frame->SetContinuation(
- reinterpret_cast<intptr_t>(notify_miss->entry()));
ASSERT(compiled_code_->kind() == Code::COMPILED_STUB);
int major_key = compiled_code_->major_key();
CodeStubInterfaceDescriptor* descriptor =
isolate_->code_stub_interface_descriptor(major_key);
- Handle<Code> miss_ic(descriptor->deoptimization_handler_);
-
output_frame->SetPc(reinterpret_cast<intptr_t>(miss_ic->instruction_start()));
+
+ int output_frame_size =
+ (1 + descriptor->register_param_count_) * kPointerSize;
+ FrameDescription* output_frame =
+ new(output_frame_size) FrameDescription(output_frame_size, 0);
+ 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()));
+
+ Code* code;
+ CEntryStub(1, kSaveFPRegs).FindCodeInCache(&code, isolate_);
+
output_frame->SetPc(reinterpret_cast<intptr_t>(code->instruction_start()));
unsigned input_frame_size = input_->GetFrameSize();
intptr_t value = input_->GetFrameSlot(input_frame_size - kPointerSize);
output_frame->SetFrameSlot(0, value);
@@ -489,20 +493,25 @@ void
Deoptimizer::DoCompiledStubFrame(TranslationIterator* iterator,
value = input_->GetFrameSlot(input_frame_size - 3 * kPointerSize);
output_frame->SetRegister(cp.code(), value);
- Translation::Opcode opcode =
- static_cast<Translation::Opcode>(iterator->Next());
- ASSERT(opcode == Translation::REGISTER);
- USE(opcode);
- int input_reg = iterator->Next();
- intptr_t input_value = input_->GetRegister(input_reg);
- output_frame->SetRegister(a1.code(), input_value);
-
- int32_t next = iterator->Next();
- opcode = static_cast<Translation::Opcode>(next);
- ASSERT(opcode == Translation::REGISTER);
- input_reg = iterator->Next();
- input_value = input_->GetRegister(input_reg);
- output_frame->SetRegister(a0.code(), input_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;
+ }
+
+ ApiFunction function(descriptor->deoptimization_handler_);
+ ExternalReference xref(&function, ExternalReference::BUILTIN_CALL,
isolate_);
+ intptr_t handler = reinterpret_cast<intptr_t>(xref.address());
+ output_frame->SetRegister(s0.code(), descriptor->register_param_count_);
+ output_frame->SetRegister(s1.code(),
+ (descriptor->register_param_count_ - 1) * kPointerSize);
+ output_frame->SetRegister(s2.code(), handler);
ASSERT(frame_index == 0);
output_[frame_index] = output_frame;
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
