[wasm] Binary 11: AST changes.

test/mjsunit/wasm/ffi.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");
 
 function testCallFFI(func, check) {
   var builder = new WasmModuleBuilder();
 
   var sig_index = builder.addSignature([kAstI32, kAstF64, kAstF64]);
   builder.addImport("func", sig_index);
   builder.addFunction("main", sig_index)
     .addBody([
-      kExprCallImport, 0,       // --
-      kExprGetLocal, 0,         // --
-      kExprGetLocal, 1])        // --
+      kExprGetLocal, 0,            // --
+      kExprGetLocal, 1,            // --
+      kExprCallImport, kArity2, 0  // --
+    ])        // --
     .exportFunc();
 
   var main = builder.instantiate({func: func}).exports.main;
 
   for (var i = 0; i < 100000; i += 10003) {
     var a = 22.5 + i, b = 10.5 + i;
     var r = main(a, b);
     check(r, a, b);
   }
 }
@@ skipping 150 matching lines @@
     passed_b = b;
     args_a = arguments[0];
     args_b = arguments[1];
   }};
 
   var builder = new WasmModuleBuilder();
 
   builder.addImport("func", [kAstStmt, type, type]);
   builder.addFunction("main", [kAstI32, type, type])
     .addBody([
-      kExprBlock, 2,          // --
-      kExprCallImport, 0,     // --
-      kExprGetLocal, 0,       // --
-      kExprGetLocal, 1,       // --
-      kExprI8Const, 99])      // --
+      kExprGetLocal, 0,            // --
+      kExprGetLocal, 1,            // --
+      kExprCallImport, kArity2, 0, // --
+      kExprI8Const, 99             // --
+    ])                             // --
     .exportFunc()
 
   var main = builder.instantiate(ffi).exports.main;
 
   print("testCallBinopVoid", type);
 
   for (var i = 0; i < 100000; i += 10003.1) {
     var a = 22.5 + i, b = 10.5 + i;
     var r = main(a, b);
     assertEquals(99, r);
@@ skipping 32 matching lines @@
 
 
 
 function testCallPrint() {
   var builder = new WasmModuleBuilder();
 
   builder.addImport("print", [kAstStmt, kAstI32]);
   builder.addImport("print", [kAstStmt, kAstF64]);
   builder.addFunction("main", [kAstStmt, kAstF64])
     .addBody([
-      kExprBlock, 2,            // --
-      kExprCallImport, 0,       // --
-      kExprI8Const, 97,         // --
-      kExprCallImport, 1,       // --
-      kExprGetLocal, 0])        // --
+      kExprI8Const, 97,             // --
+      kExprCallImport, kArity1, 0,  // --
+      kExprGetLocal, 0,             // --
+      kExprCallImport, kArity1, 1   // --
+    ])        // --
     .exportFunc()
 
   var main = builder.instantiate({print: print}).exports.main;
   for (var i = -9; i < 900; i += 6.125) main(i);
 }
 
 testCallPrint();
 testCallPrint();