Support untagged object pool entries.

runtime/vm/assembler.h

 // Copyright (c) 2012, 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_H_
 #define VM_ASSEMBLER_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/globals.h"
@@ skipping 31 matching lines @@
  private:
   const uword address_;
 };
 
 
 // Assembler fixups are positions in generated code that hold relocation
 // information that needs to be processed before finalizing the code
 // into executable memory.
 class AssemblerFixup : public ZoneAllocated {
  public:
-  virtual void Process(const MemoryRegion& region, intptr_t position) = 0;
+  virtual void Process(const MemoryRegion& region,
+                       intptr_t position,
+                       Assembler* assembler) = 0;
 
   virtual bool IsPointerOffset() const = 0;
 
   // It would be ideal if the destructor method could be made private,
   // but the g++ compiler complains when this is subclassed.
   virtual ~AssemblerFixup() { UNREACHABLE(); }
 
  private:
   AssemblerFixup* previous_;
   intptr_t position_;
 
   AssemblerFixup* previous() const { return previous_; }
   void set_previous(AssemblerFixup* previous) { previous_ = previous; }
 
   intptr_t position() const { return position_; }
   void set_position(intptr_t position) { position_ = position; }
 
   friend class AssemblerBuffer;
 };
 
 
 // Assembler buffers are used to emit binary code. They grow on demand.
 class AssemblerBuffer : public ValueObject {
  public:
-  AssemblerBuffer();
+  explicit AssemblerBuffer(Assembler* assembler);
   ~AssemblerBuffer();
 
   // Basic support for emitting, loading, and storing.
   template<typename T> void Emit(T value) {
     ASSERT(HasEnsuredCapacity());
     *reinterpret_cast<T*>(cursor_) = value;
     cursor_ += sizeof(T);
   }
 
   template<typename T> void Remit() {
@@ skipping 85 matching lines @@
  private:
   // The limit is set to kMinimumGap bytes before the end of the data area.
   // This leaves enough space for the longest possible instruction and allows
   // for a single, fast space check per instruction.
   static const intptr_t kMinimumGap = 32;
 
   uword contents_;
   uword cursor_;
   uword limit_;
   AssemblerFixup* fixup_;
+  Assembler* assembler_;
   ZoneGrowableArray<intptr_t>* pointer_offsets_;
 #if defined(DEBUG)
   bool fixups_processed_;
 #endif
 
   uword cursor() const { return cursor_; }
   uword limit() const { return limit_; }
   intptr_t Capacity() const {
     ASSERT(limit_ >= contents_);
     return (limit_ - contents_) + kMinimumGap;
@@ skipping 58 matching lines @@
   static inline bool IsKeyEqual(Pair kv, Key key) {
     return kv.key_->raw() == key->raw();
   }
 
  private:
   Key key_;
   Value value_;
 };
 
 
+class UntaggedIndexPair {
+ public:
+  // Typedefs needed for the DirectChainedHashMap template.
+  typedef uword Key;
+  typedef intptr_t Value;
+  typedef UntaggedIndexPair Pair;
+
+  static const intptr_t kNoIndex = -1;
+
+  UntaggedIndexPair() : key_(), value_(kNoIndex) { }
+
+  UntaggedIndexPair(Key key, Value value) : key_(key), value_(value) { }
+
+  static Key KeyOf(Pair kv) { return kv.key_; }
+
+  static Value ValueOf(Pair kv) { return kv.value_; }
+
+  static intptr_t Hashcode(Key key) {
+    return static_cast<intptr_t>(key);
+  }
+
+  static inline bool IsKeyEqual(Pair kv, Key key) {
+    return kv.key_ == key;
+  }
+
+ private:
+  Key key_;
+  Value value_;
+};
+
+
 enum Patchability {
   kPatchable,
   kNotPatchable,
 };
 
 
-class ObjectPool : public ValueObject {
+class ObjectPoolHelper : public ValueObject {
  public:
-  ObjectPool() : object_pool_(GrowableObjectArray::Handle()) { }
-
-  intptr_t AddObject(const Object& obj, Patchability patchable);
+  intptr_t AddObject(const Object& obj);
+  intptr_t AddImmediate(uword imm);
   intptr_t AddExternalLabel(const ExternalLabel* label,
                             Patchability patchable);
 
-  intptr_t FindObject(const Object& obj, Patchability patchable);
+  intptr_t AddFixedObject(const Object& obj);
+  intptr_t AddFixedExternalLabel(const ExternalLabel* label);
+
+  intptr_t FindObject(const Object& obj);
+  intptr_t FindImmediate(uword imm);
   intptr_t FindExternalLabel(const ExternalLabel* label,
                              Patchability patchable);
-  const GrowableObjectArray& data() const { return object_pool_; }
+
+  RawObjectPool* MakeObjectPool();
+
+  intptr_t UntaggedEntryStart() { return tagged_entries_.length(); }
 
  private:
-  // Objects and jump targets.
-  GrowableObjectArray& object_pool_;
+  intptr_t AddUntagged(uword value, Patchability patchable);
+  intptr_t FindUntagged(uword value, Patchability patchable);
 
-  // Patchability of pool entries.
-  GrowableArray<Patchability> patchable_pool_entries_;
+  GrowableArray<ObjectPool::Entry> fixed_entries_;
 
-  // Hashmap for fast lookup in object pool.
-  DirectChainedHashMap<ObjIndexPair> object_pool_index_table_;
+  GrowableArray<const Object*> tagged_entries_;
+  DirectChainedHashMap<ObjIndexPair> object_index_table_;
+
+  GrowableArray<uword> untagged_entries_;
+  DirectChainedHashMap<UntaggedIndexPair> untagged_index_table_;
 };
 
+
+class ObjectPoolIndexFixup : public AssemblerFixup {
+ public:
+  virtual void Process(const MemoryRegion& region,
+                       intptr_t position,
+                       Assembler* assembler);
+
+  virtual bool IsPointerOffset() const { return false; }
+};
+
+
 }  // namespace dart
 
 
 #if defined(TARGET_ARCH_IA32)
 #include "vm/assembler_ia32.h"
 #elif defined(TARGET_ARCH_X64)
 #include "vm/assembler_x64.h"
 #elif defined(TARGET_ARCH_ARM)
 #include "vm/assembler_arm.h"
 #elif defined(TARGET_ARCH_ARM64)
 #include "vm/assembler_arm64.h"
 #elif defined(TARGET_ARCH_MIPS)
 #include "vm/assembler_mips.h"
 #else
 #error Unknown architecture.
 #endif
 
 #endif  // VM_ASSEMBLER_H_