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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 start, | 130 start, |
131 (i - start), | 131 (i - start), |
132 Heap::kNew); | 132 Heap::kNew); |
133 result.Add(str); | 133 result.Add(str); |
134 return result.raw(); | 134 return result.raw(); |
135 } | 135 } |
136 | 136 |
137 | 137 |
138 DEFINE_NATIVE_ENTRY(OneByteString_allocate, 1) { | 138 DEFINE_NATIVE_ENTRY(OneByteString_allocate, 1) { |
139 GET_NON_NULL_NATIVE_ARGUMENT(Smi, length_obj, arguments->NativeArgAt(0)); | 139 GET_NON_NULL_NATIVE_ARGUMENT(Smi, length_obj, arguments->NativeArgAt(0)); |
140 return OneByteString::New(length_obj.Value(), Heap::kNew); | 140 Heap::Space space = isolate->heap()->SpaceForAllocation(kOneByteStringCid); |
| 141 return OneByteString::New(length_obj.Value(), space); |
141 } | 142 } |
142 | 143 |
143 | 144 |
144 DEFINE_NATIVE_ENTRY(OneByteString_allocateFromOneByteList, 1) { | 145 DEFINE_NATIVE_ENTRY(OneByteString_allocateFromOneByteList, 1) { |
145 Instance& list = Instance::CheckedHandle(arguments->NativeArgAt(0)); | 146 Instance& list = Instance::CheckedHandle(arguments->NativeArgAt(0)); |
| 147 Heap::Space space = isolate->heap()->SpaceForAllocation(kOneByteStringCid); |
146 if (list.IsTypedData()) { | 148 if (list.IsTypedData()) { |
147 const TypedData& array = TypedData::Cast(list); | 149 const TypedData& array = TypedData::Cast(list); |
148 intptr_t length = array.LengthInBytes(); | 150 intptr_t length = array.LengthInBytes(); |
149 return OneByteString::New(array, 0, length); | 151 return OneByteString::New(array, 0, length, space); |
150 } else if (list.IsExternalTypedData()) { | 152 } else if (list.IsExternalTypedData()) { |
151 const ExternalTypedData& array = ExternalTypedData::Cast(list); | 153 const ExternalTypedData& array = ExternalTypedData::Cast(list); |
152 intptr_t length = array.LengthInBytes(); | 154 intptr_t length = array.LengthInBytes(); |
153 return OneByteString::New(array, 0, length); | 155 return OneByteString::New(array, 0, length, space); |
154 } else if (RawObject::IsTypedDataViewClassId(list.GetClassId())) { | 156 } else if (RawObject::IsTypedDataViewClassId(list.GetClassId())) { |
155 const Instance& view = Instance::Cast(list); | 157 const Instance& view = Instance::Cast(list); |
156 intptr_t length = Smi::Value(TypedDataView::Length(view)); | 158 intptr_t length = Smi::Value(TypedDataView::Length(view)); |
157 const Instance& data_obj = Instance::Handle(TypedDataView::Data(view)); | 159 const Instance& data_obj = Instance::Handle(TypedDataView::Data(view)); |
158 intptr_t data_offset = Smi::Value(TypedDataView::OffsetInBytes(view)); | 160 intptr_t data_offset = Smi::Value(TypedDataView::OffsetInBytes(view)); |
159 if (data_obj.IsTypedData()) { | 161 if (data_obj.IsTypedData()) { |
160 const TypedData& array = TypedData::Cast(data_obj); | 162 const TypedData& array = TypedData::Cast(data_obj); |
161 return OneByteString::New(array, data_offset, length); | 163 return OneByteString::New(array, data_offset, length, space); |
162 } else if (data_obj.IsExternalTypedData()) { | 164 } else if (data_obj.IsExternalTypedData()) { |
163 const ExternalTypedData& array = ExternalTypedData::Cast(data_obj); | 165 const ExternalTypedData& array = ExternalTypedData::Cast(data_obj); |
164 return OneByteString::New(array, data_offset, length); | 166 return OneByteString::New(array, data_offset, length, space); |
165 } | 167 } |
166 } else if (list.IsArray()) { | 168 } else if (list.IsArray()) { |
167 const Array& array = Array::Cast(list); | 169 const Array& array = Array::Cast(list); |
168 intptr_t length = array.Length(); | 170 intptr_t length = array.Length(); |
169 String& string = String::Handle(OneByteString::New(length, Heap::kNew)); | 171 String& string = String::Handle(OneByteString::New(length, space)); |
170 for (int i = 0; i < length; i++) { | 172 for (int i = 0; i < length; i++) { |
171 intptr_t value = Smi::Value(reinterpret_cast<RawSmi*>(array.At(i))); | 173 intptr_t value = Smi::Value(reinterpret_cast<RawSmi*>(array.At(i))); |
172 OneByteString::SetCharAt(string, i, value); | 174 OneByteString::SetCharAt(string, i, value); |
173 } | 175 } |
174 return string.raw(); | 176 return string.raw(); |
175 } else if (list.IsGrowableObjectArray()) { | 177 } else if (list.IsGrowableObjectArray()) { |
176 const GrowableObjectArray& array = GrowableObjectArray::Cast(list); | 178 const GrowableObjectArray& array = GrowableObjectArray::Cast(list); |
177 intptr_t length = array.Length(); | 179 intptr_t length = array.Length(); |
178 String& string = String::Handle(OneByteString::New(length, Heap::kNew)); | 180 String& string = String::Handle(OneByteString::New(length, space)); |
179 for (int i = 0; i < length; i++) { | 181 for (int i = 0; i < length; i++) { |
180 intptr_t value = Smi::Value(reinterpret_cast<RawSmi*>(array.At(i))); | 182 intptr_t value = Smi::Value(reinterpret_cast<RawSmi*>(array.At(i))); |
181 OneByteString::SetCharAt(string, i, value); | 183 OneByteString::SetCharAt(string, i, value); |
182 } | 184 } |
183 return string.raw(); | 185 return string.raw(); |
184 } | 186 } |
185 UNREACHABLE(); | 187 UNREACHABLE(); |
186 return Object::null(); | 188 return Object::null(); |
187 } | 189 } |
188 | 190 |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
319 ? String::Handle(OneByteString::New(length_value, Heap::kNew)) | 321 ? String::Handle(OneByteString::New(length_value, Heap::kNew)) |
320 : String::Handle(TwoByteString::New(length_value, Heap::kNew)); | 322 : String::Handle(TwoByteString::New(length_value, Heap::kNew)); |
321 NoGCScope no_gc; | 323 NoGCScope no_gc; |
322 | 324 |
323 uint16_t* data_position = reinterpret_cast<uint16_t*>(codeUnits.DataAddr(0)); | 325 uint16_t* data_position = reinterpret_cast<uint16_t*>(codeUnits.DataAddr(0)); |
324 String::Copy(result, 0, data_position, length_value); | 326 String::Copy(result, 0, data_position, length_value); |
325 return result.raw(); | 327 return result.raw(); |
326 } | 328 } |
327 | 329 |
328 } // namespace dart | 330 } // namespace dart |
OLD | NEW |