Changes to set up the object tag bits

vm/snapshot.h

 // Copyright (c) 2011, 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_SNAPSHOT_H_
 #define VM_SNAPSHOT_H_
 
 #include "vm/allocation.h"
 #include "vm/assert.h"
 #include "vm/bitfield.h"
@@ skipping 331 matching lines @@
   void WriteMessage(intptr_t field_count, intptr_t *data);
 
  private:
   // Writes raw data to the stream (basic type).
   // sizeof(T) must be in {1,2,4,8}.
   template <typename T>
   void Write(T value) {
     WriteStream::Raw<sizeof(T), T>::Write(&stream_, value);
   }
 
-  // Setup header information for an object.
-  void WriteObjectHeader(SerializedHeaderType type, intptr_t id) {
+  // Write an object that is serialized as an Id (singleton, object store,
+  // or an object that was already serialized before).
+  void WriteIndexedObject(intptr_t object_id) {
+    WriteSerializationMarker(kObjectId, object_id);
+  }
+
+  // Write out object header value.
+  void WriteObjectHeader(intptr_t class_id, intptr_t tags) {
+    // Write out the class information.
+    WriteIndexedObject(class_id);
+    // Write out the tags information.
+    Write<intptr_t>(tags);
+  }
+
+  // Write serialization header information for an object.
+  void WriteSerializationMarker(SerializedHeaderType type, intptr_t id) {
     uword value = 0;
     value = SerializedHeaderTag::update(type, value);
     value = SerializedHeaderData::update(id, value);
     Write<uword>(value);
   }
 
   // Finalize the serialized buffer by filling in the header information
   // which comprises of a flag(full/partial snaphot) and the length of
   // serialzed bytes.
   void FinalizeBuffer() {
@@ skipping 38 matching lines @@
   template <typename T>
   void Write(T value) {
     WriteStream::Raw<sizeof(T), T>::Write(&stream_, value);
   }
 
   // Serialize an object into the buffer.
   void WriteObject(RawObject* raw);
 
   void WriteClassId(RawClass* cls);
 
-  // Setup header information for an object.
-  void WriteObjectHeader(SerializedHeaderType type, intptr_t value);
+  // Write an object that is serialized as an Id (singleton, object store,
+  // or an object that was already serialized before).
+  void WriteIndexedObject(intptr_t object_id) {
+    WriteSerializationMarker(kObjectId, object_id);
+  }
+
+  // Write out object header value.
+  void WriteObjectHeader(intptr_t class_id, intptr_t tags) {
+    // Write out the class information.
+    WriteIndexedObject(class_id);
+    // Write out the tags information.
+    Write<intptr_t>(tags);
+  }
+
+  // Write serialization header information for an object.
+  void WriteSerializationMarker(SerializedHeaderType type, intptr_t id) {
+    uword value = 0;
+    value = SerializedHeaderTag::update(type, value);
+    value = SerializedHeaderData::update(id, value);
+    Write<uword>(value);
+  }
 
   // Unmark all objects that were marked as forwarded for serializing.
   void UnmarkAll();
 
   // Writes a full snapshot of the Isolate.
   void WriteFullSnapshot();
 
  private:
   class ForwardObjectNode : public ZoneAllocated {
    public:
@@ skipping 50 matching lines @@
 
  private:
   SnapshotWriter* writer_;
 
   DISALLOW_COPY_AND_ASSIGN(SnapshotWriterVisitor);
 };
 
 }  // namespace dart
 
 #endif  // VM_SNAPSHOT_H_