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

test/mjsunit/wasm/debug-disassembly.js

 // Copyright 2016 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 --expose-debug-as debug
 
 load("test/mjsunit/wasm/wasm-constants.js");
 load("test/mjsunit/wasm/wasm-module-builder.js");
 
 Debug = debug.Debug
@@ skipping 27 matching lines @@
             if (offset_table[p] != pos) continue;
             lineNr = offset_table[p+1];
             columnNr = offset_table[p+2];
           }
           assertNotNull(lineNr, "position should occur in offset table");
           assertNotNull(columnNr, "position should occur in offset table");
           var line = disassembly.split("\n")[lineNr];
           assertTrue(!!line, "line number must occur in disassembly");
           assertTrue(line.length > columnNr, "column number must be valid");
           var expected_string;
-          if (name.endsWith("/1")) {
+          if (name.endsWith("/0")) {
             // Function 0 calls the imported function.
-            expected_string = "kExprCallFunction,";
-          } else if (name.endsWith("/2")) {
+            expected_string = "kExprCallImport,";
+          } else if (name.endsWith("/1")) {
             // Function 1 calls function 0.
             expected_string = "kExprCallFunction,";
           } else {
             assertTrue(false, "Unexpected wasm script: " + name);
           }
           assertTrue(line.substr(columnNr).startsWith(expected_string),
               "offset " + columnNr + " should start with '" + expected_string
               + "': " + line);
         }
       }
     } else if (event == Debug.DebugEvent.AfterCompile) {
       var script = event_data.script();
       if (script.scriptType() == Debug.ScriptType.Wasm) {
         ++num_wasm_scripts;
       }
     }
   } catch (e) {
     print("exception: " + e);
     exception = e;
   }
 };
 
 var builder = new WasmModuleBuilder();
 
 builder.addImport("func", kSig_v_v);
 
 builder.addFunction("call_import", kSig_v_v)
-  .addBody([kExprCallFunction, 0])
+  .addBody([kExprCallImport, kArity0, 0])
   .exportFunc();
 
 // Add a bit of unneccessary code to increase the byte offset.
 builder.addFunction("call_call_import", kSig_v_v)
   .addLocals({i32_count: 2})
   .addBody([
       kExprI32Const, 27, kExprSetLocal, 0,
       kExprI32Const, (-7 & 0x7f), kExprSetLocal, 1,
         kExprGetLocal, 0, kExprGetLocal, 1, kExprI32Add, kExprI64UConvertI32,
         kExprI64Const, 0,
-      kExprI64Ne, kExprIf, kAstStmt,
-        kExprCallFunction, 1,
+      kExprI64Ne, kExprIf,
+        kExprCallFunction, kArity0, 0,
       kExprEnd
   ])
   .exportFunc();
 
 function call_debugger() {
   debugger;
 }
 
 function setup() {
   module = builder.instantiate({func: call_debugger});
@@ skipping 17 matching lines @@
 
 (function testRegisteredWasmScripts2() {
   setup();
   Debug.setListener(listener);
   module.exports.call_call_import();
   Debug.setListener(null);
 
   assertEquals(1, break_count);
   if (exception) throw exception;
 })();