Index: src/mips/code-stubs-mips.cc |
diff --git a/src/mips/code-stubs-mips.cc b/src/mips/code-stubs-mips.cc |
index b12cb718ab965321f8fef7fe4a5302e7467c91f1..86f769d458e411bed32b42dd4eb0ec0935d096f5 100644 |
--- a/src/mips/code-stubs-mips.cc |
+++ b/src/mips/code-stubs-mips.cc |
@@ -1066,13 +1066,20 @@ void CEntryStub::Generate(MacroAssembler* masm) { |
// fp: frame pointer (restored after C call) |
// sp: stack pointer (restored as callee's sp after C call) |
// cp: current context (C callee-saved) |
+ // |
+ // If argv_in_register(): |
+ // a2: pointer to the first argument |
ProfileEntryHookStub::MaybeCallEntryHook(masm); |
- // Compute the argv pointer in a callee-saved register. |
- __ sll(s1, a0, kPointerSizeLog2); |
- __ Addu(s1, sp, s1); |
- __ Subu(s1, s1, kPointerSize); |
+ if (!argv_in_register()) { |
+ // Compute the argv pointer in a callee-saved register. |
+ __ sll(s1, a0, kPointerSizeLog2); |
+ __ Addu(s1, sp, s1); |
+ __ Subu(s1, s1, kPointerSize); |
+ } else { |
+ __ mov(s1, a2); |
+ } |
// Enter the exit frame that transitions from JavaScript to C++. |
FrameScope scope(masm, StackFrame::MANUAL); |