Add support for more typed data types on native ports

runtime/bin/dartutils.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 BIN_DARTUTILS_H_
 #define BIN_DARTUTILS_H_
 
 #include "bin/builtin.h"
 #include "bin/utils.h"
 #include "include/dart_api.h"
@@ skipping 187 matching lines @@
 
   DISALLOW_ALLOCATION();
   DISALLOW_IMPLICIT_CONSTRUCTORS(DartUtils);
 };
 
 
 class CObject {
  public:
   explicit CObject(Dart_CObject *cobject) : cobject_(cobject) {}
   Dart_CObject::Type type() { return cobject_->type; }
+  Dart_CObject::TypedDataType byte_array_type() {

[siva, 2013/04/15 23:28:45]

for consistency should we name this typed_data_type() as well?

+    ASSERT(type() == Dart_CObject::kTypedData);
+    return cobject_->value.as_typed_data.type;
+  }
 
   bool IsNull() { return type() == Dart_CObject::kNull; }
   bool IsBool() { return type() == Dart_CObject::kBool; }
   bool IsInt32() { return type() == Dart_CObject::kInt32; }
   bool IsInt64() { return type() == Dart_CObject::kInt64; }
   bool IsInt32OrInt64() { return IsInt32() || IsInt64(); }
   bool IsIntptr() { return IsInt32OrInt64(); }
   bool IsBigint() { return type() == Dart_CObject::kBigint; }
   bool IsDouble() { return type() == Dart_CObject::kDouble; }
   bool IsString() { return type() == Dart_CObject::kString; }
   bool IsArray() { return type() == Dart_CObject::kArray; }
-  bool IsUint8Array() { return type() == Dart_CObject::kUint8Array; }
+  bool IsTypedData() { return type() == Dart_CObject::kTypedData; }
+  bool IsUint8Array() {
+    return type() == Dart_CObject::kTypedData &&
+           byte_array_type() == Dart_CObject::kUint8Array;
+  }
 
   bool IsTrue() {
     return type() == Dart_CObject::kBool && cobject_->value.as_bool;
   }
 
   bool IsFalse() {
     return type() == Dart_CObject::kBool && !cobject_->value.as_bool;
   }
 
   void* operator new(size_t size) {
@@ skipping 51 matching lines @@
 
 #define DECLARE_COBJECT_CONSTRUCTORS(t)                                        \
   explicit CObject##t(Dart_CObject *cobject) : CObject(cobject) {              \
     ASSERT(type() == Dart_CObject::k##t);                                      \
     cobject_ = cobject;                                                        \
   }                                                                            \
   explicit CObject##t(CObject* cobject) : CObject() {                          \
     ASSERT(cobject != NULL);                                                   \
     ASSERT(cobject->type() == Dart_CObject::k##t);                             \
     cobject_ = cobject->AsApiCObject();                                        \
-  }
+  }                                                                            \
+
+
+#define DECLARE_COBJECT_TYPED_DATA_CONSTRUCTORS(t)                             \
+  explicit CObject##t(Dart_CObject *cobject) : CObject(cobject) {              \
+    ASSERT(type() == Dart_CObject::kTypedData);                                \
+    ASSERT(byte_array_type() == Dart_CObject::k##t);                           \
+    cobject_ = cobject;                                                        \
+  }                                                                            \
+  explicit CObject##t(CObject* cobject) : CObject() {                          \
+    ASSERT(cobject != NULL);                                                   \
+    ASSERT(cobject->type() == Dart_CObject::kTypedData);                       \
+    ASSERT(cobject->byte_array_type() == Dart_CObject::k##t);                  \
+    cobject_ = cobject->AsApiCObject();                                        \
+  }                                                                            \
+
+
+#define DECLARE_COBJECT_EXTERNAL_TYPED_DATA_CONSTRUCTORS(t)                    \
+  explicit CObjectExternal##t(Dart_CObject *cobject) : CObject(cobject) {      \
+    ASSERT(type() == Dart_CObject::kExternalTypedData);                        \
+    ASSERT(byte_array_type() == Dart_CObject::k##t);                           \
+    cobject_ = cobject;                                                        \
+  }                                                                            \
+  explicit CObjectExternal##t(CObject* cobject) : CObject() {                  \
+    ASSERT(cobject != NULL);                                                   \
+    ASSERT(cobject->type() == Dart_CObject::kExternalTypedData);               \
+    ASSERT(cobject->byte_array_type() == Dart_CObject::k##t);                  \
+    cobject_ = cobject->AsApiCObject();                                        \
+  }                                                                            \
 
 
 class CObjectBool : public CObject {
  public:
   DECLARE_COBJECT_CONSTRUCTORS(Bool)
 
   bool Value() const { return cobject_->value.as_bool; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CObjectBool);
@@ skipping 95 matching lines @@
   }
   void SetAt(int index, CObject* value) {
     cobject_->value.as_array.values[index] = value->AsApiCObject();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CObjectArray);
 };
 
 
+class CObjectTypedData : public CObject {
+ public:
+  explicit CObjectTypedData(Dart_CObject *cobject) : CObject(cobject) {
+    ASSERT(type() == Dart_CObject::kTypedData);
+    cobject_ = cobject;
+  }
+  explicit CObjectTypedData(CObject* cobject) : CObject() {
+    ASSERT(cobject != NULL);
+    ASSERT(cobject->type() == Dart_CObject::kTypedData);
+    cobject_ = cobject->AsApiCObject();
+  }
+
+  Dart_CObject::TypedDataType Type() const {
+    return cobject_->value.as_typed_data.type;
+  }
+  int Length() const { return cobject_->value.as_typed_data.length; }
+  uint8_t* Buffer() const { return cobject_->value.as_typed_data.values; }

[siva, 2013/04/15 23:28:45]

probably need accessors:

Peer
Callback

etc. for the external typed data cases.

+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(CObjectTypedData);
+};
+
+
 class CObjectUint8Array : public CObject {
  public:
-  DECLARE_COBJECT_CONSTRUCTORS(Uint8Array)
+  DECLARE_COBJECT_TYPED_DATA_CONSTRUCTORS(Uint8Array)
 
-  int Length() const { return cobject_->value.as_byte_array.length; }
-  uint8_t* Buffer() const { return cobject_->value.as_byte_array.values; }
+  int Length() const { return cobject_->value.as_typed_data.length; }
+  uint8_t* Buffer() const { return cobject_->value.as_typed_data.values; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CObjectUint8Array);
 };

[siva, 2013/04/15 23:28:45]

Is this class CObjectUint8Array still needed I could not find any references to
it in the code.

 
 
 class CObjectExternalUint8Array : public CObject {
  public:
-  DECLARE_COBJECT_CONSTRUCTORS(ExternalUint8Array)
+  DECLARE_COBJECT_EXTERNAL_TYPED_DATA_CONSTRUCTORS(Uint8Array)
 
-  int Length() const { return cobject_->value.as_external_byte_array.length; }
+  int Length() const { return cobject_->value.as_external_typed_data.length; }
   void SetLength(uint64_t length) {
-    cobject_->value.as_external_byte_array.length = length;
+    cobject_->value.as_external_typed_data.length = length;
   }
-  uint8_t* Data() const { return cobject_->value.as_external_byte_array.data; }
-  void* Peer() const { return cobject_->value.as_external_byte_array.peer; }
+  uint8_t* Data() const { return cobject_->value.as_external_typed_data.data; }
+  void* Peer() const { return cobject_->value.as_external_typed_data.peer; }
   Dart_WeakPersistentHandleFinalizer Callback() const {
-    return cobject_->value.as_external_byte_array.callback;
+    return cobject_->value.as_external_typed_data.callback;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CObjectExternalUint8Array);
 };

[siva, 2013/04/15 23:28:45]

Can the code in file.cc that creates objects of ths class
(CObjectExternalUint8Array) be made to create CobjectTypedData objects. Then we
could get rid of this class too.

 
 #endif  // BIN_DARTUTILS_H_