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

test/mjsunit/wasm/ffi.js

Index: test/mjsunit/wasm/ffi.js
diff --git a/test/mjsunit/wasm/ffi.js b/test/mjsunit/wasm/ffi.js
index 5966ec8c5ea2634592ba401ec2508741bb3606f3..e84f038e683e8c49eedf4eba0ec539c845a7afe2 100644
--- a/test/mjsunit/wasm/ffi.js
+++ b/test/mjsunit/wasm/ffi.js
@@ -16,7 +16,7 @@
     .addBody([
       kExprGetLocal, 0,            // --
       kExprGetLocal, 1,            // --
-      kExprCallFunction, 0  // --
+      kExprCallImport, kArity2, 0  // --
     ])        // --
     .exportFunc();
 
@@ -80,7 +80,7 @@
     .addBody([
       kExprGetLocal, 0,            // --
       kExprGetLocal, 1,            // --
-      kExprCallFunction, 0  // --
+      kExprCallImport, kArity2, 0  // --
     ])        // --
     .exportFunc();
 
@@ -98,7 +98,7 @@
   builder.addImport("func", sig_index);
   builder.addFunction("main", sig_index)
     .addBody([
-      kExprCallFunction, 0  // --
+      kExprCallImport, kArity0, 0  // --
     ])        // --
     .exportFunc();
 
@@ -247,7 +247,7 @@
     .addBody([
       kExprGetLocal, 0,            // --
       kExprGetLocal, 1,            // --
-      kExprCallFunction, 0,        // --
+      kExprCallImport, kArity2, 0, // --
       kExprI8Const, 99             // --
     ])                             // --
     .exportFunc()
@@ -302,11 +302,11 @@
   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;