[wasm] Master CL for Binary 0xC changes.

test/mjsunit/wasm/test-wasm-module-builder.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
 
 load('test/mjsunit/wasm/wasm-constants.js');
 load('test/mjsunit/wasm/wasm-module-builder.js');
 
-var debug = false;
+var debug = true;
 
 (function BasicTest() {
     var module = new WasmModuleBuilder();
     module.addMemory(1, 2, false);
     module.addFunction("foo", kSig_i)
         .addBody([kExprI8Const, 11])
         .exportAs("blarg");
 
     var buffer = module.toBuffer(debug);
     var instance = Wasm.instantiateModule(buffer);
     assertEquals(11, instance.exports.blarg());
 })();
 
 (function ImportTest() {
     var module = new WasmModuleBuilder();
     var index = module.addImport("print", makeSig_v_x(kAstI32));
     module.addFunction("foo", kSig_v_v)
-        .addBody([kExprI8Const, 13, kExprCallImport, kArity1, index])
+        .addBody([kExprI8Const, 13, kExprCallFunction, index])
         .exportAs("main");
 
     var buffer = module.toBuffer(debug);
     var instance = Wasm.instantiateModule(buffer, {print: print});
     print("should print 13! ");
     instance.exports.main();
 })();
 
 (function LocalsTest() {
     var module = new WasmModuleBuilder();
     module.addFunction(undefined, kSig_i_i)
         .addLocals({i32_count: 1})
-        .addBody([kExprGetLocal, 0, kExprSetLocal, 1])
+        .addBody([kExprGetLocal, 0, kExprSetLocal, 1, kExprGetLocal, 1])
         .exportAs("main");
 
     var buffer = module.toBuffer(debug);
     var instance = Wasm.instantiateModule(buffer);
     assertEquals(19, instance.exports.main(19));
     assertEquals(27777, instance.exports.main(27777));
 })();
 
 (function LocalsTest2() {
     // TODO(titzer): i64 only works on 64-bit platforms.
     var types = [
       {locals: {i32_count: 1}, type: kAstI32},
 //      {locals: {i64_count: 1}, type: kAstI64},
       {locals: {f32_count: 1}, type: kAstF32},
       {locals: {f64_count: 1}, type: kAstF64},
     ];
 
     for (p of types) {
       var module = new WasmModuleBuilder();
       module.addFunction(undefined, makeSig_r_x(p.type, p.type))
         .addLocals(p.locals)
-        .addBody([kExprGetLocal, 0, kExprSetLocal, 1])
+        .addBody([kExprGetLocal, 0, kExprSetLocal, 1, kExprGetLocal, 1])
         .exportAs("main");
 
       var buffer = module.toBuffer(debug);
       var instance = Wasm.instantiateModule(buffer);
       assertEquals(19, instance.exports.main(19));
       assertEquals(27777, instance.exports.main(27777));
     }
 })();
 
 (function CallTest() {
     var module = new WasmModuleBuilder();
     module.addFunction("add", kSig_i_ii)
         .addBody([kExprGetLocal, 0, kExprGetLocal, 1, kExprI32Add]);
     module.addFunction("main", kSig_i_ii)
-        .addBody([kExprGetLocal, 0, kExprGetLocal, 1, kExprCallFunction, kArity2, 0])
+        .addBody([kExprGetLocal, 0, kExprGetLocal, 1, kExprCallFunction, 0])
         .exportAs("main");
 
     var instance = module.instantiate();
     assertEquals(44, instance.exports.main(11, 33));
     assertEquals(7777, instance.exports.main(2222, 5555));
 })();
 
 (function IndirectCallTest() {
     var module = new WasmModuleBuilder();
     module.addFunction("add", kSig_i_ii)
         .addBody([kExprGetLocal, 0, kExprGetLocal, 1, kExprI32Add]);
     module.addFunction("main", kSig_i_iii)
         .addBody([kExprGetLocal,
-                  0, kExprGetLocal, 1, kExprGetLocal, 2, kExprCallIndirect, kArity2, 0])
+                  1, kExprGetLocal, 2, kExprGetLocal, 0, kExprCallIndirect, 0])
         .exportAs("main");
     module.appendToTable([0]);
 
     var instance = module.instantiate();
     assertEquals(44, instance.exports.main(0, 11, 33));
     assertEquals(7777, instance.exports.main(0, 2222, 5555));
     assertThrows(function() { instance.exports.main(1, 1, 1); });
 })();
 
 (function DataSegmentTest() {
@@ skipping 33 matching lines @@
       array2[i] = array[i];
     }
     var instance = Wasm.instantiateModule(array2);
     assertEquals(17, instance.exports.blarg());
 })();
 
 (function ImportTestTwoLevel() {
     var module = new WasmModuleBuilder();
     var index = module.addImportWithModule("mod", "print", makeSig_v_x(kAstI32));
     module.addFunction("foo", kSig_v_v)
-        .addBody([kExprI8Const, 19, kExprCallImport, kArity1, index])
+        .addBody([kExprI8Const, 19, kExprCallFunction, index])
         .exportAs("main");
 
     var buffer = module.toBuffer(debug);
     var instance = Wasm.instantiateModule(buffer, {mod: {print: print}});
     print("should print 19! ");
     instance.exports.main();
 })();