Index: src/bootstrapper.cc |
diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc |
index 555080fdbd5e781b94ec43bf68c56b1602b1bb59..be2f6db24915a884d5a4183d6368e0bf7cb6f5ea 100644 |
--- a/src/bootstrapper.cc |
+++ b/src/bootstrapper.cc |
@@ -189,11 +189,9 @@ class Genesis BASE_EMBEDDED { |
ElementsKind elements_kind); |
bool InstallNatives(); |
- void InstallTypedArray( |
- const char* name, |
- ElementsKind elements_kind, |
- Handle<JSFunction>* fun, |
- Handle<Map>* external_map); |
+ void InstallTypedArray(const char* name, ElementsKind elements_kind, |
+ Handle<JSFunction>* fun, Handle<Map>* external_map, |
+ SharedFlag is_shared); |
bool InstallExperimentalNatives(); |
void InstallBuiltinFunctionIds(); |
void InstallJSFunctionResultCaches(); |
@@ -1154,17 +1152,15 @@ void Genesis::InitializeGlobal(Handle<GlobalObject> global_object, |
} |
{ // -- T y p e d A r r a y s |
-#define INSTALL_TYPED_ARRAY(Type, type, TYPE, ctype, size) \ |
- { \ |
- Handle<JSFunction> fun; \ |
- Handle<Map> external_map; \ |
- InstallTypedArray(#Type "Array", \ |
- TYPE##_ELEMENTS, \ |
- &fun, \ |
- &external_map); \ |
- native_context()->set_##type##_array_fun(*fun); \ |
- native_context()->set_##type##_array_external_map(*external_map); \ |
- } |
+#define INSTALL_TYPED_ARRAY(Type, type, TYPE, ctype, size) \ |
+ { \ |
+ Handle<JSFunction> fun; \ |
+ Handle<Map> external_map; \ |
+ InstallTypedArray(#Type "Array", TYPE##_ELEMENTS, &fun, &external_map, \ |
+ NOT_SHARED); \ |
+ native_context()->set_##type##_array_fun(*fun); \ |
+ native_context()->set_##type##_array_external_map(*external_map); \ |
+ } |
TYPED_ARRAYS(INSTALL_TYPED_ARRAY) |
#undef INSTALL_TYPED_ARRAY |
@@ -1372,20 +1368,20 @@ void Genesis::InitializeGlobal(Handle<GlobalObject> global_object, |
} |
-void Genesis::InstallTypedArray( |
- const char* name, |
- ElementsKind elements_kind, |
- Handle<JSFunction>* fun, |
- Handle<Map>* external_map) { |
+void Genesis::InstallTypedArray(const char* name, ElementsKind elements_kind, |
+ Handle<JSFunction>* fun, |
+ Handle<Map>* external_map, |
+ SharedFlag is_shared) { |
+ DCHECK(!is_shared || FLAG_harmony_shared_typed_arrays); |
+ InstanceType type = |
+ is_shared ? JS_SHARED_TYPED_ARRAY_TYPE : JS_TYPED_ARRAY_TYPE; |
Jarin
2015/04/29 04:46:00
change to (is_shared == SHARED) ? ...
binji
2015/04/30 16:39:43
Done.
|
Handle<JSObject> global = Handle<JSObject>(native_context()->global_object()); |
Handle<JSFunction> result = InstallFunction( |
- global, name, JS_TYPED_ARRAY_TYPE, JSTypedArray::kSize, |
+ global, name, type, JSTypedArray::kSize, |
isolate()->initial_object_prototype(), Builtins::kIllegal); |
Handle<Map> initial_map = isolate()->factory()->NewMap( |
- JS_TYPED_ARRAY_TYPE, |
- JSTypedArray::kSizeWithInternalFields, |
- elements_kind); |
+ type, JSTypedArray::kSizeWithInternalFields, elements_kind); |
JSFunction::SetInitialMap(result, initial_map, |
handle(initial_map->prototype(), isolate())); |
*fun = result; |
@@ -1670,6 +1666,7 @@ EMPTY_NATIVE_FUNCTIONS_FOR_FEATURE(harmony_rest_parameters) |
EMPTY_NATIVE_FUNCTIONS_FOR_FEATURE(harmony_reflect) |
EMPTY_NATIVE_FUNCTIONS_FOR_FEATURE(harmony_spreadcalls) |
EMPTY_NATIVE_FUNCTIONS_FOR_FEATURE(harmony_destructuring) |
+EMPTY_NATIVE_FUNCTIONS_FOR_FEATURE(harmony_shared_typed_arrays) |
void Genesis::InstallNativeFunctions_harmony_proxies() { |
@@ -1773,6 +1770,32 @@ void Genesis::InitializeGlobal_harmony_tostring() { |
} |
+void Genesis::InitializeGlobal_harmony_shared_typed_arrays() { |
+ if (!FLAG_harmony_shared_typed_arrays) return; |
+ |
+ Handle<JSGlobalObject> global( |
+ JSGlobalObject::cast(native_context()->global_object())); |
+ |
+ Handle<JSFunction> shared_array_buffer_fun = InstallFunction( |
+ global, "SharedArrayBuffer", JS_SHARED_ARRAY_BUFFER_TYPE, |
+ JSArrayBuffer::kSizeWithInternalFields, |
+ isolate()->initial_object_prototype(), Builtins::kIllegal); |
+ native_context()->set_shared_array_buffer_fun(*shared_array_buffer_fun); |
+ |
+#define INSTALL_SHARED_TYPED_ARRAY(Type, type, TYPE, ctype, size) \ |
+ { \ |
+ Handle<JSFunction> fun; \ |
+ Handle<Map> external_map; \ |
+ InstallTypedArray("Shared" #Type "Array", TYPE##_ELEMENTS, &fun, \ |
+ &external_map, SHARED); \ |
+ native_context()->set_shared_##type##_array_fun(*fun); \ |
+ native_context()->set_shared_##type##_array_external_map(*external_map); \ |
+ } |
+ TYPED_ARRAYS(INSTALL_SHARED_TYPED_ARRAY) |
+#undef INSTALL_SHARED_TYPED_ARRAY |
+} |
+ |
+ |
Handle<JSFunction> Genesis::InstallInternalArray( |
Handle<JSBuiltinsObject> builtins, |
const char* name, |
@@ -2325,6 +2348,9 @@ bool Genesis::InstallExperimentalNatives() { |
static const char* harmony_spreadcalls_natives[] = { |
"native harmony-spread.js", nullptr}; |
static const char* harmony_destructuring_natives[] = {nullptr}; |
+ static const char* harmony_shared_typed_arrays_natives[] = { |
+ "native harmony-sharedarraybuffer.js", |
+ "native harmony-sharedtypedarray.js", NULL}; |
for (int i = ExperimentalNatives::GetDebuggerCount(); |
i < ExperimentalNatives::GetBuiltinsCount(); i++) { |