Remove support for 'dart:scalarlist' in the Dart VM.

runtime/vm/raw_object.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 VM_RAW_OBJECT_H_
 #define VM_RAW_OBJECT_H_
 
 #include "platform/assert.h"
 #include "vm/globals.h"
 #include "vm/token.h"
@@ skipping 45 matching lines @@
     V(Number)                                                                  \
       V(Integer)                                                               \
         V(Smi)                                                                 \
         V(Mint)                                                                \
         V(Bigint)                                                              \
       V(Double)                                                                \
     V(Bool)                                                                    \
     V(Array)                                                                   \
       V(ImmutableArray)                                                        \
     V(GrowableObjectArray)                                                     \
-    V(ByteArray)                                                               \
-      V(Int8Array)                                                             \
-      V(Uint8Array)                                                            \
-      V(Uint8ClampedArray)                                                     \
-      V(Int16Array)                                                            \
-      V(Uint16Array)                                                           \
-      V(Int32Array)                                                            \
-      V(Uint32Array)                                                           \
-      V(Int64Array)                                                            \
-      V(Uint64Array)                                                           \
-      V(Float32Array)                                                          \
-      V(Float64Array)                                                          \
-      V(ExternalInt8Array)                                                     \
-      V(ExternalUint8Array)                                                    \
-      V(ExternalUint8ClampedArray)                                             \
-      V(ExternalInt16Array)                                                    \
-      V(ExternalUint16Array)                                                   \
-      V(ExternalInt32Array)                                                    \
-      V(ExternalUint32Array)                                                   \
-      V(ExternalInt64Array)                                                    \
-      V(ExternalUint64Array)                                                   \
-      V(ExternalFloat32Array)                                                  \
-      V(ExternalFloat64Array)                                                  \
     V(TypedData)                                                               \
     V(ExternalTypedData)                                                       \
     V(Stacktrace)                                                              \
     V(JSRegExp)                                                                \
     V(WeakProperty)                                                            \
     V(DartFunction)                                                            \
     V(Float32x4)                                                               \
     V(Uint32x4)                                                                \
 
 
@@ skipping 288 matching lines @@
 
   // Class Id predicates.
   static bool IsErrorClassId(intptr_t index);
   static bool IsNumberClassId(intptr_t index);
   static bool IsIntegerClassId(intptr_t index);
   static bool IsStringClassId(intptr_t index);
   static bool IsOneByteStringClassId(intptr_t index);
   static bool IsTwoByteStringClassId(intptr_t index);
   static bool IsExternalStringClassId(intptr_t index);
   static bool IsBuiltinListClassId(intptr_t index);
-  static bool IsByteArrayClassId(intptr_t index);
-  static bool IsExternalByteArrayClassId(intptr_t index);
   static bool IsTypedDataClassId(intptr_t index);
   static bool IsTypedDataViewClassId(intptr_t index);
   static bool IsExternalTypedDataClassId(intptr_t index);
 
   static intptr_t NumberOfTypedDataClasses();
 
  private:
   uword tags_;  // Various object tags (bits).
 
   class FreeBit : public BitField<bool, kFreeBit, 1> {};
@@ skipping 1003 matching lines @@
  public:
   uint32_t x() const { return value_[0]; }
   uint32_t y() const { return value_[1]; }
   uint32_t z() const { return value_[2]; }
   uint32_t w() const { return value_[3]; }
 };
 
 
 // Define an aliases for intptr_t.
 #if defined(ARCH_IS_32_BIT)
-#define RawIntPtrArray RawInt32Array
-#define IntPtrArray Int32Array
+#define kIntPtrCid kTypedDataInt32ArrayCid
+#define SetIntPtr SetInt32
 #elif defined(ARCH_IS_64_BIT)
-#define RawIntPtrArray RawInt64Array
-#define IntPtrArray Int64Array
+#define kIntPtrCid kTypedDataInt64ArrayCid
+#define SetIntPtr SetInt64
 #else
 #error Architecture is not 32-bit or 64-bit.
 #endif  // ARCH_IS_32_BIT
 
 
 class RawTypedData : public RawInstance {
   RAW_HEAP_OBJECT_IMPLEMENTATION(TypedData);
 
  protected:
   RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->length_); }
   RawSmi* length_;
   RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->length_); }
 
   // Variable length data follows here.
   uint8_t data_[0];
 
   friend class Object;
+  friend class Instance;
 };
 
 
 class RawExternalTypedData : public RawInstance {
   RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalTypedData);
 
  protected:
   RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->length_); }
   RawSmi* length_;
   RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->length_); }
 
   uint8_t* data_;
   void* peer_;
 
   friend class TokenStream;
   friend class RawTokenStream;
 };
 
 
-class RawByteArray : public RawInstance {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ByteArray);
-
- protected:
-  RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->length_); }
-  RawSmi* length_;
-  RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->length_); }
-};
-
-
-class RawInt8Array : public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(Int8Array);
-
-  // Variable length data follows here.
-  int8_t data_[0];
-};
-
-
-class RawUint8Array : public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(Uint8Array);
-
-  // Variable length data follows here.
-  uint8_t data_[0];
-};
-
-
-class RawUint8ClampedArray : public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(Uint8ClampedArray);
-
-  // Variable length data follows here.
-  uint8_t data_[0];
-};
-
-
-class RawInt16Array : public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(Int16Array);
-
-  // Variable length data follows here.
-  int16_t data_[0];
-};
-
-
-class RawUint16Array : public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(Uint16Array);
-
-  // Variable length data follows here.
-  uint16_t data_[0];
-};
-
-
-class RawInt32Array : public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(Int32Array);
-
-  // Variable length data follows here.
-  int32_t data_[0];
-
-  friend class Instance;
-};
-
-
-class RawUint32Array : public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(Uint32Array);
-
-  // Variable length data follows here.
-  uint32_t data_[0];
-};
-
-
-class RawInt64Array : public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(Int64Array);
-
-  // Variable length data follows here.
-  int64_t data_[0];
-
-  friend class Instance;
-};
-
-
-class RawUint64Array : public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(Uint64Array);
-
-  // Variable length data follows here.
-  uint64_t data_[0];
-};
-
-
-class RawFloat32Array : public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(Float32Array);
-
-  // Variable length data follows here.
-  float data_[0];
-};
-
-
-class RawFloat64Array : public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(Float64Array);
-
-  // Variable length data follows here.
-  double data_[0];
-};
-
-
-class RawExternalInt8Array : public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalInt8Array);
-
-  int8_t* data_;
-  void* peer_;
-};
-
-
-class RawExternalUint8Array : public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalUint8Array);
-
-  uint8_t* data_;
-  void* peer_;
-
-  friend class RawExternalUint8ClampedArray;
-};
-
-
-class RawExternalUint8ClampedArray : public RawExternalUint8Array {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalUint8ClampedArray);
-};
-
-
-class RawExternalInt16Array : public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalInt16Array);
-
-  int16_t* data_;
-  void* peer_;
-};
-
-
-class RawExternalUint16Array : public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalUint16Array);
-
-  uint16_t* data_;
-  void* peer_;
-};
-
-
-class RawExternalInt32Array : public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalInt32Array);
-
-  int32_t* data_;
-  void* peer_;
-};
-
-
-class RawExternalUint32Array : public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalUint32Array);
-
-  uint32_t* data_;
-  void* peer_;
-};
-
-
-class RawExternalInt64Array : public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalInt64Array);
-
-  int64_t* data_;
-  void* peer_;
-};
-
-
-class RawExternalUint64Array : public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalUint64Array);
-
-  uint64_t* data_;
-  void* peer_;
-};
-
-
-class RawExternalFloat32Array : public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalFloat32Array);
-
-  float* data_;
-  void* peer_;
-};
-
-
-class RawExternalFloat64Array : public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalFloat64Array);
-
-  double* data_;
-  void* peer_;
-};
-
-
 class RawDartFunction : public RawInstance {
   RAW_HEAP_OBJECT_IMPLEMENTATION(DartFunction);
 };
 
 
 // VM type for capturing stacktraces when exceptions are thrown,
 // Currently we don't have any interface that this object is supposed
 // to implement so we just support the 'toString' method which
 // converts the stack trace into a string.
 class RawStacktrace : public RawInstance {
@@ skipping 130 matching lines @@
          kExternalTwoByteStringCid == kStringCid + 4);
   return (index == kExternalOneByteStringCid ||
           index == kExternalTwoByteStringCid);
 }
 
 
 inline bool RawObject::IsBuiltinListClassId(intptr_t index) {
   // Make sure this function is updated when new builtin List types are added.
   ASSERT(kImmutableArrayCid == kArrayCid + 1 &&
          kGrowableObjectArrayCid == kArrayCid + 2 &&
-         kByteArrayCid == kArrayCid + 3);
-  return (index >= kArrayCid && index < kByteArrayCid) ||
-      IsByteArrayClassId(index);
-}
-
-
-inline bool RawObject::IsByteArrayClassId(intptr_t index) {
-  // Make sure this function is updated when new ByteArray types are added.
-  ASSERT(kInt8ArrayCid == kByteArrayCid + 1 &&
-         kUint8ArrayCid == kByteArrayCid + 2 &&
-         kUint8ClampedArrayCid == kByteArrayCid + 3 &&
-         kInt16ArrayCid == kByteArrayCid + 4 &&
-         kUint16ArrayCid == kByteArrayCid + 5 &&
-         kInt32ArrayCid == kByteArrayCid + 6 &&
-         kUint32ArrayCid == kByteArrayCid + 7 &&
-         kInt64ArrayCid == kByteArrayCid + 8 &&
-         kUint64ArrayCid == kByteArrayCid + 9 &&
-         kFloat32ArrayCid == kByteArrayCid + 10 &&
-         kFloat64ArrayCid == kByteArrayCid + 11 &&
-         kExternalInt8ArrayCid == kByteArrayCid + 12 &&
-         kExternalUint8ArrayCid == kByteArrayCid + 13 &&
-         kExternalUint8ClampedArrayCid == kByteArrayCid + 14 &&
-         kExternalInt16ArrayCid == kByteArrayCid + 15 &&
-         kExternalUint16ArrayCid == kByteArrayCid + 16 &&
-         kExternalInt32ArrayCid == kByteArrayCid + 17 &&
-         kExternalUint32ArrayCid == kByteArrayCid + 18 &&
-         kExternalInt64ArrayCid == kByteArrayCid + 19 &&
-         kExternalUint64ArrayCid == kByteArrayCid + 20 &&
-         kExternalFloat32ArrayCid == kByteArrayCid + 21 &&
-         kExternalFloat64ArrayCid == kByteArrayCid + 22 &&
-         kTypedDataCid == kByteArrayCid + 23);
-  return (index >= kByteArrayCid && index <= kExternalFloat64ArrayCid);
-}
-
-
-inline bool RawObject::IsExternalByteArrayClassId(intptr_t index) {
-  // Make sure this function is updated when new ByteArray types are added.
-  ASSERT(kExternalUint8ArrayCid == kExternalInt8ArrayCid + 1 &&
-         kExternalUint8ClampedArrayCid == kExternalInt8ArrayCid + 2 &&
-         kExternalInt16ArrayCid == kExternalInt8ArrayCid + 3 &&
-         kExternalUint16ArrayCid == kExternalInt8ArrayCid + 4 &&
-         kExternalInt32ArrayCid == kExternalInt8ArrayCid + 5 &&
-         kExternalUint32ArrayCid == kExternalInt8ArrayCid + 6 &&
-         kExternalInt64ArrayCid == kExternalInt8ArrayCid + 7 &&
-         kExternalUint64ArrayCid == kExternalInt8ArrayCid + 8 &&
-         kExternalFloat32ArrayCid == kExternalInt8ArrayCid + 9 &&
-         kExternalFloat64ArrayCid == kExternalInt8ArrayCid + 10 &&
-         kTypedDataCid == kExternalInt8ArrayCid + 11);
-  return (index >= kExternalInt8ArrayCid && index <= kExternalFloat64ArrayCid);
+         kTypedDataCid == kArrayCid + 3);
+  return ((index >= kArrayCid && index < kTypedDataCid) ||
+          IsTypedDataClassId(index) ||
+          IsTypedDataViewClassId(index) ||
+          IsExternalTypedDataClassId(index));
 }
 
 
 inline bool RawObject::IsTypedDataClassId(intptr_t index) {
   // Make sure this is updated when new TypedData types are added.
   ASSERT(kTypedDataUint8ArrayCid == kTypedDataInt8ArrayCid + 1 &&
          kTypedDataUint8ClampedArrayCid == kTypedDataInt8ArrayCid + 2 &&
          kTypedDataInt16ArrayCid == kTypedDataInt8ArrayCid + 3 &&
          kTypedDataUint16ArrayCid == kTypedDataInt8ArrayCid + 4 &&
          kTypedDataInt32ArrayCid == kTypedDataInt8ArrayCid + 5 &&
@@ skipping 63 matching lines @@
   // Make sure this is updated when new TypedData types are added.
   ASSERT(kTypedDataInt8ArrayViewCid == kTypedDataInt8ArrayCid + 12);
   ASSERT(kExternalTypedDataInt8ArrayCid == kTypedDataInt8ArrayViewCid + 13);
   ASSERT(kNullCid == kExternalTypedDataInt8ArrayCid + 12);
   return (kNullCid - kTypedDataInt8ArrayCid);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_