Supports FrameLookup vm test on MIPS

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/runtime_entry.h"
 #include "vm/simulator.h"
@@ skipping 151 matching lines @@
 }
 
 
 void Assembler::CompareObject(Register rd, Register rn, const Object& object) {
   ASSERT(rn != TMP1);
   LoadObject(TMP1, object);
   subu(rd, rn, TMP1);
 }
 
 
+void Assembler::BranchOnCondition(Register rd, Label* l, Condition c) {
+  switch (c) {
+    case EQ:
+      beq(rd, ZR, l);
+      break;
+    case NE:
+      bne(rd, ZR, l);
+      break;
+    default:
+      UNIMPLEMENTED();
+      break;
+  }
+}
+
+
 void Assembler::LoadClassId(Register result, Register object) {
   ASSERT(RawObject::kClassIdTagBit == 16);
   ASSERT(RawObject::kClassIdTagSize == 16);
   const intptr_t class_id_offset = Object::tags_offset() +
       RawObject::kClassIdTagBit / kBitsPerByte;
   lhu(result, FieldAddress(object, class_id_offset));
 }
 
 
 void Assembler::LoadClassById(Register result, Register class_id) {
@@ skipping 15 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(TMP1, TMP1, 2);
   addu(result, result, TMP1);
   lw(result, Address(result));
 }
 
 
-void Assembler::EnterStubFrame() {
-  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);
+void Assembler::EnterStubFrame(bool uses_pp) {
+  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(PP, Address(SP, 1 * kWordSize));
+    sw(FP, Address(SP, 0 * kWordSize));
+    mov(FP, SP);
+    // Setup pool pointer for this stub.
+    Label next;
+    bal(&next);
+    delay_slot()->mov(T0, RA);
+
+    const intptr_t object_pool_pc_dist =
+        Instructions::HeaderSize() - Instructions::object_pool_offset() +
+        CodeSize();
+
+    Bind(&next);
+    lw(PP, Address(T0, -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);
+  }
 }
 
 
-void Assembler::LeaveStubFrame() {
-  mov(SP, FP);
-  lw(RA, Address(SP, 1 * kWordSize));
-  lw(FP, Address(SP, 0 * kWordSize));
-  addiu(SP, SP, Immediate(3 * kWordSize));
+void Assembler::LeaveStubFrame(bool uses_pp) {
+  if (uses_pp) {
+    mov(SP, FP);

[regis, 2013/04/10 20:53:00]

You can factorize this mov.

[zra, 2013/04/10 21:59:05]

Done.

+    lw(RA, Address(SP, 2 * kWordSize));
+    lw(PP, Address(SP, 1 * kWordSize));
+    lw(FP, 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::CallRuntime(const RuntimeEntry& entry) {
   entry.Call(this);
 }
 
 
 void Assembler::EnterDartFrame(intptr_t frame_size) {
   const intptr_t offset = CodeSize();
@@ skipping 12 matching lines @@
 
   // Calculate the offset of the pool pointer from the PC.
   const intptr_t object_pool_pc_dist =
       Instructions::HeaderSize() - Instructions::object_pool_offset() +
       CodeSize();
 
   // This sw instruction is the return address for the bal, so T0 holds
   // the PC at this sw instruction.
   Bind(&next);
 
-  if (offset != 0) {
-    // Adjust PC for any intrinsic code that could have been generated
-    // before a frame is created.
-    addiu(T0, T0, Immediate(-offset));
-  }
-
   // Save PC in frame for fast identification of corresponding code.
   sw(T0, Address(SP, 3 * kWordSize));

[regis, 2013/04/10 20:53:00]

You could save this store if offset != 0:

if (offset == 0) {
  sw(T0, Address(SP, 3 * kWordSize));
} else {
  // Adjust ...

[zra, 2013/04/10 21:59:05]

Done.

 
+  if (offset != 0) {
+    // Adjust saved PC for any intrinsic code that could have been generated
+    // before a frame is created.
+    AddImmediate(T1, T0, -offset);
+    sw(T1, Address(SP, 3 * kWordSize));
+  }
+
   // Set FP to the saved previous FP.
   addiu(FP, SP, Immediate(kWordSize));
 
   // Load the pool pointer.
   lw(PP, Address(T0, -object_pool_pc_dist));
 
   // Reserve space for locals.
-  addiu(SP, SP, Immediate(-frame_size));
+  AddImmediate(SP, -frame_size);
 }
 
 
 void Assembler::LeaveDartFrame() {
   addiu(SP, FP, Immediate(-kWordSize));
 
   lw(RA, Address(SP, 2 * kWordSize));
   lw(FP, Address(SP, 1 * kWordSize));
   lw(PP, Address(SP, 0 * kWordSize));
 
   // Adjust SP for PC pushed in EnterDartFrame.
   addiu(SP, SP, Immediate(4 * kWordSize));
 }
 
 
 void Assembler::ReserveAlignedFrameSpace(intptr_t frame_space) {
   // Reserve space for arguments and align frame before entering
   // the C++ world.
-  addiu(SP, SP, Immediate(-frame_space));
+  AddImmediate(SP, -frame_space);
   if (OS::ActivationFrameAlignment() > 0) {
     LoadImmediate(TMP1, ~(OS::ActivationFrameAlignment() - 1));
     and_(SP, SP, TMP1);
   }
 }
 
 
 int32_t Assembler::AddExternalLabel(const ExternalLabel* label) {
   if (object_pool_.IsNull()) {
     // The object pool cannot be used in the vm isolate.
@@ skipping 19 matching lines @@
   b(&stop);
   Emit(reinterpret_cast<int32_t>(message));
   Bind(&stop);
   break_(Instr::kStopMessageCode);
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_MIPS