Changeset 210282 in webkit

Timestamp:

Jan 4, 2017 11:27:01 AM (7 years ago)

Author:

jfbastien@apple.com

Message:

WebAssembly JS API: add Module.sections
​https://bugs.webkit.org/show_bug.cgi?id=165159
<rdar://problem/29760326>

Reviewed by Mark Lam.

JSTests:

As described here: ​https://github.com/WebAssembly/design/blob/master/JS.md#webassemblymodulecustomsections

• wasm/Builder.js: allow custom sections to be duplicated
• wasm/js-api/Module.customSection.js: Added.

(assert.throws.WebAssembly.Module.prototype.customSections):
(assert.eq):

Source/JavaScriptCore:

As described in: ​https://github.com/WebAssembly/design/blob/master/JS.md#webassemblymodulecustomsections

This was added for Emscripten, and is likely to be used soon.

• wasm/WasmFormat.h: custom sections are just name + bytes
• wasm/WasmModuleParser.cpp: parse them, instead of skipping over
• wasm/WasmModuleParser.h:
• wasm/js/WebAssemblyModulePrototype.cpp: construct the Array of

ArrayBuffer as described in the spec
(JSC::webAssemblyModuleProtoCustomSections):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/wasm/Builder.js (modified) (1 diff)
• JSTests/wasm/js-api/Module.customSection.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/wasm/WasmFormat.h (modified) (2 diffs)
• Source/JavaScriptCore/wasm/WasmModuleParser.cpp (modified) (2 diffs)
• Source/JavaScriptCore/wasm/WasmModuleParser.h (modified) (1 diff)
• Source/JavaScriptCore/wasm/js/WebAssemblyModulePrototype.cpp (modified) (2 diffs)

trunk/JSTests/ChangeLog

@@ +1 @@
+2017-01-04  JF Bastien  <jfbastien@apple.com>
+
+        WebAssembly JS API: add Module.sections
+        https://bugs.webkit.org/show_bug.cgi?id=165159
+        <rdar://problem/29760326>
+
+        Reviewed by Mark Lam.
+
+        As described here: https://github.com/WebAssembly/design/blob/master/JS.md#webassemblymodulecustomsections
+
+        * wasm/Builder.js: allow custom sections to be duplicated
+        * wasm/js-api/Module.customSection.js: Added.
+        (assert.throws.WebAssembly.Module.prototype.customSections):
+        (assert.eq):
+
 2017-01-04  Saam Barati  <sbarati@apple.com>
 

trunk/JSTests/wasm/Builder.js

@@ -714 +714 @@
             // Check uniqueness.
             for (const s of this._sections)
-                assert.falsy(s.name === name && s.id === number, `Cannot have two sections with the same name "${name}" and ID ${number}`);
+                if (number !== _unknownSectionId)
+                    assert.falsy(s.name === name && s.id === number, `Cannot have two sections with the same name "${name}" and ID ${number}`);
             // Check ordering.
             if ((number !== _unknownSectionId) && (this._sections.length !== 0)) {

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-01-04  JF Bastien  <jfbastien@apple.com>
+
+        WebAssembly JS API: add Module.sections
+        https://bugs.webkit.org/show_bug.cgi?id=165159
+        <rdar://problem/29760326>
+
+        Reviewed by Mark Lam.
+
+        As described in: https://github.com/WebAssembly/design/blob/master/JS.md#webassemblymodulecustomsections
+
+        This was added for Emscripten, and is likely to be used soon.
+
+        * wasm/WasmFormat.h: custom sections are just name + bytes
+        * wasm/WasmModuleParser.cpp: parse them, instead of skipping over
+        * wasm/WasmModuleParser.h:
+        * wasm/js/WebAssemblyModulePrototype.cpp: construct the Array of
+        ArrayBuffer as described in the spec
+        (JSC::webAssemblyModuleProtoCustomSections):
+
 2017-01-04  Saam Barati  <sbarati@apple.com>
 

trunk/Source/JavaScriptCore/wasm/WasmFormat.h

@@ -221 +221 @@
     bool m_isValid { false };
 };
+    
+struct CustomSection {
+    String name;
+    Vector<uint8_t> payload;
+};
 
 struct ModuleInformation {
@@ -236 +241 @@
     Vector<Global> globals;
     unsigned firstInternalGlobal { 0 };
+    Vector<CustomSection> customSections;
+
     size_t functionIndexSpaceSize() const { return importFunctionSignatureIndices.size() + internalFunctionSignatureIndices.size(); }
     bool isImportedFunctionFromFunctionIndexSpace(size_t functionIndex) const

trunk/Source/JavaScriptCore/wasm/WasmModuleParser.cpp

@@ -88 +88 @@
 
         case Section::Unknown: {
-            // Ignore section's name LEB and bytes: they're already included in sectionLength.
-            m_offset += sectionLength;
+            WASM_FAIL_IF_HELPER_FAILS(parseCustom(sectionLength));
             break;
         }
@@ -601 +600 @@
     return { };
 }
+    
+auto ModuleParser::parseCustom(uint32_t sectionLength) -> PartialResult
+{
+    const uint32_t customSectionStartOffset = m_offset;
+
+    CustomSection section;
+    uint32_t customSectionNumber = m_result.module->customSections.size() + 1;
+    uint32_t nameLen;
+    WASM_PARSER_FAIL_IF(!m_result.module->customSections.tryReserveCapacity(customSectionNumber), "can't allocate enough memory for ", customSectionNumber, "th custom section");
+    WASM_PARSER_FAIL_IF(!parseVarUInt32(nameLen), "can't get ", customSectionNumber, "th custom section's name length");
+    WASM_PARSER_FAIL_IF(!consumeUTF8String(section.name, nameLen), "nameLen get ", customSectionNumber, "th custom section's name of length ", nameLen);
+
+    uint32_t payloadBytes = sectionLength - (m_offset - customSectionStartOffset);
+    WASM_PARSER_FAIL_IF(!section.payload.tryReserveCapacity(payloadBytes), "can't allocate enough memory for ", customSectionNumber, "th custom section's ", payloadBytes, " bytes");
+    for (uint32_t byteNumber = 0; byteNumber < payloadBytes; ++byteNumber) {
+        uint8_t byte;
+        WASM_PARSER_FAIL_IF(!parseUInt8(byte), "can't get ", byteNumber, "th data byte from ", customSectionNumber, "th custom section");
+        section.payload.uncheckedAppend(byte);
+    }
+    
+    m_result.module->customSections.uncheckedAppend(WTFMove(section));
+
+    return { };
+}
 
 } } // namespace JSC::Wasm

trunk/Source/JavaScriptCore/wasm/WasmModuleParser.h

@@ -61 +61 @@
 #undef WASM_SECTION_DECLARE_PARSER
 
+    PartialResult WARN_UNUSED_RETURN parseCustom(uint32_t);
     PartialResult WARN_UNUSED_RETURN parseGlobalType(Global&);
     PartialResult WARN_UNUSED_RETURN parseMemoryHelper(bool isImport);

trunk/Source/JavaScriptCore/wasm/js/WebAssemblyModulePrototype.cpp

@@ -29 +29 @@
 #if ENABLE(WEBASSEMBLY)
 
+#include "ArrayBuffer.h"
 #include "FunctionPrototype.h"
+#include "JSArrayBuffer.h"
 #include "JSCInlines.h"
+#include "JSWebAssemblyModule.h"
+
+namespace JSC {
+static EncodedJSValue JSC_HOST_CALL webAssemblyModuleProtoCustomSections(ExecState*);
+}
 
 #include "WebAssemblyModulePrototype.lut.h"
@@ -40 +47 @@
 /* Source for WebAssemblyModulePrototype.lut.h
  @begin prototypeTableWebAssemblyModule
+ customSections webAssemblyModuleProtoCustomSections DontEnum|Function 1
  @end
  */
+
+EncodedJSValue JSC_HOST_CALL webAssemblyModuleProtoCustomSections(ExecState* exec)
+{
+    VM& vm = exec->vm();
+    auto* globalObject = exec->lexicalGlobalObject();
+    auto throwScope = DECLARE_THROW_SCOPE(vm);
+
+    JSWebAssemblyModule* module = jsDynamicCast<JSWebAssemblyModule*>(exec->thisValue());
+    if (!module)
+        throwException(exec, throwScope, createTypeError(exec, ASCIILiteral("WebAssembly.Module.prototype.customSections called with non WebAssembly.Module |this| value")));
+    RETURN_IF_EXCEPTION(throwScope, { });
+
+    const String sectionNameString = exec->argument(0).getString(exec);
+    RETURN_IF_EXCEPTION(throwScope, { });
+
+    JSArray* result = constructEmptyArray(exec, nullptr, globalObject);
+    RETURN_IF_EXCEPTION(throwScope, { });
+
+    const auto& customSections = module->moduleInformation().customSections;
+    for (const Wasm::CustomSection& section : customSections) {
+        if (section.name == sectionNameString) {
+            auto buffer = ArrayBuffer::tryCreate(section.payload.data(), section.payload.size());
+            if (!buffer)
+                throwException(exec, throwScope, createOutOfMemoryError(exec));
+
+            Structure* arrayBufferStructure = InternalFunction::createSubclassStructure(exec, JSValue(), globalObject->arrayBufferStructure(ArrayBufferSharingMode::Default));
+            RETURN_IF_EXCEPTION(throwScope, { });
+
+            result->push(exec, JSArrayBuffer::create(vm, arrayBufferStructure, WTFMove(buffer)));
+            RETURN_IF_EXCEPTION(throwScope, { });
+        }
+    }
+
+    return JSValue::encode(result);
+}
 
 WebAssemblyModulePrototype* WebAssemblyModulePrototype::create(VM& vm, JSGlobalObject*, Structure* structure)