From 6d087613174450a6f96444383a74f0f4e0361138 Mon Sep 17 00:00:00 2001 From: "balazs.kilvady@imgtec.com" Date: Tue, 26 Aug 2014 17:43:13 +0000 Subject: [PATCH] MIPS: Minor-key-ify CallICStub and CallIC_ArrayStub. Port r23403 (553b376) BUG= R=paul.lind@imgtec.com Review URL: https://codereview.chromium.org/503373002 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23419 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/mips/code-stubs-mips.cc | 8 ++++---- src/mips64/code-stubs-mips64.cc | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/mips/code-stubs-mips.cc b/src/mips/code-stubs-mips.cc index 9fa7182..42ff4f4 100644 --- a/src/mips/code-stubs-mips.cc +++ b/src/mips/code-stubs-mips.cc @@ -3141,7 +3141,7 @@ void CallICStub::Generate(MacroAssembler* masm) { Label extra_checks_or_miss, slow_start; Label slow, non_function, wrap, cont; Label have_js_function; - int argc = state_.arg_count(); + int argc = arg_count(); ParameterCount actual(argc); EmitLoadTypeFeedbackVector(masm, a2); @@ -3153,7 +3153,7 @@ void CallICStub::Generate(MacroAssembler* masm) { __ Branch(&extra_checks_or_miss, ne, a1, Operand(t0)); __ bind(&have_js_function); - if (state_.CallAsMethod()) { + if (CallAsMethod()) { EmitContinueIfStrictOrNative(masm, &cont); // Compute the receiver in sloppy mode. __ lw(a3, MemOperand(sp, argc * kPointerSize)); @@ -3170,7 +3170,7 @@ void CallICStub::Generate(MacroAssembler* masm) { __ bind(&slow); EmitSlowCase(masm, argc, &non_function); - if (state_.CallAsMethod()) { + if (CallAsMethod()) { __ bind(&wrap); EmitWrapCase(masm, argc, &cont); } @@ -3215,7 +3215,7 @@ void CallICStub::Generate(MacroAssembler* masm) { void CallICStub::GenerateMiss(MacroAssembler* masm, IC::UtilityId id) { // Get the receiver of the function from the stack; 1 ~ return address. - __ lw(t0, MemOperand(sp, (state_.arg_count() + 1) * kPointerSize)); + __ lw(t0, MemOperand(sp, (arg_count() + 1) * kPointerSize)); { FrameScope scope(masm, StackFrame::INTERNAL); diff --git a/src/mips64/code-stubs-mips64.cc b/src/mips64/code-stubs-mips64.cc index 2eb6796..4f1db5b 100644 --- a/src/mips64/code-stubs-mips64.cc +++ b/src/mips64/code-stubs-mips64.cc @@ -3202,9 +3202,9 @@ void CallIC_ArrayStub::Generate(MacroAssembler* masm) { // The slow case, we need this no matter what to complete a call after a miss. CallFunctionNoFeedback(masm, - arg_count(), - true, - CallAsMethod()); + arg_count(), + true, + CallAsMethod()); // Unreachable. __ stop("Unexpected code address"); @@ -3217,7 +3217,7 @@ void CallICStub::Generate(MacroAssembler* masm) { Label extra_checks_or_miss, slow_start; Label slow, non_function, wrap, cont; Label have_js_function; - int argc = state_.arg_count(); + int argc = arg_count(); ParameterCount actual(argc); EmitLoadTypeFeedbackVector(masm, a2); @@ -3229,7 +3229,7 @@ void CallICStub::Generate(MacroAssembler* masm) { __ Branch(&extra_checks_or_miss, ne, a1, Operand(a4)); __ bind(&have_js_function); - if (state_.CallAsMethod()) { + if (CallAsMethod()) { EmitContinueIfStrictOrNative(masm, &cont); // Compute the receiver in sloppy mode. __ ld(a3, MemOperand(sp, argc * kPointerSize)); @@ -3246,7 +3246,7 @@ void CallICStub::Generate(MacroAssembler* masm) { __ bind(&slow); EmitSlowCase(masm, argc, &non_function); - if (state_.CallAsMethod()) { + if (CallAsMethod()) { __ bind(&wrap); EmitWrapCase(masm, argc, &cont); } @@ -3291,7 +3291,7 @@ void CallICStub::Generate(MacroAssembler* masm) { void CallICStub::GenerateMiss(MacroAssembler* masm, IC::UtilityId id) { // Get the receiver of the function from the stack; 1 ~ return address. - __ ld(a4, MemOperand(sp, (state_.arg_count() + 1) * kPointerSize)); + __ ld(a4, MemOperand(sp, (arg_count() + 1) * kPointerSize)); { FrameScope scope(masm, StackFrame::INTERNAL); -- 2.7.4