OLD | NEW |
---|---|
1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 #include "vm/bootstrap_natives.h" | 5 #include "vm/bootstrap_natives.h" |
6 | 6 |
7 #include "include/dart_api.h" | 7 #include "include/dart_api.h" |
8 #include "vm/exceptions.h" | 8 #include "vm/exceptions.h" |
9 #include "vm/dart_api_impl.h" | 9 #include "vm/dart_api_impl.h" |
10 #include "vm/isolate.h" | 10 #include "vm/isolate.h" |
(...skipping 24 matching lines...) Expand all Loading... | |
35 String::New(Error::Cast(error).ToErrorCString()))); | 35 String::New(Error::Cast(error).ToErrorCString()))); |
36 } else if (!Dart_IsNull(result)) { | 36 } else if (!Dart_IsNull(result)) { |
37 Exceptions::ThrowArgumentError( | 37 Exceptions::ThrowArgumentError( |
38 String::Handle(String::New("Illegal environment value"))); | 38 String::Handle(String::New("Illegal environment value"))); |
39 } | 39 } |
40 } | 40 } |
41 return default_value.raw(); | 41 return default_value.raw(); |
42 } | 42 } |
43 | 43 |
44 | 44 |
45 DEFINE_NATIVE_ENTRY(StringBase_createFromCodePoints, 1) { | 45 DEFINE_NATIVE_ENTRY(StringBase_createFromCodePoints, 3) { |
46 GET_NON_NULL_NATIVE_ARGUMENT(Instance, list, arguments->NativeArgAt(0)); | 46 GET_NON_NULL_NATIVE_ARGUMENT(Instance, list, arguments->NativeArgAt(0)); |
47 GET_NON_NULL_NATIVE_ARGUMENT(Smi, start_obj, arguments->NativeArgAt(1)); | |
48 GET_NON_NULL_NATIVE_ARGUMENT(Smi, end_obj, arguments->NativeArgAt(2)); | |
49 | |
50 intptr_t start = start_obj.Value(); | |
51 intptr_t end = end_obj.Value(); | |
52 ASSERT(0 <= start); | |
53 ASSERT(start <= end); | |
floitsch
2014/08/29 11:13:20
Don't assert but check.
Lasse Reichstein Nielsen
2014/09/02 07:57:04
Done.
| |
54 | |
47 if (!list.IsGrowableObjectArray() && !list.IsArray()) { | 55 if (!list.IsGrowableObjectArray() && !list.IsArray()) { |
48 Exceptions::ThrowArgumentError(list); | 56 Exceptions::ThrowArgumentError(list); |
49 } | 57 } |
50 | 58 |
51 Array& a = Array::Handle(); | 59 Array& a = Array::Handle(); |
52 intptr_t array_len; | |
53 if (list.IsGrowableObjectArray()) { | 60 if (list.IsGrowableObjectArray()) { |
54 const GrowableObjectArray& growableArray = GrowableObjectArray::Cast(list); | 61 const GrowableObjectArray& growableArray = GrowableObjectArray::Cast(list); |
55 a ^= growableArray.data(); | 62 a ^= growableArray.data(); |
56 array_len = growableArray.Length(); | 63 ASSERT(end <= growableArray.Length()); |
floitsch
2014/08/29 11:13:20
ditto.
| |
57 } else { | 64 } else { |
58 a ^= Array::Cast(list).raw(); | 65 a ^= Array::Cast(list).raw(); |
59 array_len = a.Length(); | 66 ASSERT(end <= a.Length()); |
floitsch
2014/08/29 11:13:20
ditto.
| |
60 } | 67 } |
61 | 68 |
62 Zone* zone = isolate->current_zone(); | 69 Zone* zone = isolate->current_zone(); |
63 | 70 |
64 // Unbox the array and determine the maximum element width. | 71 // Unbox the array and determine the maximum element width. |
65 bool is_one_byte_string = true; | 72 bool is_one_byte_string = true; |
73 intptr_t array_len = end - start; | |
66 intptr_t utf16_len = array_len; | 74 intptr_t utf16_len = array_len; |
67 int32_t* utf32_array = zone->Alloc<int32_t>(array_len); | 75 int32_t* utf32_array = zone->Alloc<int32_t>(array_len); |
68 Instance& index_object = Instance::Handle(isolate); | 76 Instance& index_object = Instance::Handle(isolate); |
69 for (intptr_t i = 0; i < array_len; i++) { | 77 for (intptr_t i = 0; i < array_len; i++) { |
70 index_object ^= a.At(i); | 78 index_object ^= a.At(start + i); |
71 if (!index_object.IsSmi()) { | 79 if (!index_object.IsSmi()) { |
72 Exceptions::ThrowArgumentError(index_object); | 80 Exceptions::ThrowArgumentError(index_object); |
73 } | 81 } |
74 intptr_t value = Smi::Cast(index_object).Value(); | 82 intptr_t value = Smi::Cast(index_object).Value(); |
75 if (Utf::IsOutOfRange(value)) { | 83 if (Utf::IsOutOfRange(value)) { |
76 Exceptions::ThrowByType(Exceptions::kArgument, Object::empty_array()); | 84 Exceptions::ThrowByType(Exceptions::kArgument, Object::empty_array()); |
77 UNREACHABLE(); | 85 UNREACHABLE(); |
78 } | 86 } |
79 // Now it is safe to cast the value. | 87 // Now it is safe to cast the value. |
80 int32_t value32 = static_cast<int32_t>(value); | 88 int32_t value32 = static_cast<int32_t>(value); |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
148 return result.raw(); | 156 return result.raw(); |
149 } | 157 } |
150 | 158 |
151 | 159 |
152 DEFINE_NATIVE_ENTRY(OneByteString_allocate, 1) { | 160 DEFINE_NATIVE_ENTRY(OneByteString_allocate, 1) { |
153 GET_NON_NULL_NATIVE_ARGUMENT(Smi, length_obj, arguments->NativeArgAt(0)); | 161 GET_NON_NULL_NATIVE_ARGUMENT(Smi, length_obj, arguments->NativeArgAt(0)); |
154 return OneByteString::New(length_obj.Value(), Heap::kNew); | 162 return OneByteString::New(length_obj.Value(), Heap::kNew); |
155 } | 163 } |
156 | 164 |
157 | 165 |
158 DEFINE_NATIVE_ENTRY(OneByteString_allocateFromOneByteList, 1) { | 166 DEFINE_NATIVE_ENTRY(OneByteString_allocateFromOneByteList, 3) { |
159 Instance& list = Instance::CheckedHandle(arguments->NativeArgAt(0)); | 167 Instance& list = Instance::CheckedHandle(arguments->NativeArgAt(0)); |
168 GET_NON_NULL_NATIVE_ARGUMENT(Smi, start_obj, arguments->NativeArgAt(1)); | |
169 GET_NON_NULL_NATIVE_ARGUMENT(Smi, end_obj, arguments->NativeArgAt(2)); | |
170 | |
171 intptr_t start = start_obj.Value(); | |
172 intptr_t end = end_obj.Value(); | |
173 intptr_t length = end - start; | |
174 ASSERT(length >= 0); | |
160 if (list.IsTypedData()) { | 175 if (list.IsTypedData()) { |
161 const TypedData& array = TypedData::Cast(list); | 176 const TypedData& array = TypedData::Cast(list); |
162 intptr_t length = array.LengthInBytes(); | 177 ASSERT(length <= array.LengthInBytes()); |
floitsch
2014/08/29 11:13:20
ditto.
| |
163 return OneByteString::New(array, 0, length); | 178 return OneByteString::New(array, start, length); |
164 } else if (list.IsExternalTypedData()) { | 179 } else if (list.IsExternalTypedData()) { |
165 const ExternalTypedData& array = ExternalTypedData::Cast(list); | 180 const ExternalTypedData& array = ExternalTypedData::Cast(list); |
166 intptr_t length = array.LengthInBytes(); | 181 ASSERT(length <= array.LengthInBytes()); |
floitsch
2014/08/29 11:13:20
ditto.
| |
167 return OneByteString::New(array, 0, length); | 182 return OneByteString::New(array, start, length); |
168 } else if (RawObject::IsTypedDataViewClassId(list.GetClassId())) { | 183 } else if (RawObject::IsTypedDataViewClassId(list.GetClassId())) { |
169 const Instance& view = Instance::Cast(list); | 184 const Instance& view = Instance::Cast(list); |
170 intptr_t length = Smi::Value(TypedDataView::Length(view)); | 185 ASSERT(length <= Smi::Value(TypedDataView::Length(view))); |
floitsch
2014/08/29 11:13:20
ditto.
| |
171 const Instance& data_obj = Instance::Handle(TypedDataView::Data(view)); | 186 const Instance& data_obj = Instance::Handle(TypedDataView::Data(view)); |
172 intptr_t data_offset = Smi::Value(TypedDataView::OffsetInBytes(view)); | 187 intptr_t data_offset = Smi::Value(TypedDataView::OffsetInBytes(view)); |
173 if (data_obj.IsTypedData()) { | 188 if (data_obj.IsTypedData()) { |
174 const TypedData& array = TypedData::Cast(data_obj); | 189 const TypedData& array = TypedData::Cast(data_obj); |
175 return OneByteString::New(array, data_offset, length); | 190 return OneByteString::New(array, data_offset + start, length); |
176 } else if (data_obj.IsExternalTypedData()) { | 191 } else if (data_obj.IsExternalTypedData()) { |
177 const ExternalTypedData& array = ExternalTypedData::Cast(data_obj); | 192 const ExternalTypedData& array = ExternalTypedData::Cast(data_obj); |
178 return OneByteString::New(array, data_offset, length); | 193 return OneByteString::New(array, data_offset + start, length); |
179 } | 194 } |
180 } else if (list.IsArray()) { | 195 } else if (list.IsArray()) { |
181 const Array& array = Array::Cast(list); | 196 const Array& array = Array::Cast(list); |
182 intptr_t length = array.Length(); | 197 ASSERT(length <= array.Length()); |
floitsch
2014/08/29 11:13:20
ditto.
| |
183 String& string = String::Handle(OneByteString::New(length, Heap::kNew)); | 198 String& string = String::Handle(OneByteString::New(length, Heap::kNew)); |
184 for (int i = 0; i < length; i++) { | 199 for (int i = 0; i < length; i++) { |
185 intptr_t value = Smi::Value(reinterpret_cast<RawSmi*>(array.At(i))); | 200 intptr_t value = |
201 Smi::Value(reinterpret_cast<RawSmi*>(array.At(start + i))); | |
186 OneByteString::SetCharAt(string, i, value); | 202 OneByteString::SetCharAt(string, i, value); |
187 } | 203 } |
188 return string.raw(); | 204 return string.raw(); |
189 } else if (list.IsGrowableObjectArray()) { | 205 } else if (list.IsGrowableObjectArray()) { |
190 const GrowableObjectArray& array = GrowableObjectArray::Cast(list); | 206 const GrowableObjectArray& array = GrowableObjectArray::Cast(list); |
191 intptr_t length = array.Length(); | 207 ASSERT(length <= array.Length()); |
floitsch
2014/08/29 11:13:20
ditto.
| |
192 String& string = String::Handle(OneByteString::New(length, Heap::kNew)); | 208 String& string = String::Handle(OneByteString::New(length, Heap::kNew)); |
193 for (int i = 0; i < length; i++) { | 209 for (int i = 0; i < length; i++) { |
194 intptr_t value = Smi::Value(reinterpret_cast<RawSmi*>(array.At(i))); | 210 intptr_t value = |
211 Smi::Value(reinterpret_cast<RawSmi*>(array.At(start + i))); | |
195 OneByteString::SetCharAt(string, i, value); | 212 OneByteString::SetCharAt(string, i, value); |
196 } | 213 } |
197 return string.raw(); | 214 return string.raw(); |
198 } | 215 } |
199 UNREACHABLE(); | 216 UNREACHABLE(); |
200 return Object::null(); | 217 return Object::null(); |
201 } | 218 } |
202 | 219 |
203 | 220 |
204 DEFINE_NATIVE_ENTRY(OneByteString_setAt, 3) { | 221 DEFINE_NATIVE_ENTRY(OneByteString_setAt, 3) { |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
344 ? String::Handle(OneByteString::New(length_value, Heap::kNew)) | 361 ? String::Handle(OneByteString::New(length_value, Heap::kNew)) |
345 : String::Handle(TwoByteString::New(length_value, Heap::kNew)); | 362 : String::Handle(TwoByteString::New(length_value, Heap::kNew)); |
346 NoGCScope no_gc; | 363 NoGCScope no_gc; |
347 | 364 |
348 uint16_t* data_position = reinterpret_cast<uint16_t*>(codeUnits.DataAddr(0)); | 365 uint16_t* data_position = reinterpret_cast<uint16_t*>(codeUnits.DataAddr(0)); |
349 String::Copy(result, 0, data_position, length_value); | 366 String::Copy(result, 0, data_position, length_value); |
350 return result.raw(); | 367 return result.raw(); |
351 } | 368 } |
352 | 369 |
353 } // namespace dart | 370 } // namespace dart |
OLD | NEW |