Merge V8 at r7668: Initial merge by Git.
Change-Id: I1703c8b4f5c63052451a22cf3fb878abc9a0ec75
diff --git a/samples/shell.cc b/samples/shell.cc
index 0710d46..222eeda 100644
--- a/samples/shell.cc
+++ b/samples/shell.cc
@@ -1,4 +1,4 @@
-// Copyright 2009 the V8 project authors. All rights reserved.
+// Copyright 2011 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
@@ -65,6 +65,14 @@
v8::Handle<v8::Value> Load(const v8::Arguments& args);
v8::Handle<v8::Value> Quit(const v8::Arguments& args);
v8::Handle<v8::Value> Version(const v8::Arguments& args);
+v8::Handle<v8::Value> Int8Array(const v8::Arguments& args);
+v8::Handle<v8::Value> Uint8Array(const v8::Arguments& args);
+v8::Handle<v8::Value> Int16Array(const v8::Arguments& args);
+v8::Handle<v8::Value> Uint16Array(const v8::Arguments& args);
+v8::Handle<v8::Value> Int32Array(const v8::Arguments& args);
+v8::Handle<v8::Value> Uint32Array(const v8::Arguments& args);
+v8::Handle<v8::Value> Float32Array(const v8::Arguments& args);
+v8::Handle<v8::Value> PixelArray(const v8::Arguments& args);
v8::Handle<v8::String> ReadFile(const char* name);
void ReportException(v8::TryCatch* handler);
@@ -112,6 +120,7 @@
v8::Handle<v8::String> source = ReadFile(arg);
if (source.IsEmpty()) {
printf("Error reading '%s'\n", arg);
+ continue;
}
if (!ExecuteString(source, file_name, false, true)) {
ExitShell(1);
@@ -334,6 +343,25 @@
global->Set(v8::String::New("quit"), v8::FunctionTemplate::New(Quit));
// Bind the 'version' function
global->Set(v8::String::New("version"), v8::FunctionTemplate::New(Version));
+
+ // Bind the handlers for external arrays.
+ global->Set(v8::String::New("Int8Array"),
+ v8::FunctionTemplate::New(Int8Array));
+ global->Set(v8::String::New("Uint8Array"),
+ v8::FunctionTemplate::New(Uint8Array));
+ global->Set(v8::String::New("Int16Array"),
+ v8::FunctionTemplate::New(Int16Array));
+ global->Set(v8::String::New("Uint16Array"),
+ v8::FunctionTemplate::New(Uint16Array));
+ global->Set(v8::String::New("Int32Array"),
+ v8::FunctionTemplate::New(Int32Array));
+ global->Set(v8::String::New("Uint32Array"),
+ v8::FunctionTemplate::New(Uint32Array));
+ global->Set(v8::String::New("Float32Array"),
+ v8::FunctionTemplate::New(Float32Array));
+ global->Set(v8::String::New("PixelArray"),
+ v8::FunctionTemplate::New(PixelArray));
+
return v8::Context::New(NULL, global);
}
@@ -417,6 +445,78 @@
}
+void ExternalArrayWeakCallback(v8::Persistent<v8::Value> object, void* data) {
+ free(data);
+ object.Dispose();
+}
+
+
+v8::Handle<v8::Value> CreateExternalArray(const v8::Arguments& args,
+ v8::ExternalArrayType type,
+ int element_size) {
+ if (args.Length() != 1) {
+ return v8::ThrowException(
+ v8::String::New("Array constructor needs one parameter."));
+ }
+ int length = args[0]->Int32Value();
+ void* data = malloc(length * element_size);
+ memset(data, 0, length * element_size);
+ v8::Handle<v8::Object> array = v8::Object::New();
+ v8::Persistent<v8::Object> persistent_array =
+ v8::Persistent<v8::Object>::New(array);
+ persistent_array.MakeWeak(data, ExternalArrayWeakCallback);
+ array->SetIndexedPropertiesToExternalArrayData(data, type, length);
+ array->Set(v8::String::New("length"), v8::Int32::New(length),
+ v8::ReadOnly);
+ array->Set(v8::String::New("BYTES_PER_ELEMENT"),
+ v8::Int32::New(element_size));
+ return array;
+}
+
+
+v8::Handle<v8::Value> Int8Array(const v8::Arguments& args) {
+ return CreateExternalArray(args, v8::kExternalByteArray, sizeof(int8_t));
+}
+
+
+v8::Handle<v8::Value> Uint8Array(const v8::Arguments& args) {
+ return CreateExternalArray(args, v8::kExternalUnsignedByteArray,
+ sizeof(uint8_t));
+}
+
+
+v8::Handle<v8::Value> Int16Array(const v8::Arguments& args) {
+ return CreateExternalArray(args, v8::kExternalShortArray, sizeof(int16_t));
+}
+
+
+v8::Handle<v8::Value> Uint16Array(const v8::Arguments& args) {
+ return CreateExternalArray(args, v8::kExternalUnsignedShortArray,
+ sizeof(uint16_t));
+}
+
+v8::Handle<v8::Value> Int32Array(const v8::Arguments& args) {
+ return CreateExternalArray(args, v8::kExternalIntArray, sizeof(int32_t));
+}
+
+
+v8::Handle<v8::Value> Uint32Array(const v8::Arguments& args) {
+ return CreateExternalArray(args, v8::kExternalUnsignedIntArray,
+ sizeof(uint32_t));
+}
+
+
+v8::Handle<v8::Value> Float32Array(const v8::Arguments& args) {
+ return CreateExternalArray(args, v8::kExternalFloatArray,
+ sizeof(float)); // NOLINT
+}
+
+
+v8::Handle<v8::Value> PixelArray(const v8::Arguments& args) {
+ return CreateExternalArray(args, v8::kExternalPixelArray, sizeof(uint8_t));
+}
+
+
// Reads a file into a v8 string.
v8::Handle<v8::String> ReadFile(const char* name) {
FILE* file = fopen(name, "rb");