Revert of [wasm] Master CL for Binary 0xC changes.

test/mjsunit/wasm/import-table.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 testCallImport(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, 2, 0])      // --
     .exportAs("main");
 
   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 154 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, 2, 0,      // --
       kExprI8Const, 99,           // --
     ])
     .exportFunc("main");
 
   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_r_x(kAstF64, kAstF64));
   builder.addFunction("main", makeSig_r_x(kAstF64, kAstF64))
     .addBody([
       kExprI8Const, 97,             // --
-      kExprCallFunction, 0,  // --
+      kExprCallImport, kArity1, 0,  // --
       kExprGetLocal, 0,             // --
-      kExprCallFunction, 1   // --
+      kExprCallImport, kArity1, 1   // --
     ])
     .exportFunc();
 
   var main = builder.instantiate({print: print}).exports.main;
 
   for (var i = -9; i < 900; i += 16.125) {
       main(i);
   }
 }
 
 testCallPrint();
 testCallPrint();
 
 
 function testCallImport2(foo, bar, expected) {
   var builder = new WasmModuleBuilder();
 
   builder.addImport("foo", kSig_i);
   builder.addImport("bar", kSig_i);
   builder.addFunction("main", kSig_i)
     .addBody([
-      kExprCallFunction, 0, // --
-      kExprCallFunction, 1, // --
+      kExprCallImport, kArity0, 0, // --
+      kExprCallImport, kArity0, 1, // --
       kExprI32Add,                 // --
     ])                             // --
     .exportFunc();
 
   var main = builder.instantiate({foo: foo, bar: bar}).exports.main;
   assertEquals(expected, main());
 }
 
 testCallImport2(function() { return 33; }, function () { return 44; }, 77);