VM: Align implementations of assembler constant pools.

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 218 matching lines @@
   }
 
   uword bits_;
 };
 
 
 class Assembler : public ValueObject {
  public:
   explicit Assembler(bool use_far_branches = false)
       : buffer_(),
-        object_pool_(GrowableObjectArray::Handle()),
         prologue_offset_(-1),
         use_far_branches_(use_far_branches),
         delay_slot_available_(false),
         in_delay_slot_(false),
         comments_(),
         allow_constant_pool_(true) { }
   ~Assembler() { }
 
   void PopRegister(Register r) { Pop(r); }
 
   void Bind(Label* label);
   void Jump(Label* label) { b(label); }
 
   // Misc. functionality
   intptr_t CodeSize() const { return buffer_.Size(); }
   intptr_t prologue_offset() const { return prologue_offset_; }
 
   // Count the fixups that produce a pointer offset, without processing
   // the fixups.
   intptr_t CountPointerOffsets() const {
     return buffer_.CountPointerOffsets();
   }
 
   const ZoneGrowableArray<intptr_t>& GetPointerOffsets() const {
     return buffer_.pointer_offsets();
   }
-  const GrowableObjectArray& object_pool() const { return object_pool_; }
+  const GrowableObjectArray& object_pool() const { return object_pool_.data(); }
   void FinalizeInstructions(const MemoryRegion& region) {
     buffer_.FinalizeInstructions(region);
   }
 
   bool use_far_branches() const {
     return FLAG_use_far_branches || use_far_branches_;
   }
 
   void set_use_far_branches(bool b) {
     ASSERT(buffer_.Size() == 0);
@@ skipping 643 matching lines @@
   }
 
   void BranchLink(const ExternalLabel* label) {
     ASSERT(!in_delay_slot_);
     LoadImmediate(T9, label->address());
     jalr(T9);
   }
 
   void BranchLinkPatchable(const ExternalLabel* label) {
     ASSERT(!in_delay_slot_);
-    const int32_t offset =
-        Array::data_offset() + 4*AddExternalLabel(label) - kHeapObjectTag;
-    LoadWordFromPoolOffset(T9, offset);
+    const int32_t offset = Array::element_offset(
+        object_pool_.FindExternalLabel(label, kPatchable));
+    LoadWordFromPoolOffset(T9, offset - kHeapObjectTag);
     jalr(T9);
     delay_slot_available_ = false;  // CodePatcher expects a nop.
   }
 
   void Drop(intptr_t stack_elements) {
     ASSERT(stack_elements >= 0);
     if (stack_elements > 0) {
       addiu(SP, SP, Immediate(stack_elements * kWordSize));
     }
   }
@@ skipping 663 matching lines @@
 
   bool allow_constant_pool() const {
     return allow_constant_pool_;
   }
   void set_allow_constant_pool(bool b) {
     allow_constant_pool_ = b;
   }
 
  private:
   AssemblerBuffer buffer_;
-  GrowableObjectArray& object_pool_;  // Objects and patchable jump targets.
-
-  // Hashmap for fast lookup in object pool.
-  DirectChainedHashMap<ObjIndexPair> object_pool_index_table_;
+  ObjectPool object_pool_;  // Objects and patchable jump targets.
 
   intptr_t prologue_offset_;
 
   bool use_far_branches_;
   bool delay_slot_available_;
   bool in_delay_slot_;
 
-  int32_t AddObject(const Object& obj);
-  int32_t AddExternalLabel(const ExternalLabel* label);
-
   class CodeComment : public ZoneAllocated {
    public:
     CodeComment(intptr_t pc_offset, const String& comment)
         : pc_offset_(pc_offset), comment_(comment) { }
 
     intptr_t pc_offset() const { return pc_offset_; }
     const String& comment() const { return comment_; }
 
    private:
     intptr_t pc_offset_;
@@ skipping 105 matching lines @@
                                   Register value,
                                   Label* no_update);
 
   DISALLOW_ALLOCATION();
   DISALLOW_COPY_AND_ASSIGN(Assembler);
 };
 
 }  // namespace dart
 
 #endif  // VM_ASSEMBLER_MIPS_H_