Revert "Implement {Int,Uint}{8,16,32,64} and Float{32,64} typed arrays."

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 48 matching lines @@
       V(TwoByteString)                                                         \
       V(FourByteString)                                                        \
       V(ExternalOneByteString)                                                 \
       V(ExternalTwoByteString)                                                 \
       V(ExternalFourByteString)                                                \
     V(Bool)                                                                    \
     V(Array)                                                                   \
       V(ImmutableArray)                                                        \
     V(GrowableObjectArray)                                                     \
     V(ByteArray)                                                               \
-      V(Int8Array)                                                             \
-      V(Uint8Array)                                                            \
-      V(Int16Array)                                                            \
-      V(Uint16Array)                                                           \
-      V(Int32Array)                                                            \
-      V(Uint32Array)                                                           \
-      V(Int64Array)                                                            \
-      V(Uint64Array)                                                           \
-      V(Float32Array)                                                          \
-      V(Float64Array)                                                          \
-      V(ExternalInt8Array)                                                     \
-      V(ExternalUint8Array)                                                    \
-      V(ExternalInt16Array)                                                    \
-      V(ExternalUint16Array)                                                   \
-      V(ExternalInt32Array)                                                    \
-      V(ExternalUint32Array)                                                   \
-      V(ExternalInt64Array)                                                    \
-      V(ExternalUint64Array)                                                   \
-      V(ExternalFloat32Array)                                                  \
-      V(ExternalFloat64Array)                                                  \
+      V(InternalByteArray)                                                     \
+      V(ExternalByteArray)                                                     \
     V(Closure)                                                                 \
     V(Stacktrace)                                                              \
     V(JSRegExp)                                                                \
 
 #define CLASS_LIST(V)                                                          \
   V(Object)                                                                    \
   CLASS_LIST_NO_OBJECT(V)
 
 
 // Forward declarations.
@@ skipping 1025 matching lines @@
 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);
+class RawInternalByteArray : public RawByteArray {
+  RAW_HEAP_OBJECT_IMPLEMENTATION(InternalByteArray);
 
   // Variable length data follows here.
-  int8_t data_[0];
+  uint8_t* data() {
+    uword address_of_length = reinterpret_cast<uword>(&length_);
+    return reinterpret_cast<uint8_t*>(address_of_length + kWordSize);
+  }
 };
 
 
-class RawUint8Array: public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(Uint8Array);
-
-  // 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];
-};
-
-
-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];
-};
-
-
-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];
-};
-
-
-template<typename T>
 class ExternalByteArrayData {
  public:
-  ExternalByteArrayData(T* data,
+  ExternalByteArrayData(uint8_t* data,
                         void* peer,
                         Dart_PeerFinalizer callback) :
       data_(data), peer_(peer), callback_(callback) {
   }
   ~ExternalByteArrayData() {
     if (callback_ != NULL) (*callback_)(peer_);
   }
 
-  T* data() {
+  uint8_t* data() {
     return data_;
   }
   void* peer() {
     return peer_;
   }
 
  private:
-  T* data_;
+  uint8_t* data_;
   void* peer_;
   Dart_PeerFinalizer callback_;
 };
 
 
-class RawExternalInt8Array: public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalInt8Array);
+class RawExternalByteArray : public RawByteArray {
+  RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalByteArray);
 
-  ExternalByteArrayData<int8_t>* external_data_;
+  ExternalByteArrayData* external_data_;
 };
 
 
-class RawExternalUint8Array: public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalUint8Array);
-
-  ExternalByteArrayData<uint8_t>* external_data_;
-};
-
-
-class RawExternalInt16Array: public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalInt16Array);
-
-  ExternalByteArrayData<int16_t>* external_data_;
-};
-
-
-class RawExternalUint16Array: public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalUint16Array);
-
-  ExternalByteArrayData<uint16_t>* external_data_;
-};
-
-
-class RawExternalInt32Array: public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalInt32Array);
-
-  ExternalByteArrayData<int32_t>* external_data_;
-};
-
-
-class RawExternalUint32Array: public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalUint32Array);
-
-  ExternalByteArrayData<uint32_t>* external_data_;
-};
-
-
-class RawExternalInt64Array: public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalInt64Array);
-
-  ExternalByteArrayData<int64_t>* external_data_;
-};
-
-
-class RawExternalUint64Array: public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalUint64Array);
-
-  ExternalByteArrayData<uint64_t>* external_data_;
-};
-
-
-class RawExternalFloat32Array: public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalFloat32Array);
-
-  ExternalByteArrayData<float>* external_data_;
-};
-
-
-class RawExternalFloat64Array: public RawByteArray {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalFloat64Array);
-
-  ExternalByteArrayData<double>* external_data_;
-};
-
-
 class RawClosure : public RawInstance {
   RAW_HEAP_OBJECT_IMPLEMENTATION(Closure);
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->type_arguments_);
   }
   RawAbstractTypeArguments* type_arguments_;
   RawFunction* function_;
   RawContext* context_;
   // TODO(iposva): Remove this temporary hack.
@@ skipping 38 matching lines @@
   intptr_t type_;  // Uninitialized, simple or complex.
   intptr_t flags_;  // Represents global/local, case insensitive, multiline.
 
   // Variable length data follows here.
   uint8_t data_[0];
 };
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_