VM: Use constant pool also for leaf runtime calls on x64, arm, arm64 and mips.

runtime/vm/assembler_mips.h

 // 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.
 
 #ifndef VM_ASSEMBLER_MIPS_H_
 #define VM_ASSEMBLER_MIPS_H_
 
 #ifndef VM_ASSEMBLER_H_
 #error Do not include assembler_mips.h directly; use assembler.h instead.
 #endif
@@ skipping 894 matching lines @@
 
   // ro must be different from rd and rs.
   // None of rd, rs, rt, or ro may be TMP.
   void SubImmediateDetectOverflow(Register rd, Register rs, int32_t imm,
                                   Register ro) {
     ASSERT(!in_delay_slot_);
     LoadImmediate(rd, imm);
     SubuDetectOverflow(rd, rs, rd, ro);
   }
 
-  void Branch(const ExternalLabel* label) {
-    ASSERT(!in_delay_slot_);
-    LoadImmediate(TMP, label->address());
-    jr(TMP);
-  }
-
   void Branch(const StubEntry& stub_entry);
 
-  void BranchPatchable(const ExternalLabel* label) {
-    ASSERT(!in_delay_slot_);
-    const uint16_t low = Utils::Low16Bits(label->address());
-    const uint16_t high = Utils::High16Bits(label->address());
-    lui(T9, Immediate(high));
-    ori(T9, T9, Immediate(low));
-    jr(T9);
-    delay_slot_available_ = false;  // CodePatcher expects a nop.
-  }
-
   void BranchPatchable(const StubEntry& stub_entry);
 
-  void BranchLink(const ExternalLabel* label) {
-    ASSERT(!in_delay_slot_);
-    LoadImmediate(T9, label->address());
-    jalr(T9);
-  }
-
-  void BranchLink(const StubEntry& stub_entry);
-
-  void BranchLink(const ExternalLabel* label, Patchability patchable) {
-    ASSERT(!in_delay_slot_);
-    const int32_t offset = ObjectPool::element_offset(
-        object_pool_wrapper_.FindExternalLabel(label, patchable));
-    LoadWordFromPoolOffset(T9, offset - kHeapObjectTag);
-    jalr(T9);
-    if (patchable == kPatchable) {
-      delay_slot_available_ = false;  // CodePatcher expects a nop.
-    }
-  }
-
-  void BranchLink(const StubEntry& stub_entry, Patchability patchable);
-
-  void BranchLinkPatchable(const ExternalLabel* label) {
-    BranchLink(label, kPatchable);
-  }
+  void BranchLink(const ExternalLabel* label, Patchability patchable);
+  void BranchLink(const StubEntry& stub_entry,
+                  Patchability patchable = kNotPatchable);
 
   void BranchLinkPatchable(const StubEntry& stub_entry);
 
   void Drop(intptr_t stack_elements) {
     ASSERT(stack_elements >= 0);
     if (stack_elements > 0) {
       addiu(SP, SP, Immediate(stack_elements * kWordSize));
     }
   }
 
@@ skipping 694 matching lines @@
     intptr_t pc_offset_;
     const String& comment_;
 
     DISALLOW_COPY_AND_ASSIGN(CodeComment);
   };
 
   GrowableArray<CodeComment*> comments_;
 
   bool constant_pool_allowed_;
 
+  void BranchLink(const ExternalLabel* label);
+
   void LoadObjectHelper(Register rd, const Object& object, bool is_unique);
 
   void Emit(int32_t value) {
     // Emitting an instruction clears the delay slot state.
     in_delay_slot_ = false;
     delay_slot_available_ = false;
     AssemblerBuffer::EnsureCapacity ensured(&buffer_);
     buffer_.Emit<int32_t>(value);
   }
 
@@ skipping 88 matching lines @@
                                   Register value,
                                   Label* no_update);
 
   DISALLOW_ALLOCATION();
   DISALLOW_COPY_AND_ASSIGN(Assembler);
 };
 
 }  // namespace dart
 
 #endif  // VM_ASSEMBLER_MIPS_H_