[wasm] Master CL for Binary 0xC 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.
 
 class Binary extends Array {
   emit_u8(val) {
     this.push(val);
   }
 
   emit_u16(val) {
@@ skipping 43 matching lines @@
     }
   }
 
   emit_header() {
     this.push(kWasmH0, kWasmH1, kWasmH2, kWasmH3,
               kWasmV0, kWasmV1, kWasmV2, kWasmV3);
   }
 
   emit_section(section_code, content_generator) {
     // Emit section name.
-    this.emit_string(section_names[section_code]);
+    if (section_code == kNameSectionCode) {
+      this.emit_u8(kUnknownSectionCode);
+      this.emit_string("name");
+    } else {
+      this.emit_u8(section_code);
+    }
     // Emit the section to a temporary buffer: its full length isn't know yet.
     let section = new Binary;
     content_generator(section);
     // Emit section length.
     this.emit_varint(section.length);
     // Copy the temporary buffer.
     this.push(...section);
   }
 }
 
@@ skipping 65 matching lines @@
   }
 
   addGlobal(local_type) {
     this.globals.push(local_type);
     return this.globals.length - 1;
   }
 
   addFunction(name, type) {
     let type_index = (typeof type) == "number" ? type : this.addType(type);
     let func = new WasmFunctionBuilder(name, type_index);
-    func.index = this.functions.length;
+    func.index = this.functions.length + this.imports.length;
     this.functions.push(func);
     return func;
   }
 
   addImportWithModule(module, name, type) {
     let type_index = (typeof type) == "number" ? type : this.addType(type);
     this.imports.push({module: module, name: name, type: type_index});
     return this.imports.length - 1;
   }
 
@@ skipping 14 matching lines @@
   toArray(debug) {
     let binary = new Binary;
     let wasm = this;
 
     // Add header
     binary.emit_header();
 
     // Add type section
     if (wasm.types.length > 0) {
       if (debug) print("emitting types @ " + binary.length);
-      binary.emit_section(kDeclTypes, section => {
+      binary.emit_section(kTypeSectionCode, section => {
         section.emit_varint(wasm.types.length);
         for (let type of wasm.types) {
           section.emit_u8(kWasmFunctionTypeForm);
           section.emit_varint(type.params.length);
           for (let param of type.params) {
             section.emit_u8(param);
           }
           section.emit_varint(type.results.length);
           for (let result of type.results) {
             section.emit_u8(result);
           }
         }
       });
     }
 
-    if (wasm.globals.length > 0) {
-      if (debug) print ("emitting globals @ " + binary.length);
-      binary.emit_section(kDeclGlobals, section => {
-        section.emit_varint(wasm.globals.length);
-        for (let global_type of wasm.globals) {
-          section.emit_varint(0);  // length of global name
-          section.emit_u8(global_type);
-          section.emit_u8(false);  // we do not support exported globals
-        }
-      });
-    }
-
     // Add imports section
     if (wasm.imports.length > 0) {
       if (debug) print("emitting imports @ " + binary.length);
-      binary.emit_section(kDeclImports, section => {
+      binary.emit_section(kImportSectionCode, section => {
         section.emit_varint(wasm.imports.length);
         for (let imp of wasm.imports) {
-          section.emit_varint(imp.type);
           section.emit_string(imp.module);
           section.emit_string(imp.name || '');
+          section.emit_u8(kExternalFunction);
+          section.emit_varint(imp.type);
         }
       });
     }
 
     // Add functions declarations
     let has_names = false;
     let names = false;
     let exports = 0;
     if (wasm.functions.length > 0) {
       if (debug) print("emitting function decls @ " + binary.length);
-      binary.emit_section(kDeclFunctions, section => {
+      binary.emit_section(kFunctionSectionCode, section => {
         section.emit_varint(wasm.functions.length);
         for (let func of wasm.functions) {
           has_names = has_names || (func.name != undefined &&
                                    func.name.length > 0);
           exports += func.exports.length;
           section.emit_varint(func.type_index);
         }
       });
     }
 
     // Add table.
     if (wasm.table.length > 0) {
       if (debug) print("emitting table @ " + binary.length);
-      binary.emit_section(kDeclTable, section => {
+      binary.emit_section(kTableSectionCode, section => {
+        section.emit_u8(1);  // one table entry
+        section.emit_u8(kWasmAnyFunctionTypeForm);
+        section.emit_u8(1);
         section.emit_varint(wasm.table.length);
-        if (wasm.pad !== null) {
-          if (debug) print("emitting table padding @ " + binary.length);
-          section.emit_varint(wasm.pad);
-        }
-        for (let index of wasm.table) {
-          section.emit_varint(index);
-        }
+        section.emit_varint(wasm.table.length);
       });
     }
 
     // Add memory section
     if (wasm.memory != undefined) {
       if (debug) print("emitting memory @ " + binary.length);
-      binary.emit_section(kDeclMemory, section => {
+      binary.emit_section(kMemorySectionCode, section => {
+        section.emit_u8(1);  // one memory entry
+        section.emit_varint(kResizableMaximumFlag);
         section.emit_varint(wasm.memory.min);
         section.emit_varint(wasm.memory.max);
-        section.emit_u8(wasm.memory.exp ? 1 : 0);
       });
     }
 
+    // Add global section.
+    if (wasm.globals.length > 0) {
+      if (debug) print ("emitting globals @ " + binary.length);
+      binary.emit_section(kGlobalSectionCode, section => {
+        section.emit_varint(wasm.globals.length);
+        for (let global_type of wasm.globals) {
+          section.emit_u8(global_type);
+          section.emit_u8(true);  // mutable
+          switch (global_type) {

[ahaas, 2016/09/19 11:02:38]

What about kGlobalIndex? Isn't that also a potential global_type?

[titzer, 2016/09/19 11:37:03]

Ah, kGlobalIndex is a member of the WasmExternalKind enum (i.e. it is used in
import and export entries). JavaScript's weak typing doesn't make this obvious,
but it's clearer in wasm-module.h.

+            case kAstI32:
+              section.emit_u8(kExprI32Const);
+              section.emit_u8(0);
+              break;
+            case kAstI64:
+              section.emit_u8(kExprI64Const);
+              section.emit_u8(0);
+              break;
+            case kAstF32:
+              section.emit_u8(kExprF32Const);
+              section.emit_u32(0);
+              break;
+            case kAstF64:
+              section.emit_u8(kExprI32Const);
+              section.emit_u32(0);
+              section.emit_u32(0);
+              break;
+          }
+          section.emit_u8(kExprEnd);  // end of init expression
+        }
+      });
+    }
 
     // Add export table.
-    if (exports > 0) {
+    var mem_export = (wasm.memory != undefined && wasm.memory.exp);
+    if (exports > 0 || mem_export) {
       if (debug) print("emitting exports @ " + binary.length);
-      binary.emit_section(kDeclExports, section => {
-        section.emit_varint(exports);
+      binary.emit_section(kExportSectionCode, section => {
+        section.emit_varint(exports + (mem_export ? 1 : 0));
         for (let func of wasm.functions) {
           for (let exp of func.exports) {
+            section.emit_string(exp);
+            section.emit_u8(kExternalFunction);
             section.emit_varint(func.index);
-            section.emit_string(exp);
           }
         }
+        if (mem_export) {
+          section.emit_string("memory");
+          section.emit_u8(kExternalMemory);
+          section.emit_u8(0);
+        }
       });
     }
 
     // Add start function section.
     if (wasm.start_index != undefined) {
       if (debug) print("emitting start function @ " + binary.length);
-      binary.emit_section(kDeclStart, section => {
+      binary.emit_section(kStartSectionCode, section => {
         section.emit_varint(wasm.start_index);
       });
     }
 
+    // Add table elements.
+    if (wasm.table.length > 0) {
+      if (debug) print("emitting table @ " + binary.length);
+      binary.emit_section(kElementSectionCode, section => {
+        section.emit_u8(1);
+        section.emit_u8(0); // table index
+        section.emit_u8(kExprI32Const);
+        section.emit_u8(0);
+        section.emit_u8(kExprEnd);
+        section.emit_varint(wasm.table.length);
+        for (let index of wasm.table) {
+          section.emit_varint(index);
+        }
+      });
+    }
+
     // Add function bodies.
     if (wasm.functions.length > 0) {
       // emit function bodies
       if (debug) print("emitting code @ " + binary.length);
-      binary.emit_section(kDeclCode, section => {
+      binary.emit_section(kCodeSectionCode, section => {
         section.emit_varint(wasm.functions.length);
         for (let func of wasm.functions) {
           // Function body length will be patched later.
           let local_decls = [];
           let l = func.locals;
           if (l != undefined) {
             let local_decls_count = 0;
             if (l.i32_count > 0) {
               local_decls.push({count: l.i32_count, type: kAstI32});
             }
@@ skipping 18 matching lines @@
           section.emit_varint(header.length + func.body.length);
           section.emit_bytes(header);
           section.emit_bytes(func.body);
         }
       });
     }
 
     // Add data segments.
     if (wasm.segments.length > 0) {
       if (debug) print("emitting data segments @ " + binary.length);
-      binary.emit_section(kDeclData, section => {
+      binary.emit_section(kDataSectionCode, section => {
         section.emit_varint(wasm.segments.length);
         for (let seg of wasm.segments) {
+          section.emit_u8(0);  // linear memory index 0
+          section.emit_u8(kExprI32Const);
           section.emit_varint(seg.addr);
+          section.emit_u8(kExprEnd);
           section.emit_varint(seg.data.length);
           section.emit_bytes(seg.data);
         }
       });
     }
 
     // Add any explicitly added sections
     for (let exp of wasm.explicit) {
       if (debug) print("emitting explicit @ " + binary.length);
       binary.emit_bytes(exp);
     }
 
     // Add function names.
     if (has_names) {
       if (debug) print("emitting names @ " + binary.length);
-      binary.emit_section(kDeclNames, section => {
+      binary.emit_section(kNameSectionCode, section => {
         section.emit_varint(wasm.functions.length);
         for (let func of wasm.functions) {
           var name = func.name == undefined ? "" : func.name;
           section.emit_string(name);
           section.emit_u8(0);  // local names count == 0
         }
       });
     }
 
     return binary;
@@ skipping 10 matching lines @@
     }
     return buffer;
   }
 
   instantiate(...args) {
     let module = new WebAssembly.Module(this.toBuffer());
     let instance = new WebAssembly.Instance(module, ...args);
     return instance;
   }
 }