Index: src/mips64/code-stubs-mips64.cc |
diff --git a/src/mips64/code-stubs-mips64.cc b/src/mips64/code-stubs-mips64.cc |
index d0c05ad0ccb0fc713509825e58344d0cd80213ea..0f6f1ec5f2647c02893d8a7fba7d218794a54416 100644 |
--- a/src/mips64/code-stubs-mips64.cc |
+++ b/src/mips64/code-stubs-mips64.cc |
@@ -1064,13 +1064,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. |
- __ dsll(s1, a0, kPointerSizeLog2); |
- __ Daddu(s1, sp, s1); |
- __ Dsubu(s1, s1, kPointerSize); |
+ if (!argv_in_register()) { |
+ // Compute the argv pointer in a callee-saved register. |
+ __ dsll(s1, a0, kPointerSizeLog2); |
+ __ Daddu(s1, sp, s1); |
+ __ Dsubu(s1, s1, kPointerSize); |
+ } else { |
+ __ mov(s1, a2); |
+ } |
// Enter the exit frame that transitions from JavaScript to C++. |
FrameScope scope(masm, StackFrame::MANUAL); |