Fast copy between TypedData and ExternalTypedData

runtime/vm/object.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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
@@ skipping 12592 matching lines @@
   8,   // kTypedDataFloat64ArrayCid.
   16,  // kTypedDataFloat32x4ArrayCid.
 };
 
 
 void TypedData::Copy(const TypedData& dst,
                      intptr_t dst_offset_in_bytes,
                      const TypedData& src,
                      intptr_t src_offset_in_bytes,
                      intptr_t length_in_bytes) {
-  ASSERT(Utils::RangeCheck(src_offset_in_bytes,
-                           length_in_bytes,
-                           src.LengthInBytes()));
-  ASSERT(Utils::RangeCheck(dst_offset_in_bytes,
-                           length_in_bytes,
-                           dst.LengthInBytes()));
-  {
-    NoGCScope no_gc;
-    if (length_in_bytes > 0) {
-      memmove(dst.DataAddr(dst_offset_in_bytes),
-              src.DataAddr(src_offset_in_bytes),
-              length_in_bytes);
-    }
-  }
+  TypedArrayCopyData<TypedData, TypedData>(
+      dst, dst_offset_in_bytes, src, src_offset_in_bytes, length_in_bytes);

[siva, 2013/04/19 17:38:40]

This code can be removed as it is already set up in object.h

[kustermann, 2013/04/19 19:21:54]

Done.

 }
 
 
 RawTypedData* TypedData::New(intptr_t class_id,
                              intptr_t len,
                              Heap::Space space) {
   // TODO(asiva): Add a check for maximum elements.
   TypedData& result = TypedData::Handle();
   {
     // The len field has already been checked by the caller, we only assert
@@ skipping 25 matching lines @@
   SetPeer(peer);
   return dart::AddFinalizer(*this, peer, callback);
 }
 
 
 void ExternalTypedData::Copy(const ExternalTypedData& dst,
                              intptr_t dst_offset_in_bytes,
                              const ExternalTypedData& src,
                              intptr_t src_offset_in_bytes,
                              intptr_t length_in_bytes) {
-  ASSERT(Utils::RangeCheck(src_offset_in_bytes,
-                           length_in_bytes,
-                           src.LengthInBytes()));
-  ASSERT(Utils::RangeCheck(dst_offset_in_bytes,
-                           length_in_bytes,
-                           dst.LengthInBytes()));
-  {
-    NoGCScope no_gc;
-    if (length_in_bytes > 0) {
-      memmove(dst.DataAddr(dst_offset_in_bytes),
-              src.DataAddr(src_offset_in_bytes),
-              length_in_bytes);
-    }
-  }
+  TypedArrayCopyData<ExternalTypedData, ExternalTypedData>(
+      dst, dst_offset_in_bytes, src, src_offset_in_bytes, length_in_bytes);
 }

[siva, 2013/04/19 17:38:40]

Get rid of this Copy function.

[kustermann, 2013/04/19 19:21:54]

Done.

 
 
 RawExternalTypedData* ExternalTypedData::New(intptr_t class_id,
                                              uint8_t* data,
                                              intptr_t len,
                                              Heap::Space space) {
   ExternalTypedData& result = ExternalTypedData::Handle();
   {
     RawObject* raw = Object::Allocate(class_id,
                                       ExternalTypedData::InstanceSize(),
@@ skipping 396 matching lines @@
   }
   return result.raw();
 }
 
 
 const char* WeakProperty::ToCString() const {
   return "_WeakProperty";
 }
 
 }  // namespace dart