Revert of [wasm] Master CL for Binary 0xC 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 --allow-natives-syntax
 
 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.addType(kSig_i_dd);
   builder.addImport("func", sig_index);
   builder.addFunction("main", sig_index)
     .addBody([
       kExprGetLocal, 0,            // --
       kExprGetLocal, 1,            // --
-      kExprCallFunction, 0  // --
+      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);
     if (check) {
       check(r, a, b);
@@ skipping 43 matching lines @@
 (function testCallConstructor() {
   class C {}
   var builder = new WasmModuleBuilder();
 
   var sig_index = builder.addType(kSig_i_dd);
   builder.addImport("func", sig_index);
   builder.addFunction("main", sig_index)
     .addBody([
       kExprGetLocal, 0,            // --
       kExprGetLocal, 1,            // --
-      kExprCallFunction, 0  // --
+      kExprCallImport, kArity2, 0  // --
     ])        // --
     .exportFunc();
 
   main_for_constructor_test = builder.instantiate({func: C}).exports.main;
 
   assertThrows("main_for_constructor_test(12, 43)", TypeError);
 }) ();
 
 print("Native function");
 (function test_ffi_call_to_native() {
 
   var builder = new WasmModuleBuilder();
 
   var sig_index = builder.addType(kSig_d);
   builder.addImport("func", sig_index);
   builder.addFunction("main", sig_index)
     .addBody([
-      kExprCallFunction, 0  // --
+      kExprCallImport, kArity0, 0  // --
     ])        // --
     .exportFunc();
 
   var main = builder.instantiate({func: Object.prototype.toString}).exports.main;
   // The result of the call to Object.prototype.toString should be
   // [object Undefined]. However, we cannot test for this result because wasm
   // cannot return objects but converts them to float64 in this test.
   assertEquals(NaN, main());
 })();
 
@@ skipping 128 matching lines @@
     args_b = arguments[1];
   }};
 
   var builder = new WasmModuleBuilder();
 
   builder.addImport("func", makeSig_v_xx(type));
   builder.addFunction("main", makeSig_r_xx(kAstI32, type))
     .addBody([
       kExprGetLocal, 0,            // --
       kExprGetLocal, 1,            // --
-      kExprCallFunction, 0,        // --
+      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;
@@ skipping 34 matching lines @@
 
 
 
 function testCallPrint() {
   var builder = new WasmModuleBuilder();
 
   builder.addImport("print", makeSig_v_x(kAstI32));
   builder.addImport("print", makeSig_v_x(kAstF64));
   builder.addFunction("main", makeSig_v_x(kAstF64))
     .addBody([
-      kExprI8Const, 97,      // --
-      kExprCallFunction, 0,  // --
-      kExprGetLocal, 0,      // --
-      kExprCallFunction, 1   // --
-    ])                       // --
+      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();