VM: Clean up generated code for NoSuchMethod invocation of closures.

runtime/vm/stub_code_mips.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_MIPS)
 
 #include "vm/assembler.h"
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
@@ skipping 1281 matching lines @@
   __ LeaveStubFrameAndReturn(RA);
 }
 
 
 // Called for invoking "dynamic noSuchMethod(Invocation invocation)" function
 // from the entry code of a dart function after an error in passed argument
 // name or number is detected.
 // Input parameters:
 //  RA : return address.
 //  SP : address of last argument.
-//  S5: inline cache data object.
 //  S4: arguments descriptor array.
 void StubCode::GenerateCallNoSuchMethodFunctionStub(Assembler* assembler) {
   __ EnterStubFrame();
 
   // Load the receiver.
   __ lw(A1, FieldAddress(S4, ArgumentsDescriptor::count_offset()));
   __ sll(TMP, A1, 1);  // A1 is a Smi.
   __ addu(TMP, FP, TMP);
   __ lw(T6, Address(TMP, kParamEndSlotFromFp * kWordSize));
 
   // Push space for the return value.
   // Push the receiver.
   // Push IC data object.
   // Push arguments descriptor array.
-  __ addiu(SP, SP, Immediate(-4 * kWordSize));
+  const intptr_t kNumArgs = 3;
+  __ addiu(SP, SP, Immediate(-kNumArgs * kWordSize));
   __ LoadImmediate(TMP, reinterpret_cast<intptr_t>(Object::null()));
-  __ sw(TMP, Address(SP, 3 * kWordSize));
-  __ sw(T6, Address(SP, 2 * kWordSize));
-  __ sw(S5, Address(SP, 1 * kWordSize));
+  __ sw(TMP, Address(SP, 2 * kWordSize));
+  __ sw(T6, Address(SP, 1 * kWordSize));
   __ sw(S4, Address(SP, 0 * kWordSize));
 
   // A1: Smi-tagged arguments array length.
   PushArgumentsArray(assembler);
 
-  __ CallRuntime(kInvokeNoSuchMethodFunctionRuntimeEntry, 4);
+  __ CallRuntime(kInvokeNoSuchMethodFunctionRuntimeEntry, kNumArgs);
 
-  __ lw(V0, Address(SP, 4 * kWordSize));  // Get result into V0.
+  __ lw(V0, Address(SP, kNumArgs * kWordSize));  // Get result into V0.
   __ LeaveStubFrameAndReturn();
 }
 
 
 //  T0: function object.
 //  S5: inline cache data object.
 // Cannot use function object from ICData as it may be the inlined
 // function and not the top-scope function.
 void StubCode::GenerateOptimizedUsageCounterIncrement(Assembler* assembler) {
   __ TraceSimMsg("OptimizedUsageCounterIncrement");
@@ skipping 868 matching lines @@
   const Register right = T0;
   __ lw(left, Address(SP, 1 * kWordSize));
   __ lw(right, Address(SP, 0 * kWordSize));
   GenerateIdenticalWithNumberCheckStub(assembler, left, right, temp1, temp2);
   __ Ret();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_MIPS