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

test/mjsunit/wasm/compiled-module-serialization.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 --expose-gc
 
 load("test/mjsunit/wasm/wasm-constants.js");
 load("test/mjsunit/wasm/wasm-module-builder.js");
 
 (function SerializeAndDeserializeModule() {
   var builder = new WasmModuleBuilder();
   builder.addMemory(1,1, true);
   var kSig_v_i = makeSig([kAstI32], []);
   var signature = builder.addType(kSig_v_i);
   builder.addImport("some_value", kSig_i);
   builder.addImport("writer", signature);
 
   builder.addFunction("main", kSig_i_i)
     .addBody([
+      kExprI32Const, 1,
       kExprGetLocal, 0,
       kExprI32LoadMem, 0, 0,
-      kExprI32Const, 1,
-      kExprCallIndirect, signature,
+      kExprCallIndirect, kArity1, signature,
       kExprGetLocal,0,
       kExprI32LoadMem,0, 0,
-      kExprCallFunction, 0,
+      kExprCallImport, kArity0, 0,
       kExprI32Add
     ]).exportFunc();
 
   // writer(mem[i]);
   // return mem[i] + some_value();
   builder.addFunction("_wrap_writer", signature)
     .addBody([
       kExprGetLocal, 0,
-      kExprCallFunction, 1]);
-  builder.appendToTable([2, 3]);
+      kExprCallImport, kArity1, 1]);
+  builder.appendToTable([0, 1]);
 
 
   var module = new WebAssembly.Module(builder.toBuffer());
   var buff = %SerializeWasmModule(module);
   module = null;
   gc();
   module = %DeserializeWasmModule(buff);
 
   var mem_1 = new ArrayBuffer(4);
   var view_1 = new Int32Array(mem_1);
@@ skipping 44 matching lines @@
   var serialized = %SerializeWasmModule(compiled_module);
   var clone = %DeserializeWasmModule(serialized);
 
   assertNotNull(clone);
   assertFalse(clone == undefined);
   assertFalse(clone == compiled_module);
   assertEquals(clone.constructor, compiled_module.constructor);
   var instance3 = new WebAssembly.Instance(clone);
   assertFalse(instance3 == undefined);
 })();