Add support for medium integers to the native message format

runtime/vm/snapshot.cc

 // 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.
 
 #include "vm/snapshot.h"
 
 #include "platform/assert.h"
 #include "vm/bootstrap.h"
 #include "vm/exceptions.h"
 #include "vm/heap.h"
@@ skipping 484 matching lines @@
   UnmarkCObject(object);
   if (object->type == Dart_CObject::kArray) {
     for (int i = 0; i < object->value.as_array.length; i++) {
       Dart_CObject* element = object->value.as_array.values[i];
       UnmarkAllCObjects(element);
     }
   }
 }
 
 
-void MessageWriter::WriteSmi(int32_t value) {
+void MessageWriter::WriteSmi(int64_t value) {
   Write<RawObject*>(Smi::New(value));
 }
 
 
+void MessageWriter::WriteInteger(Dart_CObject* object) {
+  ASSERT(object->type == Dart_CObject::kInt32 ||
+         object->type == Dart_CObject::kInt64);
+  int64_t value =
+      object->type == Dart_CObject::kInt32
+      ? object->value.as_int32
+      : object->value.as_int64;
+  if (Smi::IsValid64(value)) {
+    WriteSmi(value);
+  } else {
+    // Write out the serialization header value for mint object.
+    WriteInlinedHeader(object);
+    // Write out the class and tags information.
+    WriteObjectHeader(ObjectStore::kMintClass, 0);
+    // Write the 64-bit value.
+    Write<int64_t>(value);
+  }
+}
+
+
 void MessageWriter::WriteInlinedHeader(Dart_CObject* object) {
   // Write out the serialization header value for this object.
   WriteSerializationMarker(kInlined, kMaxPredefinedObjectIds + object_id_);
   // Mark object with its object id.
   MarkCObject(object, object_id_);
   // Advance object id.
   object_id_++;
 }
 
 
 void MessageWriter::WriteCObject(Dart_CObject* object) {
   if (IsCObjectMarked(object)) {
     intptr_t object_id = GetMarkedCObjectMark(object);
     WriteIndexedObject(kMaxPredefinedObjectIds + object_id);
     return;
   }
 
   switch (object->type) {
     case Dart_CObject::kNull:
       WriteIndexedObject(Object::kNullObject);
       break;
     case Dart_CObject::kBool:
       if (object->value.as_bool) {
         WriteIndexedObject(ObjectStore::kTrueValue);
       } else {
         WriteIndexedObject(ObjectStore::kFalseValue);
       }
       break;
-    case Dart_CObject::kInt32: {
-      WriteSmi(object->value.as_int32);
+    case Dart_CObject::kInt32:

[siva, 2012/02/09 01:07:21]

Why not leave this as WriteSmi(..) here and instead of WriteInteger(...) have a
WriteInt64(...) method. That way
you don't have to do these multiple checks.

The WriteInt64 guy can do a check to see if the value fits in a Smi and WriteSmi
of an int32_t quantity.

[Søren Gjesse, 2012/02/09 10:29:06]

Added WriteInt32, WriteInt64 and WriteMint together with WriteSmi and avided
double checking.

+    case Dart_CObject::kInt64:
+      WriteInteger(object);
       break;
-    }
     case Dart_CObject::kDouble:
       // Write out the serialization header value for this object.
       WriteInlinedHeader(object);
       // Write out the class and tags information.
       WriteObjectHeader(ObjectStore::kDoubleClass, 0);
       // Write double value.
       Write<double>(object->value.as_double);
       break;
     case Dart_CObject::kString: {
       // Write out the serialization header value for this object.
@@ skipping 240 matching lines @@
 
 
 void SnapshotWriterVisitor::VisitPointers(RawObject** first, RawObject** last) {
   for (RawObject** current = first; current <= last; current++) {
     RawObject* raw_obj = *current;
     writer_->WriteObject(raw_obj);
   }
 }
 
 }  // namespace dart