[wasm] Binary 11: Module changes.

test/mjsunit/wasm/wasm-module-builder.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.
 
 function WasmFunctionBuilder(name, sig_index) {
     this.name = name;
     this.sig_index = sig_index;
     this.exports = [];
 }
 
@@ skipping 35 matching lines @@
 WasmModuleBuilder.prototype.addMemory = function(min, max, exp) {
     this.memory = {min: min, max: max, exp: exp};
     return this;
 }
 
 WasmModuleBuilder.prototype.addExplicitSection = function(bytes) {
   this.explicit.push(bytes);
   return this;
 }
 
-// Add a signature; format is [rettype, param0, param1, ...]
+// Add a signature; format is [param_count, param0, param1, ..., retcount, ret0]
 WasmModuleBuilder.prototype.addSignature = function(sig) {
     // TODO: canonicalize signatures?
     this.signatures.push(sig);
     return this.signatures.length - 1;
 }
 
 WasmModuleBuilder.prototype.addFunction = function(name, sig) {
     var sig_index = (typeof sig) == "number" ? sig : this.addSignature(sig);
     var func = new WasmFunctionBuilder(name, sig_index);
     func.index = this.functions.length;
@@ skipping 58 matching lines @@
     }
 }
 
 function emit_bytes(bytes, data) {
   for (var i = 0; i < data.length; i++) {
     bytes.push(data[i] & 0xff);
   }
 }
 
 function emit_section(bytes, section_code, content_generator) {
-    // Start the section in a temporary buffer: its full length isn't know yet.
+    // Emit section name.
+    emit_string(bytes, section_names[section_code]);
+    // Emit the section to a temporary buffer: its full length isn't know yet.
     var tmp_bytes = [];
-    emit_string(tmp_bytes, section_names[section_code]);
     content_generator(tmp_bytes);
-    // Now that we know the section length, emit it and copy the section.
+    // Emit section length.
     emit_varint(bytes, tmp_bytes.length);
+    // Copy the temporary buffer.
     Array.prototype.push.apply(bytes, tmp_bytes);
 }
 
 WasmModuleBuilder.prototype.toArray = function(debug) {
     // Add header bytes
     var bytes = [];
     bytes = bytes.concat([kWasmH0, kWasmH1, kWasmH2, kWasmH3,
                           kWasmV0, kWasmV1, kWasmV2, kWasmV3]);
 
     var wasm = this;
 
     // Add signatures section
     if (wasm.signatures.length > 0) {
         if (debug) print("emitting signatures @ " + bytes.length);
         emit_section(bytes, kDeclSignatures, function(bytes) {
             emit_varint(bytes, wasm.signatures.length);
             for (sig of wasm.signatures) {
-                var params = sig.length - 1;
-                emit_varint(bytes, params);
+                emit_u8(bytes, kWasmFunctionTypeForm);
                 for (var j = 0; j < sig.length; j++) {
                     emit_u8(bytes, sig[j]);
                 }
             }
         });
     }
 
     // Add imports section
     if (wasm.imports.length > 0) {
         if (debug) print("emitting imports @ " + bytes.length);
@@ skipping 164 matching lines @@
 }
 
 WasmModuleBuilder.prototype.instantiate = function(ffi, memory) {
     var buffer = this.toBuffer();
     if (memory != undefined) {
       return Wasm.instantiateModule(buffer, ffi, memory);
     } else {
       return Wasm.instantiateModule(buffer, ffi);
     }
 }