- Change the layout of external typed array objects to avoid the extra indirection when accessing e…

runtime/lib/byte_array.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/bootstrap_natives.h"
 
+#include "include/dart_api.h"
+
 #include "vm/bigint_operations.h"
 #include "vm/exceptions.h"
 #include "vm/native_entry.h"
 #include "vm/object.h"
 
 namespace dart {
 
 // ByteArray
 
 // Checks to see if (index * num_bytes) is in the range
@@ skipping 268 matching lines @@
     args.SetAt(0, error);
     Exceptions::ThrowByType(Exceptions::kArgument, args);
   }
   RangeCheck(src, src_start_value, length_value);
   RangeCheck(dst, dst_start_value, length_value);
   ByteArray::Copy(dst, dst_start_value, src, src_start_value, length_value);
   return Object::null();
 }
 
 
+static void PeerFinalizer(Dart_Handle handle, void* peer) {
+  Dart_DeletePersistentHandle(handle);
+  OS::AlignedFree(peer);
+}
+
+
 // Int8Array
 
 DEFINE_NATIVE_ENTRY(Int8Array_new, 1) {
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, length, arguments->NativeArgAt(0));
   intptr_t len = length.Value();
   LengthCheck(len, Int8Array::kMaxElements);
   return Int8Array::New(len);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int8List_newTransferable, 1) {
+  const int kAlignment = 16;
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, length, arguments->NativeArgAt(0));
   intptr_t len = length.Value();
   LengthCheck(len, Int8Array::kMaxElements);
-  int8_t* bytes = OS::AllocateAlignedArray<int8_t>(
-      len,
-      ExternalByteArrayData<int8_t>::kAlignment);
-  return ExternalInt8Array::New(bytes,
-                                len,
-                                bytes,
-                                OS::AlignedFree);
+  int8_t* bytes = OS::AllocateAlignedArray<int8_t>(len, kAlignment);
+  const ExternalInt8Array& obj =
+      ExternalInt8Array::Handle(ExternalInt8Array::New(bytes, len));
+  obj.AddFinalizer(bytes, PeerFinalizer);
+  return obj.raw();
 }
 
 
 DEFINE_NATIVE_ENTRY(Int8Array_getIndexed, 2) {
   GETTER(Int8Array, Smi, int8_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int8Array_setIndexed, 3) {
   SETTER(Int8Array, Smi, Value, int8_t);
 }
 
 
 // Uint8Array
 
 DEFINE_NATIVE_ENTRY(Uint8Array_new, 1) {
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, length, arguments->NativeArgAt(0));
   intptr_t len = length.Value();
   LengthCheck(len, Uint8Array::kMaxElements);
   return Uint8Array::New(len);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint8List_newTransferable, 1) {
+  const int kAlignment = 16;
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, length, arguments->NativeArgAt(0));
   intptr_t len = length.Value();
   LengthCheck(len, Uint8Array::kMaxElements);
-  uint8_t* bytes = OS::AllocateAlignedArray<uint8_t>(
-      len,
-      ExternalByteArrayData<uint8_t>::kAlignment);
-  return ExternalUint8Array::New(bytes,
-                                 len,
-                                 bytes,
-                                 OS::AlignedFree);
+  uint8_t* bytes = OS::AllocateAlignedArray<uint8_t>(len, kAlignment);
+  const ExternalUint8Array& obj =
+      ExternalUint8Array::Handle(ExternalUint8Array::New(bytes, len));
+  obj.AddFinalizer(bytes, PeerFinalizer);
+  return obj.raw();
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint8Array_getIndexed, 2) {
   GETTER(Uint8Array, Smi, uint8_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint8Array_setIndexed, 3) {
   SETTER(Uint8Array, Smi, Value, uint8_t);
 }
 
 
 // Uint8ClampedArray
 
 DEFINE_NATIVE_ENTRY(Uint8ClampedArray_new, 1) {
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, length, arguments->NativeArgAt(0));
   intptr_t len = length.Value();
   LengthCheck(len, Uint8ClampedArray::kMaxElements);
   return Uint8ClampedArray::New(len);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint8ClampedList_newTransferable, 1) {
+  const int kAlignment = 16;
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, length, arguments->NativeArgAt(0));
   intptr_t len = length.Value();
   LengthCheck(len, Uint8ClampedArray::kMaxElements);
-  uint8_t* bytes = OS::AllocateAlignedArray<uint8_t>(
-      len,
-      ExternalByteArrayData<uint8_t>::kAlignment);
-  return ExternalUint8ClampedArray::New(bytes,
-                                        len,
-                                        bytes,
-                                        OS::AlignedFree);
+  uint8_t* bytes = OS::AllocateAlignedArray<uint8_t>(len, kAlignment);
+  const ExternalUint8ClampedArray& obj = ExternalUint8ClampedArray::Handle(
+      ExternalUint8ClampedArray::New(bytes, len));
+  obj.AddFinalizer(bytes, PeerFinalizer);
+  return obj.raw();
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint8ClampedArray_getIndexed, 2) {
   GETTER(Uint8ClampedArray, Smi, uint8_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint8ClampedArray_setIndexed, 3) {
   SETTER(Uint8ClampedArray, Smi, Value, uint8_t);
 }
 
 
 // Int16Array
 
 DEFINE_NATIVE_ENTRY(Int16Array_new, 1) {
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, length, arguments->NativeArgAt(0));
   intptr_t len = length.Value();
   LengthCheck(len, Int16Array::kMaxElements);
   return Int16Array::New(len);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int16List_newTransferable, 1) {
+  const int kAlignment = 16;
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, length, arguments->NativeArgAt(0));
   intptr_t len = length.Value();
   LengthCheck(len, Int16Array::kMaxElements);
-  int16_t* bytes = OS::AllocateAlignedArray<int16_t>(
-      len,
-      ExternalByteArrayData<int16_t>::kAlignment);
-  return ExternalInt16Array::New(bytes,
-                                 len,
-                                 bytes,
-                                 OS::AlignedFree);
+  int16_t* bytes = OS::AllocateAlignedArray<int16_t>(len, kAlignment);
+  const ExternalInt16Array& obj =
+      ExternalInt16Array::Handle(ExternalInt16Array::New(bytes, len));
+  obj.AddFinalizer(bytes, PeerFinalizer);
+  return obj.raw();
 }
 
 
 DEFINE_NATIVE_ENTRY(Int16Array_getIndexed, 2) {
   GETTER(Int16Array, Smi, int16_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int16Array_setIndexed, 3) {
   SETTER(Int16Array, Smi, Value, int16_t);
 }
 
 
 // Uint16Array
 
 DEFINE_NATIVE_ENTRY(Uint16Array_new, 1) {
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, length, arguments->NativeArgAt(0));
   intptr_t len = length.Value();
   LengthCheck(len, Uint16Array::kMaxElements);
   return Uint16Array::New(len);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint16List_newTransferable, 1) {
+  const int kAlignment = 16;
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, length, arguments->NativeArgAt(0));
   intptr_t len = length.Value();
   LengthCheck(len, Uint16Array::kMaxElements);
-  uint16_t* bytes = OS::AllocateAlignedArray<uint16_t>(
-      len,
-      ExternalByteArrayData<uint16_t>::kAlignment);
-  return ExternalUint16Array::New(bytes,
-                                  len,
-                                  bytes,
-                                  OS::AlignedFree);
+  uint16_t* bytes = OS::AllocateAlignedArray<uint16_t>(len, kAlignment);
+  const ExternalUint16Array& obj =
+      ExternalUint16Array::Handle(ExternalUint16Array::New(bytes, len));
+  obj.AddFinalizer(bytes, PeerFinalizer);
+  return obj.raw();
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint16Array_getIndexed, 2) {
   GETTER(Uint16Array, Smi, uint16_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint16Array_setIndexed, 3) {
   SETTER(Uint16Array, Smi, Value, uint16_t);
 }
 
 
 // Int32Array
 
 DEFINE_NATIVE_ENTRY(Int32Array_new, 1) {
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, length, arguments->NativeArgAt(0));
   intptr_t len = length.Value();
   LengthCheck(len, Int32Array::kMaxElements);
   return Int32Array::New(len);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int32List_newTransferable, 1) {
+  const int kAlignment = 16;
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, length, arguments->NativeArgAt(0));
   intptr_t len = length.Value();
   LengthCheck(len, Int32Array::kMaxElements);
-  int32_t* bytes = OS::AllocateAlignedArray<int32_t>(
-      len,
-      ExternalByteArrayData<int32_t>::kAlignment);
-  return ExternalInt32Array::New(bytes,
-                                 len,
-                                 bytes,
-                                 OS::AlignedFree);
+  int32_t* bytes = OS::AllocateAlignedArray<int32_t>(len, kAlignment);
+  const ExternalInt32Array& obj =
+      ExternalInt32Array::Handle(ExternalInt32Array::New(bytes, len));
+  obj.AddFinalizer(bytes, PeerFinalizer);
+  return obj.raw();
 }
 
 
 DEFINE_NATIVE_ENTRY(Int32Array_getIndexed, 2) {
   GETTER(Int32Array, Integer, int32_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int32Array_setIndexed, 3) {
   SETTER(Int32Array, Integer, AsInt64Value, int32_t);
 }
 
 
 // Uint32Array
 
 DEFINE_NATIVE_ENTRY(Uint32Array_new, 1) {
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, length, arguments->NativeArgAt(0));
   intptr_t len = length.Value();
   LengthCheck(len, Uint32Array::kMaxElements);
   return Uint32Array::New(len);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint32List_newTransferable, 1) {
+  const int kAlignment = 16;
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, length, arguments->NativeArgAt(0));
   intptr_t len = length.Value();
   LengthCheck(len, Uint32Array::kMaxElements);
-  uint32_t* bytes = OS::AllocateAlignedArray<uint32_t>(
-      len,
-      ExternalByteArrayData<uint32_t>::kAlignment);
-  return ExternalUint32Array::New(bytes,
-                                  len,
-                                  bytes,
-                                  OS::AlignedFree);
+  uint32_t* bytes = OS::AllocateAlignedArray<uint32_t>(len, kAlignment);
+  const ExternalUint32Array& obj =
+      ExternalUint32Array::Handle(ExternalUint32Array::New(bytes, len));
+  obj.AddFinalizer(bytes, PeerFinalizer);
+  return obj.raw();
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint32Array_getIndexed, 2) {
   GETTER(Uint32Array, Integer, uint32_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint32Array_setIndexed, 3) {
   SETTER(Uint32Array, Integer, AsInt64Value, uint32_t);
 }
 
 
 // Int64Array
 
 DEFINE_NATIVE_ENTRY(Int64Array_new, 1) {
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, length, arguments->NativeArgAt(0));
   intptr_t len = length.Value();
   LengthCheck(len, Int64Array::kMaxElements);
   return Int64Array::New(len);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int64List_newTransferable, 1) {
+  const int kAlignment = 16;
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, length, arguments->NativeArgAt(0));
   intptr_t len = length.Value();
   LengthCheck(len, Int64Array::kMaxElements);
-  int64_t* bytes = OS::AllocateAlignedArray<int64_t>(
-      len,
-      ExternalByteArrayData<int64_t>::kAlignment);
-  return ExternalInt64Array::New(bytes,
-                                 len,
-                                 bytes,
-                                 OS::AlignedFree);
+  int64_t* bytes = OS::AllocateAlignedArray<int64_t>(len, kAlignment);
+  const ExternalInt64Array& obj =
+      ExternalInt64Array::Handle(ExternalInt64Array::New(bytes, len));
+  obj.AddFinalizer(bytes, PeerFinalizer);
+  return obj.raw();
 }
 
 
 DEFINE_NATIVE_ENTRY(Int64Array_getIndexed, 2) {
   GETTER(Int64Array, Integer, int64_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(Int64Array_setIndexed, 3) {
   SETTER(Int64Array, Integer, AsInt64Value, int64_t);
 }
 
 
 // Uint64Array
 
 DEFINE_NATIVE_ENTRY(Uint64Array_new, 1) {
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, length, arguments->NativeArgAt(0));
   intptr_t len = length.Value();
   LengthCheck(len, Uint64Array::kMaxElements);
   return Uint64Array::New(len);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint64List_newTransferable, 1) {
+  const int kAlignment = 16;
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, length, arguments->NativeArgAt(0));
   intptr_t len = length.Value();
   LengthCheck(len, Uint64Array::kMaxElements);
-  uint64_t* bytes = OS::AllocateAlignedArray<uint64_t>(
-      len,
-      ExternalByteArrayData<uint64_t>::kAlignment);
-  return ExternalUint64Array::New(bytes,
-                                  len,
-                                  bytes,
-                                  OS::AlignedFree);
+  uint64_t* bytes = OS::AllocateAlignedArray<uint64_t>(len, kAlignment);
+  const ExternalUint64Array& obj =
+      ExternalUint64Array::Handle(ExternalUint64Array::New(bytes, len));
+  obj.AddFinalizer(bytes, PeerFinalizer);
+  return obj.raw();
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint64Array_getIndexed, 2) {
   GETTER_UINT64(Uint64Array);
 }
 
 
 DEFINE_NATIVE_ENTRY(Uint64Array_setIndexed, 3) {
   SETTER_UINT64(Uint64Array);
 }
 
 
 // Float32Array
 
 DEFINE_NATIVE_ENTRY(Float32Array_new, 1) {
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, length, arguments->NativeArgAt(0));
   intptr_t len = length.Value();
   LengthCheck(len, Float32Array::kMaxElements);
   return Float32Array::New(len);
 }
 
 
 DEFINE_NATIVE_ENTRY(Float32List_newTransferable, 1) {
+  const int kAlignment = 16;
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, length, arguments->NativeArgAt(0));
   intptr_t len = length.Value();
   LengthCheck(len, Float32Array::kMaxElements);
-  float* bytes = OS::AllocateAlignedArray<float>(
-      len,
-      ExternalByteArrayData<float>::kAlignment);
-  return ExternalFloat32Array::New(bytes,
-                                   len,
-                                   bytes,
-                                   OS::AlignedFree);
+  float* bytes = OS::AllocateAlignedArray<float>(len, kAlignment);
+  const ExternalFloat32Array& obj =
+      ExternalFloat32Array::Handle(ExternalFloat32Array::New(bytes, len));
+  obj.AddFinalizer(bytes, PeerFinalizer);
+  return obj.raw();
 }
 
 
 DEFINE_NATIVE_ENTRY(Float32Array_getIndexed, 2) {
   GETTER(Float32Array, Double, float);
 }
 
 
 DEFINE_NATIVE_ENTRY(Float32Array_setIndexed, 3) {
   SETTER(Float32Array, Double, value, float);
 }
 
 
 // Float64Array
 
 DEFINE_NATIVE_ENTRY(Float64Array_new, 1) {
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, length, arguments->NativeArgAt(0));
   intptr_t len = length.Value();
   LengthCheck(len, Float64Array::kMaxElements);
   return Float64Array::New(len);
 }
 
 
 DEFINE_NATIVE_ENTRY(Float64List_newTransferable, 1) {
+  const int kAlignment = 16;
   GET_NON_NULL_NATIVE_ARGUMENT(Smi, length, arguments->NativeArgAt(0));
   intptr_t len = length.Value();
   LengthCheck(len, Float64Array::kMaxElements);
-  double* bytes = OS::AllocateAlignedArray<double>(
-      len,
-      ExternalByteArrayData<double>::kAlignment);
-  return ExternalFloat64Array::New(bytes,
-                                   len,
-                                   bytes,
-                                   OS::AlignedFree);
+  double* bytes = OS::AllocateAlignedArray<double>(len, kAlignment);
+  const ExternalFloat64Array& obj =
+      ExternalFloat64Array::Handle(ExternalFloat64Array::New(bytes, len));
+  obj.AddFinalizer(bytes, PeerFinalizer);
+  return obj.raw();
 }
 
 
 DEFINE_NATIVE_ENTRY(Float64Array_getIndexed, 2) {
   GETTER(Float64Array, Double, double);
 }
 
 
 DEFINE_NATIVE_ENTRY(Float64Array_setIndexed, 3) {
   SETTER(Float64Array, Double, value, double);
@@ skipping 125 matching lines @@
 DEFINE_NATIVE_ENTRY(ExternalFloat64Array_getIndexed, 2) {
   GETTER(ExternalFloat64Array, Double, double);
 }
 
 
 DEFINE_NATIVE_ENTRY(ExternalFloat64Array_setIndexed, 3) {
   SETTER(ExternalFloat64Array, Double, value, double);
 }
 
 }  // namespace dart