Add support for byte arrays to native messages

runtime/vm/dart_api_message.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/dart_api_message.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 
 namespace dart {
 
@@ skipping 82 matching lines @@
   // up to this area.
   Dart_CObject* value =
       reinterpret_cast<Dart_CObject*>(
           alloc_(NULL, 0, sizeof(Dart_CObject) + length + 1));
   value->value.as_string = reinterpret_cast<char*>(value) + sizeof(*value);
   value->type = Dart_CObject::kString;
   return value;
 }
 
 
+Dart_CObject* ApiMessageReader::AllocateDartCObjectByteArray(intptr_t length) {
+  // Allocate a Dart_CObject structure followed by an array of bytes
+  // for the byte array content. The pointer to the byte array content
+  // is set up to this area.
+  Dart_CObject* value =
+      reinterpret_cast<Dart_CObject*>(
+          alloc_(NULL, 0, sizeof(Dart_CObject) + length + 1));

[siva, 2012/02/09 01:58:57]

(sizeof(Dart_Cobject) + length + 1)

what is the + 1 for?

ASSERT(value != NULL);

[Søren Gjesse, 2012/02/09 09:34:16]

Removed the + 1 (copy/paset from string allocation). Added ASSERT for all alloc_
calls.

+  value->type = Dart_CObject::kByteArray;
+  value->value.as_array.length = length;
+  if (length > 0) {
+    value->value.as_byte_array.values =
+        reinterpret_cast<uint8_t*>(value) + sizeof(*value);
+  } else {
+    value->value.as_byte_array.values = NULL;
+  }
+  return value;
+}
+
+
 Dart_CObject* ApiMessageReader::AllocateDartCObjectArray(intptr_t length) {
   // Allocate a Dart_CObject structure followed by an array of
   // pointers to Dart_CObject structures. The pointer to the array
   // content is set up to this area.
   Dart_CObject* value =
       reinterpret_cast<Dart_CObject*>(
           alloc_(NULL, 0, sizeof(Dart_CObject) + length * sizeof(value)));
   value->type = Dart_CObject::kArray;
   value->value.as_array.length = length;
   if (length > 0) {
@@ skipping 77 matching lines @@
       break;
     }
     case ObjectStore::kTwoByteStringClass:
       // Two byte strings not supported.
       return NULL;
       break;
     case ObjectStore::kFourByteStringClass:
       // Four byte strings not supported.
       return NULL;
       break;
+    case ObjectStore::kInternalByteArrayClass: {
+      intptr_t len = ReadSmiValue();
+      Dart_CObject* object = AllocateDartCObjectByteArray(len);
+      AddBackwardReference(object_id, object);
+      if (len > 0) {
+        uint8_t* p = object->value.as_byte_array.values;
+        for (intptr_t i = 0; i < len; i++) {
+          *p = Read<uint8_t>();

[siva, 2012/02/09 01:58:57]

p[i] = Read<uint8_t>();

would avoid the need for p++

[Søren Gjesse, 2012/02/09 09:34:16]

Done (for string as well).

+          p++;
+        }
+      }
+      return object;
+      break;
+    }
     default:
       // Everything else not supported.
       return NULL;
   }
 }
 
 
 Dart_CObject* ApiMessageReader::ReadIndexedObject(intptr_t object_id) {
   if (object_id == Object::kNullObject) {
     return AllocateDartCObjectNull();
   } else if (object_id == ObjectStore::kTrueValue) {
     return AllocateDartCObjectBool(true);
   } else if (object_id == ObjectStore::kFalseValue) {
     return AllocateDartCObjectBool(false);
   } else if (object_id == ObjectStore::kDynamicType ||
              object_id == ObjectStore::kDoubleInterface ||
              object_id == ObjectStore::kIntInterface ||
              object_id == ObjectStore::kBoolInterface ||
-             object_id == ObjectStore::kStringInterface) {
+             object_id == ObjectStore::kStringInterface ||
+             object_id == ObjectStore::kByteArrayInterface) {
     // Always return dynamic type (this is only a marker).
     return &dynamic_type_marker;
   } else {
     intptr_t index = object_id - kMaxPredefinedObjectIds;
     ASSERT(index < backward_references_.length());
     ASSERT(backward_references_[index] != NULL);
     return backward_references_[index];
   }
   return NULL;
 }
@@ skipping 21 matching lines @@
   return ReadObjectImpl(value);
 }
 
 
 void ApiMessageReader::AddBackwardReference(intptr_t id, Dart_CObject* obj) {
   ASSERT((id - kMaxPredefinedObjectIds) == backward_references_.length());
   backward_references_.Add(obj);
 }
 
 }  // namespace dart