Index: src/mips64/code-stubs-mips64.cc |
diff --git a/src/mips64/code-stubs-mips64.cc b/src/mips64/code-stubs-mips64.cc |
index 4ba9f532ae2c6e79da97a8c38a9df6bfeeefc190..d0c05ad0ccb0fc713509825e58344d0cd80213ea 100644 |
--- a/src/mips64/code-stubs-mips64.cc |
+++ b/src/mips64/code-stubs-mips64.cc |
@@ -1064,20 +1064,13 @@ |
// 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); |
- 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); |
- } |
+ // Compute the argv pointer in a callee-saved register. |
+ __ dsll(s1, a0, kPointerSizeLog2); |
+ __ Daddu(s1, sp, s1); |
+ __ Dsubu(s1, s1, kPointerSize); |
// Enter the exit frame that transitions from JavaScript to C++. |
FrameScope scope(masm, StackFrame::MANUAL); |
@@ -1157,12 +1150,8 @@ |
// v0:v1: result |
// sp: stack pointer |
// fp: frame pointer |
- Register argc; |
- if (!argv_in_register()) { |
- // s0: still holds argc (callee-saved). |
- argc = s0; |
- } |
- __ LeaveExitFrame(save_doubles(), argc, true, EMIT_RETURN); |
+ // s0: still holds argc (callee-saved). |
+ __ LeaveExitFrame(save_doubles(), s0, true, EMIT_RETURN); |
// Handling of exception. |
__ bind(&exception_returned); |