Changeset 214547 in webkit for trunk/Source/JavaScriptCore/jsc.cpp

Timestamp:

Mar 29, 2017, 10:44:59 AM (8 years ago)

Author:

[email protected]

Message:

WebAssembly: add shell-only Memory mode helper
​https://bugs.webkit.org/show_bug.cgi?id=170227

Reviewed by Mark Lam.

JSTests:

• wasm/assert.js: fix a prior debug thing I forgot to remove
• wasm/function-tests/memory-section-and-import.js: the assert

issue was hiding a failure in error message here

• wasm/js-api/element.js: the assert issue was hiding a failure in

error message here
(badInstantiation.test):
(badInstantiation):

• wasm/js-api/extension-MemoryMode.js: Added.

(const.validateMode.what.switch):
(testMemoryNoMax):
(testMemory):
(testInstanceNoMemory):
(testInstanceNoMax):
(testInstance):

• wasm/js-api/test_memory.js: the assert issue was hiding a

failure in error message here
(test):

Source/JavaScriptCore:

• jsc.cpp:

(GlobalObject::finishCreation):
(functionWebAssemblyMemoryMode):

• wasm/WasmMemory.h:
• wasm/js/JSWebAssemblyInstance.h:
• wasm/js/JSWebAssemblyMemory.h:

File:

• trunk/Source/JavaScriptCore/jsc.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/jsc.cpp

@@ -58 +58 @@
 #include "JSTypedArrays.h"
 #include "JSWebAssemblyCallee.h"
+#include "JSWebAssemblyInstance.h"
+#include "JSWebAssemblyMemory.h"
 #include "LLIntData.h"
 #include "LLIntThunks.h"
@@ -1085 +1087 @@
 #if ENABLE(WEBASSEMBLY)
 static EncodedJSValue JSC_HOST_CALL functionTestWasmModuleFunctions(ExecState*);
+static EncodedJSValue JSC_HOST_CALL functionWebAssemblyMemoryMode(ExecState*);
 #endif
 
@@ -1359 +1362 @@
 #if ENABLE(WEBASSEMBLY)
         addFunction(vm, "testWasmModuleFunctions", functionTestWasmModuleFunctions, 0);
+        addFunction(vm, "WebAssemblyMemoryMode", functionWebAssemblyMemoryMode, 1);
 #endif
 
@@ -3247 +3251 @@
 }
 
+static EncodedJSValue JSC_HOST_CALL functionWebAssemblyMemoryMode(ExecState* exec)
+{
+    VM& vm = exec->vm();
+    auto scope = DECLARE_THROW_SCOPE(vm);
+    
+    if (!Options::useWebAssembly())
+        return throwVMTypeError(exec, scope, ASCIILiteral("WebAssemblyMemoryMode should only be called if the useWebAssembly option is set"));
+
+    if (JSObject* object = exec->argument(0).getObject()) {
+        if (auto* memory = jsDynamicCast<JSWebAssemblyMemory*>(vm, object))
+            return JSValue::encode(jsString(&vm, makeString(memory->memory().mode())));
+        if (auto* instance = jsDynamicCast<JSWebAssemblyInstance*>(vm, object))
+            return JSValue::encode(jsString(&vm, makeString(instance->memoryMode())));
+    }
+
+    return throwVMTypeError(exec, scope, ASCIILiteral("WebAssemblyMemoryMode expects either a WebAssembly.Memory or WebAssembly.Instance"));
+}
+
 #endif // ENABLE(WEBASSEBLY)