Index: src/mips/lithium-codegen-mips.cc |
diff --git a/src/mips/lithium-codegen-mips.cc b/src/mips/lithium-codegen-mips.cc |
index d54e5ec1518b34c63fe9159f1d3f033b148bf6f8..0fb0cca7e2e3e61bdfec7d4ca918ab75aa8115ce 100644 |
--- a/src/mips/lithium-codegen-mips.cc |
+++ b/src/mips/lithium-codegen-mips.cc |
@@ -3549,17 +3549,6 @@ void LCodeGen::CallKnownFunction(Handle<JSFunction> function, |
} |
-void LCodeGen::DoCallConstantFunction(LCallConstantFunction* instr) { |
- ASSERT(ToRegister(instr->result()).is(v0)); |
- __ mov(a0, v0); |
- CallKnownFunction(instr->hydrogen()->function(), |
- instr->hydrogen()->formal_parameter_count(), |
- instr->arity(), |
- instr, |
- A1_UNINITIALIZED); |
-} |
- |
- |
void LCodeGen::DoDeferredMathAbsTaggedHeapNumber(LMathAbs* instr) { |
ASSERT(instr->context() != NULL); |
ASSERT(ToRegister(instr->context()).is(cp)); |
@@ -3889,25 +3878,44 @@ void LCodeGen::DoInvokeFunction(LInvokeFunction* instr) { |
} |
-void LCodeGen::DoCallKeyed(LCallKeyed* instr) { |
- ASSERT(ToRegister(instr->context()).is(cp)); |
+void LCodeGen::DoCallWithDescriptor(LCallWithDescriptor* instr) { |
ASSERT(ToRegister(instr->result()).is(v0)); |
- int arity = instr->arity(); |
- Handle<Code> ic = |
- isolate()->stub_cache()->ComputeKeyedCallInitialize(arity); |
- CallCode(ic, RelocInfo::CODE_TARGET, instr); |
+ LPointerMap* pointers = instr->pointer_map(); |
+ SafepointGenerator generator(this, pointers, Safepoint::kLazyDeopt); |
+ |
+ if (instr->target()->IsConstantOperand()) { |
+ LConstantOperand* target = LConstantOperand::cast(instr->target()); |
+ Handle<Code> code = Handle<Code>::cast(ToHandle(target)); |
+ generator.BeforeCall(__ CallSize(code, RelocInfo::CODE_TARGET)); |
+ __ Call(code, RelocInfo::CODE_TARGET); |
+ } else { |
+ ASSERT(instr->target()->IsRegister()); |
+ Register target = ToRegister(instr->target()); |
+ generator.BeforeCall(__ CallSize(target)); |
+ __ Addu(target, target, Operand(Code::kHeaderSize - kHeapObjectTag)); |
+ __ Call(target); |
+ } |
+ generator.AfterCall(); |
} |
-void LCodeGen::DoCallNamed(LCallNamed* instr) { |
- ASSERT(ToRegister(instr->context()).is(cp)); |
+void LCodeGen::DoCallJSFunction(LCallJSFunction* instr) { |
+ ASSERT(ToRegister(instr->function()).is(a1)); |
ASSERT(ToRegister(instr->result()).is(v0)); |
- int arity = instr->arity(); |
- Handle<Code> ic = isolate()->stub_cache()->ComputeCallInitialize(arity); |
- __ li(a2, Operand(instr->name())); |
- CallCode(ic, RelocInfo::CODE_TARGET, instr); |
+ if (instr->hydrogen()->pass_argument_count()) { |
+ __ li(a0, Operand(instr->arity())); |
+ } |
+ |
+ // Change context. |
+ __ lw(cp, FieldMemOperand(a1, JSFunction::kContextOffset)); |
+ |
+ // Load the code entry address |
+ __ lw(at, FieldMemOperand(a1, JSFunction::kCodeEntryOffset)); |
+ __ Call(at); |
+ |
+ RecordSafepointWithLazyDeopt(instr, RECORD_SIMPLE_SAFEPOINT); |
} |
@@ -3927,16 +3935,6 @@ void LCodeGen::DoCallFunction(LCallFunction* instr) { |
} |
-void LCodeGen::DoCallKnownGlobal(LCallKnownGlobal* instr) { |
- ASSERT(ToRegister(instr->result()).is(v0)); |
- CallKnownFunction(instr->hydrogen()->target(), |
- instr->hydrogen()->formal_parameter_count(), |
- instr->arity(), |
- instr, |
- A1_UNINITIALIZED); |
-} |
- |
- |
void LCodeGen::DoCallNew(LCallNew* instr) { |
ASSERT(ToRegister(instr->context()).is(cp)); |
ASSERT(ToRegister(instr->constructor()).is(a1)); |