[wasm] Master CL for Binary 0xC changes.

test/mjsunit/wasm/grow-memory.js

 // Copyright 2016 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 --expose-gc --stress-compaction
 
 load("test/mjsunit/wasm/wasm-constants.js");
 load("test/mjsunit/wasm/wasm-module-builder.js");
 
 var kPageSize = 0x10000;
 
 function genGrowMemoryBuilder() {
   var builder = new WasmModuleBuilder();
   builder.addFunction("grow_memory", kSig_i_i)
       .addBody([kExprGetLocal, 0, kExprGrowMemory])
       .exportFunc();
   builder.addFunction("load", kSig_i_i)
       .addBody([kExprGetLocal, 0, kExprI32LoadMem, 0, 0])
       .exportFunc();
   builder.addFunction("store", kSig_i_ii)
-      .addBody([kExprGetLocal, 0, kExprGetLocal, 1, kExprI32StoreMem, 0, 0])
+      .addBody([kExprGetLocal, 0, kExprGetLocal, 1, kExprI32StoreMem, 0, 0,
+                kExprGetLocal, 1])
       .exportFunc();
   builder.addFunction("load16", kSig_i_i)
       .addBody([kExprGetLocal, 0, kExprI32LoadMem16U, 0, 0])
       .exportFunc();
   builder.addFunction("store16", kSig_i_ii)
-      .addBody([kExprGetLocal, 0, kExprGetLocal, 1, kExprI32StoreMem16, 0, 0])
+      .addBody([kExprGetLocal, 0, kExprGetLocal, 1, kExprI32StoreMem16, 0, 0,
+                kExprGetLocal, 1])
       .exportFunc();
   builder.addFunction("load8", kSig_i_i)
       .addBody([kExprGetLocal, 0, kExprI32LoadMem8U, 0, 0])
       .exportFunc();
   builder.addFunction("store8", kSig_i_ii)
-      .addBody([kExprGetLocal, 0, kExprGetLocal, 1, kExprI32StoreMem8, 0, 0])
+      .addBody([kExprGetLocal, 0, kExprGetLocal, 1, kExprI32StoreMem8, 0, 0,
+                kExprGetLocal, 1])
       .exportFunc();
   return builder;
 }
 
 function testGrowMemoryReadWrite32() {
   var builder = genGrowMemoryBuilder();
   builder.addMemory(1, 1, false);
   var module = builder.instantiate();
   var offset;
   function peek() { return module.exports.load(offset); }
@@ skipping 193 matching lines @@
 
 function testGrowMemoryCurrentMemory() {
   var builder = genGrowMemoryBuilder();
   builder.addMemory(1, 1, false);
   builder.addFunction("memory_size", kSig_i_v)
       .addBody([kExprMemorySize])
       .exportFunc();
   var module = builder.instantiate();
   function growMem(pages) { return module.exports.grow_memory(pages); }
   function MemSize() { return module.exports.memory_size(); }
-  assertEquals(65536, MemSize());
+  assertEquals(1, MemSize());
   assertEquals(1, growMem(1));
-  assertEquals(131072, MemSize());
+  assertEquals(2, MemSize());
 }
 
 testGrowMemoryCurrentMemory();
 
 function testGrowMemoryPreservesDataMemOp32() {
   var builder = genGrowMemoryBuilder();
   builder.addMemory(1, 1, false);
   var module = builder.instantiate();
   var offset, val;
   function peek() { return module.exports.load(offset); }
@@ skipping 56 matching lines @@
 
   val = 0;
 
   for(offset = 0; offset <= (kPageSize - 1); offset++, val++) {
     assertEquals(val, peek());
     if (val == 255) val = 0;
   }
 }
 
 testGrowMemoryPreservesDataMemOp8();