[wasm] JS APIs & memory

test/mjsunit/wasm/instantiate-module-basic.js

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Flags: --expose-wasm
 
 load("test/mjsunit/wasm/wasm-constants.js");
 load("test/mjsunit/wasm/wasm-module-builder.js");
 
 let kReturnValue = 17;
@@ skipping 11 matching lines @@
 function CheckInstance(instance) {
   assertFalse(instance === undefined);
   assertFalse(instance === null);
   assertFalse(instance === 0);
   assertEquals("object", typeof instance);
 
   // Check the exports object is frozen.
   assertFalse(Object.isExtensible(instance.exports));
   assertTrue(Object.isFrozen(instance.exports));
 
-  // Check the memory is an ArrayBuffer.
+  // Check the memory is WebAssembly.Memory.
   var mem = instance.exports.memory;
   assertFalse(mem === undefined);
   assertFalse(mem === null);
   assertFalse(mem === 0);
   assertEquals("object", typeof mem);
   assertTrue(mem instanceof WebAssembly.Memory);
   var buf = mem.buffer;
   assertTrue(buf instanceof ArrayBuffer);
   assertEquals(65536, buf.byteLength);
   for (var i = 0; i < 4; i++) {
@@ skipping 67 matching lines @@
   promise.then(compiled_module => {
     let instance_1 = new WebAssembly.Instance(compiled_module);
     let instance_2 = new WebAssembly.Instance(compiled_module);
     assertTrue(instance_1 != instance_2);
   });
 })();
 
 (function InstancesAreIsolatedFromEachother() {
   print("InstancesAreIsolatedFromEachother...");
   var builder = new WasmModuleBuilder();
-  builder.addMemory(1,1, true);
+  builder.addImportedMemory("", "memory", 1,1);
   var kSig_v_i = makeSig([kWasmI32], []);
   var signature = builder.addType(kSig_v_i);
   builder.addImport("m", "some_value", kSig_i_v);
   builder.addImport("m", "writer", signature);
 
   builder.addFunction("main", kSig_i_i)
     .addBody([
       kExprGetLocal, 0,
       kExprI32LoadMem, 0, 0,
       kExprI32Const, 1,
@@ skipping 18 matching lines @@
   var mem_2 = new WebAssembly.Memory({initial: 1});
   var view_1 = new Int32Array(mem_1.buffer);
   var view_2 = new Int32Array(mem_2.buffer);
 
   view_1[0] = 42;
   view_2[0] = 1000;
 
   var outval_1;
   var outval_2;
   var i1 = new WebAssembly.Instance(module, {m: {some_value: () => 1,
-                                                 writer: (x)=>outval_1 = x }},
-                                    mem_1);
+                                                 writer: (x)=>outval_1 = x },
+                                             "": {memory: mem_1}});
+
   var i2 = new WebAssembly.Instance(module, {m: {some_value: () => 2,
-                                                 writer: (x)=>outval_2 = x }},
-                                    mem_2);
+                                                 writer: (x)=>outval_2 = x },
+                                             "": {memory: mem_2}});
 
   assertEquals(43, i1.exports.main(0));
   assertEquals(1002, i2.exports.main(0));
 
   assertEquals(42, outval_1);
   assertEquals(1000, outval_2);
 })();
 
 (function GlobalsArePrivateToTheInstance() {
   print("GlobalsArePrivateToTheInstance...");
@@ skipping 16 matching lines @@
     i1.exports.write(1);
     i2.exports.write(2);
     assertEquals(1, i1.exports.read());
     assertEquals(2, i2.exports.read());
 })();
 
 
 (function InstanceMemoryIsIsolated() {
   print("InstanceMemoryIsIsolated...");
   var builder = new WasmModuleBuilder();
-  builder.addMemory(1,1, true);
+  builder.addImportedMemory("", "memory", 1,1);
 
   builder.addFunction("f", kSig_i_v)
     .addBody([
       kExprI32Const, 0,
       kExprI32LoadMem, 0, 0
     ]).exportFunc();
 
   var mem_1 = new WebAssembly.Memory({initial: 1});
   var mem_2 = new WebAssembly.Memory({initial: 1});
   var view_1 = new Int32Array(mem_1.buffer);
   var view_2 = new Int32Array(mem_2.buffer);
   view_1[0] = 1;
   view_2[0] = 1000;
 
   var module = new WebAssembly.Module(builder.toBuffer());
-  var i1 = new WebAssembly.Instance(module, null, mem_1);
-  var i2 = new WebAssembly.Instance(module, null, mem_2);
+  var i1 = new WebAssembly.Instance(module, {"":{memory:mem_1}});
+  var i2 = new WebAssembly.Instance(module, {"":{memory:mem_2}});
 
   assertEquals(1, i1.exports.f());
   assertEquals(1000, i2.exports.f());
 })();
 
 (function MustBeMemory() {
   print("MustBeMemory...");
   var memory = new ArrayBuffer(65536);
-  var module = new WebAssembly.Module(buffer);
-  assertThrows(() => new WebAssembly.Instance(module, null, memory), TypeError);
+  let builder = new WasmModuleBuilder();
+  builder.addImportedMemory("", "memory");
+
+  let module = new WebAssembly.Module(builder.toBuffer());
+
+
+  assertThrows(() => new WebAssembly.Instance(module, {"":{memory:memory}}), WebAssembly.LinkError);
 })();