ARM and MIPS changes which correspond to the initial change submitted in

runtime/vm/assembler_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/longjump.h"
 #include "vm/runtime_entry.h"
@@ skipping 612 matching lines @@
   lw(result, FieldAddress(CTX, Context::isolate_offset()));
   const intptr_t table_offset_in_isolate =
       Isolate::class_table_offset() + ClassTable::table_offset();
   lw(result, Address(result, table_offset_in_isolate));
   sll(TMP, TMP, 2);
   addu(result, result, TMP);
   lw(result, Address(result));
 }
 
 
-void Assembler::EnterStubFrame(bool uses_pp) {
+void Assembler::EnterFrame() {
+  addiu(SP, SP, Immediate(-2 * kWordSize));
+  sw(RA, Address(SP, 1 * kWordSize));
+  sw(FP, Address(SP, 0 * kWordSize));
+  mov(FP, SP);
+}
+
+
+void Assembler::LeaveFrameAndReturn() {
+  mov(SP, FP);
+  lw(RA, Address(SP, 1 * kWordSize));
+  lw(FP, Address(SP, 0 * kWordSize));
+  Ret();
+  delay_slot()->addiu(SP, SP, Immediate(2 * kWordSize));
+}
+
+
+void Assembler::EnterStubFrame(bool load_pp) {
   SetPrologueOffset();
-  if (uses_pp) {
-    addiu(SP, SP, Immediate(-4 * kWordSize));
-    sw(ZR, Address(SP, 3 * kWordSize));  // PC marker is 0 in stubs.
-    sw(RA, Address(SP, 2 * kWordSize));
-    sw(FP, Address(SP, 1 * kWordSize));
-    sw(PP, Address(SP, 0 * kWordSize));
-    addiu(FP, SP, Immediate(1 * kWordSize));
+  addiu(SP, SP, Immediate(-4 * kWordSize));
+  sw(ZR, Address(SP, 3 * kWordSize));  // PC marker is 0 in stubs.
+  sw(RA, Address(SP, 2 * kWordSize));
+  sw(FP, Address(SP, 1 * kWordSize));
+  sw(PP, Address(SP, 0 * kWordSize));
+  addiu(FP, SP, Immediate(1 * kWordSize));
+  if (load_pp) {
     // Setup pool pointer for this stub.
-
-    GetNextPC(TMP);  // TMP gets the address of the next instruction.
-
-    const intptr_t object_pool_pc_dist =
-        Instructions::HeaderSize() - Instructions::object_pool_offset() +
-        CodeSize();
-
-    lw(PP, Address(TMP, -object_pool_pc_dist));
-  } else {
-    addiu(SP, SP, Immediate(-3 * kWordSize));
-    sw(ZR, Address(SP, 2 * kWordSize));  // PC marker is 0 in stubs.
-    sw(RA, Address(SP, 1 * kWordSize));
-    sw(FP, Address(SP, 0 * kWordSize));
-    mov(FP, SP);
+    LoadPoolPointer();
   }
 }
 
 
-void Assembler::LeaveStubFrame(bool uses_pp) {
-  if (uses_pp) {
-    addiu(SP, FP, Immediate(-1 * kWordSize));
-    lw(RA, Address(SP, 2 * kWordSize));
-    lw(FP, Address(SP, 1 * kWordSize));
-    lw(PP, Address(SP, 0 * kWordSize));
-    addiu(SP, SP, Immediate(4 * kWordSize));
-  } else {
-    mov(SP, FP);
-    lw(RA, Address(SP, 1 * kWordSize));
-    lw(FP, Address(SP, 0 * kWordSize));
-    addiu(SP, SP, Immediate(3 * kWordSize));
-  }
+void Assembler::LeaveStubFrame() {
+  addiu(SP, FP, Immediate(-1 * kWordSize));
+  lw(RA, Address(SP, 2 * kWordSize));
+  lw(FP, Address(SP, 1 * kWordSize));
+  lw(PP, Address(SP, 0 * kWordSize));
+  addiu(SP, SP, Immediate(4 * kWordSize));
 }
 
 
-void Assembler::LeaveStubFrameAndReturn(Register ra, bool uses_pp) {
-  if (uses_pp) {
-    addiu(SP, FP, Immediate(-1 * kWordSize));
-    lw(RA, Address(SP, 2 * kWordSize));
-    lw(FP, Address(SP, 1 * kWordSize));
-    lw(PP, Address(SP, 0 * kWordSize));
-    jr(ra);
-    delay_slot()->addiu(SP, SP, Immediate(4 * kWordSize));
-  } else {
-    mov(SP, FP);
-    lw(RA, Address(SP, 1 * kWordSize));
-    lw(FP, Address(SP, 0 * kWordSize));
-    jr(ra);
-    delay_slot()->addiu(SP, SP, Immediate(3 * kWordSize));
-  }
+void Assembler::LeaveStubFrameAndReturn(Register ra) {
+  addiu(SP, FP, Immediate(-1 * kWordSize));
+  lw(RA, Address(SP, 2 * kWordSize));
+  lw(FP, Address(SP, 1 * kWordSize));
+  lw(PP, Address(SP, 0 * kWordSize));
+  jr(ra);
+  delay_slot()->addiu(SP, SP, Immediate(4 * kWordSize));
 }
 
 
 void Assembler::TryAllocate(const Class& cls,
                             Label* failure,
                             Register instance_reg) {
   ASSERT(failure != NULL);
   if (FLAG_inline_alloc) {
     Heap* heap = Isolate::Current()->heap();
     const intptr_t instance_size = cls.instance_size();
@@ skipping 275 matching lines @@
     Emit(reinterpret_cast<int32_t>(message));
     Bind(&msg);
     break_(Instr::kMsgMessageCode);
   }
 #endif
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_MIPS
-