Fix native lookup.

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 "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
 // [0..array.ByteLength()).  without the risk of integer overflow.  If
 // the index is out of range, then a RangeError is thrown.
 static void RangeCheck(const ByteArray& array,
                        intptr_t index,
                        intptr_t num_bytes) {
   if (!Utils::RangeCheck(index, num_bytes, array.ByteLength())) {
     const String& error = String::Handle(String::NewFormatted(
         "index (%"Pd") must be in the range [0..%"Pd")",
-        index, (array.ByteLength() / num_bytes)));
+        (index / num_bytes), (array.ByteLength() / num_bytes)));
     const Array& args = Array::Handle(Array::New(1));
     args.SetAt(0, error);
     Exceptions::ThrowByType(Exceptions::kRange, args);
   }
 }
 
 
 // Checks to see if a length is in the range [0..max].  If the length
 // is out of range, then an ArgumentError is thrown.
 static void LengthCheck(intptr_t len, intptr_t max) {
@@ skipping 43 matching lines @@
 
 
 #define UNALIGNED_SETTER(ArrayT, ObjectT, Getter, ValueT)                      \
   SETTER_ARGUMENTS(ArrayT, ObjectT, ValueT);                                   \
   RangeCheck(array, index.Value(), sizeof(ValueT));                            \
   ValueT src = value_object.Getter();                                          \
   ByteArray::Copy(array, index.Value(), &src, sizeof(ValueT));                 \
   return Integer::New(index.Value() + sizeof(ValueT));
 
 
+#define SCALED_UNALIGNED_GETTER(ArrayT, ObjectT, ValueT)                       \
+  GETTER_ARGUMENTS(ArrayT, ValueT);                                            \
+  RangeCheck(array, index.Value() * sizeof(ValueT), sizeof(ValueT));           \
+  ValueT result;                                                               \
+  ByteArray::Copy(&result, array,                                              \
+      index.Value() * sizeof(ValueT), sizeof(ValueT));                         \
+  return ObjectT::New(result);
+
+
+#define SCALED_UNALIGNED_SETTER(ArrayT, ObjectT, Getter, ValueT)               \
+  SETTER_ARGUMENTS(ArrayT, ObjectT, ValueT);                                   \
+  RangeCheck(array, index.Value() * sizeof(ValueT), sizeof(ValueT));           \
+  ValueT src = value_object.Getter();                                          \
+  ByteArray::Copy(array, index.Value() * sizeof(ValueT), &src, sizeof(ValueT));\
+  return Integer::New(index.Value() + sizeof(ValueT));
+
+
 #define UINT64_TO_INTEGER(value, integer)                                      \
   if (value > static_cast<uint64_t>(Mint::kMaxValue)) {                        \
     result = BigintOperations::NewFromUint64(value);                           \
   } else if (value > static_cast<uint64_t>(Smi::kMaxValue)) {                  \
     result = Mint::New(value);                                                 \
   } else {                                                                     \
     result = Smi::New(value);                                                  \
   }
 
 
@@ skipping 559 matching lines @@
 
 
 DEFINE_NATIVE_ENTRY(ExternalInt8Array_setIndexed, 3) {
   SETTER(ExternalInt8Array, Smi, Value, int8_t);
 }
 
 
 // ExternalUint8Array
 
 DEFINE_NATIVE_ENTRY(ExternalUint8Array_getIndexed, 2) {
-  UNALIGNED_GETTER(ExternalUint8Array, Smi, uint8_t);
+  SCALED_UNALIGNED_GETTER(ExternalUint8Array, Smi, uint8_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(ExternalUint8Array_setIndexed, 3) {
-  UNALIGNED_SETTER(ExternalUint8Array, Smi, Value, uint8_t);
+  SCALED_UNALIGNED_SETTER(ExternalUint8Array, Smi, Value, uint8_t);
 }
 
 
 // ExternalUint8ClampedArray
 
 DEFINE_NATIVE_ENTRY(ExternalUint8ClampedArray_getIndexed, 2) {
-  UNALIGNED_GETTER(ExternalUint8ClampedArray, Smi, uint8_t);
+  SCALED_UNALIGNED_GETTER(ExternalUint8ClampedArray, Smi, uint8_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(ExternalUint8ClampedArray_setIndexed, 3) {
-  UNALIGNED_SETTER(ExternalUint8ClampedArray, Smi, Value, uint8_t);
+  SCALED_UNALIGNED_SETTER(ExternalUint8ClampedArray, Smi, Value, uint8_t);
 }
 
 
 // ExternalInt16Array
 
 DEFINE_NATIVE_ENTRY(ExternalInt16Array_getIndexed, 2) {
   GETTER(ExternalInt16Array, Smi, int16_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(ExternalInt16Array_setIndexed, 3) {
   SETTER(ExternalInt16Array, Smi, Value, int16_t);
 }
 
 
 // ExternalUint16Array
 
 DEFINE_NATIVE_ENTRY(ExternalUint16Array_getIndexed, 2) {
-  UNALIGNED_GETTER(ExternalUint16Array, Smi, uint16_t);
+  SCALED_UNALIGNED_GETTER(ExternalUint16Array, Smi, uint16_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(ExternalUint16Array_setIndexed, 3) {
-  UNALIGNED_SETTER(ExternalUint16Array, Smi, Value, uint16_t);
+  SCALED_UNALIGNED_SETTER(ExternalUint16Array, Smi, Value, uint16_t);
 }
 
 
 // ExternalInt32Array
 
 DEFINE_NATIVE_ENTRY(ExternalInt32Array_getIndexed, 2) {
   GETTER(ExternalInt32Array, Integer, int32_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(ExternalInt32Array_setIndexed, 3) {
   SETTER(ExternalInt32Array, Integer, AsInt64Value, int32_t);
 }
 
 
 // ExternalUint32Array
 
 DEFINE_NATIVE_ENTRY(ExternalUint32Array_getIndexed, 2) {
-  UNALIGNED_GETTER(ExternalUint32Array, Integer, uint32_t);
+  SCALED_UNALIGNED_GETTER(ExternalUint32Array, Integer, uint32_t);
 }
 
 
 DEFINE_NATIVE_ENTRY(ExternalUint32Array_setIndexed, 3) {
-  UNALIGNED_SETTER(ExternalUint32Array, Integer, AsInt64Value, uint32_t);
+  SCALED_UNALIGNED_SETTER(ExternalUint32Array, Integer, AsInt64Value, uint32_t);
 }
 
 
 // ExternalInt64Array
 
 DEFINE_NATIVE_ENTRY(ExternalInt64Array_getIndexed, 2) {
   GETTER(ExternalInt64Array, Integer, int64_t);
 }
 
 
@@ skipping 31 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