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

test/mjsunit/wasm/test-import-export-wrapper.js

Index: test/mjsunit/wasm/test-import-export-wrapper.js
diff --git a/test/mjsunit/wasm/test-import-export-wrapper.js b/test/mjsunit/wasm/test-import-export-wrapper.js
index df03aec9f5f499957f1c47975756b597e29ef061..e180611818b3a2f5272f321169e215fa3502800f 100644
--- a/test/mjsunit/wasm/test-import-export-wrapper.js
+++ b/test/mjsunit/wasm/test-import-export-wrapper.js
@@ -26,8 +26,8 @@
         .addFunction("second_export", sig_index)
         .addBody([
             kExprGetLocal, 0,
-            kExprCallFunction, 0,
-            kExprReturn
+            kExprCallImport, kArity1, 0,
+            kExprReturn, kArity1
         ])
         .exportFunc();
 
@@ -39,8 +39,8 @@
         .addFunction("first_export", sig_index)
         .addBody([
             kExprGetLocal, 0,
-            kExprCallFunction, 2,
-            kExprReturn
+            kExprCallFunction, kArity1, 1,
+            kExprReturn, kArity1
         ])
         .exportFunc();
     first_module
@@ -49,8 +49,8 @@
             kExprI32Const, 1,
             kExprGetLocal, 0,
             kExprI32Add,
-            kExprCallFunction, 0,
-            kExprReturn
+            kExprCallImport, kArity1, 0,
+            kExprReturn, kArity1
         ]);
 
     var f = second_module
@@ -83,8 +83,8 @@
         .addFunction("second_export", sig_index_1)
         .addBody([
             kExprGetLocal, 0,
-            kExprCallFunction, 0,
-            kExprReturn
+            kExprCallImport, kArity1, 0,
+            kExprReturn, kArity1
         ])
         .exportFunc();
 
@@ -97,8 +97,8 @@
         .addBody([
             kExprGetLocal, 0,
             kExprGetLocal, 1,
-            kExprCallFunction, 2,
-            kExprReturn
+            kExprCallFunction, kArity2, 1,
+            kExprReturn, kArity1
         ])
         .exportFunc();
     first_module
@@ -106,8 +106,8 @@
         .addBody([
             kExprGetLocal, 0,
             kExprGetLocal, 1,
-            kExprCallFunction, 0,
-            kExprReturn
+            kExprCallImport, kArity2, 0,
+            kExprReturn, kArity1
         ]);
 
     var f = second_module
@@ -142,8 +142,8 @@
             kExprGetLocal, 0,
             kExprGetLocal, 1,
             kExprGetLocal, 2,
-            kExprCallFunction, 0,
-            kExprReturn
+            kExprCallImport, kArity3, 0,
+            kExprReturn, kArity1
         ])
         .exportFunc();
 
@@ -156,8 +156,8 @@
         .addBody([
             kExprGetLocal, 0,
             kExprGetLocal, 1,
-            kExprCallFunction, 2,
-            kExprReturn
+            kExprCallFunction, kArity2, 1,
+            kExprReturn, kArity1
         ])
         .exportFunc();
     first_module
@@ -165,8 +165,8 @@
         .addBody([
             kExprGetLocal, 0,
             kExprGetLocal, 1,
-            kExprCallFunction, 0,
-            kExprReturn
+            kExprCallImport, kArity2, 0,
+            kExprReturn, kArity1
         ]);
 
     var f = second_module
@@ -200,8 +200,8 @@
         .addBody([
             kExprGetLocal, 0,
             kExprGetLocal, 1,
-            kExprCallFunction, 0,
-            kExprReturn
+            kExprCallImport, kArity2, 0,
+            kExprReturn, kArity1
         ])
         .exportFunc();
 
@@ -214,8 +214,8 @@
         .addBody([
             kExprGetLocal, 0,
             kExprGetLocal, 1,
-            kExprCallFunction, 2,
-            kExprReturn
+            kExprCallFunction, kArity2, 1,
+            kExprReturn, kArity1
         ])
         .exportFunc();
     first_module
@@ -223,8 +223,8 @@
         .addBody([
             kExprGetLocal, 0,
             kExprGetLocal, 1,
-            kExprCallFunction, 0,
-            kExprReturn
+            kExprCallImport, kArity2, 0,
+            kExprReturn, kArity1
         ]);
 
     var f = second_module