Refactor module builder
- Use ES6 classes and other goodies. - Make some names match design/spec. - Remove obsolete generation of END section. R=bradnelson@chromium.org BUG= Review-Url: https://codereview.chromium.org/2081973003 Cr-Commit-Position: refs/heads/master@{#37155}
This commit is contained in:
parent
e45fba811f
commit
271a7f55cd
@ -26,12 +26,9 @@ function makeSelect(type, args, which) {
|
||||
}
|
||||
|
||||
var builder = new WasmModuleBuilder();
|
||||
var sig = new Array();
|
||||
sig.push(args);
|
||||
for (var i = 0; i < args; i++) sig.push(type);
|
||||
sig.push(1);
|
||||
sig.push(type);
|
||||
builder.addFunction("select", sig)
|
||||
var params = [];
|
||||
for (var i = 0; i < args; i++) params.push(type);
|
||||
builder.addFunction("select", makeSig(params, [type]))
|
||||
.addBody([kExprGetLocal, which])
|
||||
.exportFunc();
|
||||
|
||||
|
@ -10,7 +10,7 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
|
||||
function testCallFFI(func, check) {
|
||||
var builder = new WasmModuleBuilder();
|
||||
|
||||
var sig_index = builder.addSignature(kSig_i_dd);
|
||||
var sig_index = builder.addType(kSig_i_dd);
|
||||
builder.addImport("func", sig_index);
|
||||
builder.addFunction("main", sig_index)
|
||||
.addBody([
|
||||
|
@ -10,7 +10,7 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
|
||||
function makeFFI(func, t) {
|
||||
var builder = new WasmModuleBuilder();
|
||||
|
||||
var sig_index = builder.addSignature([10,t,t,t,t,t,t,t,t,t,t,1,t]);
|
||||
var sig_index = builder.addType(makeSig([t,t,t,t,t,t,t,t,t,t], [t]));
|
||||
builder.addImport("func", sig_index);
|
||||
// Try to create a frame with lots of spilled values and parameters
|
||||
// on the stack to try to catch GC bugs in the reference maps for
|
||||
@ -76,7 +76,7 @@ function print10(a, b, c, d, e, f, g, h, i) {
|
||||
(function GCInJSToWasmTest() {
|
||||
var builder = new WasmModuleBuilder();
|
||||
|
||||
var sig_index = builder.addSignature([1, kAstI32, 1, kAstI32]);
|
||||
var sig_index = builder.addType(kSig_i_i);
|
||||
builder.addFunction("main", sig_index)
|
||||
.addBody([
|
||||
kExprGetLocal, 0, // --
|
||||
|
@ -10,7 +10,7 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
|
||||
function testCallImport(func, check) {
|
||||
var builder = new WasmModuleBuilder();
|
||||
|
||||
var sig_index = builder.addSignature(kSig_i_dd);
|
||||
var sig_index = builder.addType(kSig_i_dd);
|
||||
builder.addImport("func", sig_index);
|
||||
builder.addFunction("main", sig_index)
|
||||
.addBody([
|
||||
|
@ -10,7 +10,7 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
|
||||
var module = (function () {
|
||||
var builder = new WasmModuleBuilder();
|
||||
|
||||
var sig_index = builder.addSignature(kSig_i_ii);
|
||||
var sig_index = builder.addType(kSig_i_ii);
|
||||
builder.addImport("add", sig_index);
|
||||
builder.addFunction("add", sig_index)
|
||||
.addBody([
|
||||
@ -30,7 +30,7 @@ var module = (function () {
|
||||
kExprCallIndirect, kArity2, sig_index
|
||||
])
|
||||
.exportFunc()
|
||||
builder.appendToFunctionTable([0, 1, 2]);
|
||||
builder.appendToTable([0, 1, 2]);
|
||||
|
||||
return builder.instantiate({add: function(a, b) { return a + b | 0; }});
|
||||
})();
|
||||
|
@ -79,7 +79,7 @@ function testSelect10(t) {
|
||||
print("type = " + t + ", which = " + which);
|
||||
|
||||
var builder = new WasmModuleBuilder();
|
||||
builder.addFunction("select", [10,t,t,t,t,t,t,t,t,t,t,1,t])
|
||||
builder.addFunction("select", makeSig([t,t,t,t,t,t,t,t,t,t], [t]))
|
||||
.addBody([kExprGetLocal, which])
|
||||
.exportFunc();
|
||||
|
||||
|
@ -10,7 +10,7 @@ load("test/mjsunit/wasm/wasm-module-builder.js");
|
||||
function makeFFI(func) {
|
||||
var builder = new WasmModuleBuilder();
|
||||
|
||||
var sig_index = builder.addSignature(kSig_i_dd);
|
||||
var sig_index = builder.addType(kSig_i_dd);
|
||||
builder.addImport("func", sig_index);
|
||||
builder.addFunction("main", sig_index)
|
||||
.addBody([
|
||||
|
@ -65,8 +65,8 @@ assertFails(kSig_i_dd, [kExprGetLocal, 0]);
|
||||
var func = builder.addFunction("", kSig_v_v)
|
||||
.addBody([kExprNop]);
|
||||
|
||||
builder.addExplicitSection([kDeclStartFunction, 0]);
|
||||
builder.addExplicitSection([kDeclStartFunction, 0]);
|
||||
builder.addExplicitSection([kDeclStart, 0]);
|
||||
builder.addExplicitSection([kDeclStart, 0]);
|
||||
|
||||
assertThrows(builder.instantiate);
|
||||
})();
|
||||
@ -98,7 +98,7 @@ assertFails(kSig_i_dd, [kExprGetLocal, 0]);
|
||||
}};
|
||||
|
||||
var builder = new WasmModuleBuilder();
|
||||
var sig_index = builder.addSignature(kSig_v_v);
|
||||
var sig_index = builder.addType(kSig_v_v);
|
||||
|
||||
builder.addImport("foo", sig_index);
|
||||
var func = builder.addFunction("", sig_index)
|
||||
|
@ -91,7 +91,7 @@ var debug = false;
|
||||
.addBody([kExprGetLocal,
|
||||
0, kExprGetLocal, 1, kExprGetLocal, 2, kExprCallIndirect, kArity2, 0])
|
||||
.exportAs("main");
|
||||
module.appendToFunctionTable([0]);
|
||||
module.appendToTable([0]);
|
||||
|
||||
var instance = module.instantiate();
|
||||
assertEquals(44, instance.exports.main(0, 11, 33));
|
||||
|
@ -14,7 +14,7 @@ Error.prepareStackTrace = function(error, frames) {
|
||||
|
||||
var builder = new WasmModuleBuilder();
|
||||
|
||||
var sig_index = builder.addSignature(kSig_i_v)
|
||||
var sig_index = builder.addType(kSig_i_v)
|
||||
|
||||
// Build a function to resemble this code:
|
||||
// if (idx < 2) {
|
||||
|
@ -52,17 +52,17 @@ var kDeclNoLocals = 0;
|
||||
|
||||
// Section declaration constants
|
||||
var kDeclMemory = 0x00;
|
||||
var kDeclSignatures = 0x01;
|
||||
var kDeclTypes = 0x01;
|
||||
var kDeclFunctions = 0x02;
|
||||
var kDeclGlobals = 0x03;
|
||||
var kDeclDataSegments = 0x04;
|
||||
var kDeclFunctionTable = 0x05;
|
||||
var kDeclData = 0x04;
|
||||
var kDeclTable = 0x05;
|
||||
var kDeclEnd = 0x06;
|
||||
var kDeclStartFunction = 0x07;
|
||||
var kDeclImportTable = 0x08;
|
||||
var kDeclExportTable = 0x09;
|
||||
var kDeclFunctionSignatures = 0x0a;
|
||||
var kDeclFunctionBodies = 0x0b;
|
||||
var kDeclStart = 0x07;
|
||||
var kDeclImports = 0x08;
|
||||
var kDeclExports = 0x09;
|
||||
var kDeclFunctions = 0x0a;
|
||||
var kDeclCode = 0x0b;
|
||||
var kDeclNames = 0x0c;
|
||||
|
||||
var kArity0 = 0;
|
||||
@ -90,31 +90,39 @@ var kAstF32 = 3;
|
||||
var kAstF64 = 4;
|
||||
|
||||
// Useful signatures
|
||||
var kSig_i = [0, 1, kAstI32];
|
||||
var kSig_d = [0, 1, kAstF64];
|
||||
var kSig_i_i = [1, kAstI32, 1, kAstI32];
|
||||
var kSig_i_ii = [2, kAstI32, kAstI32, 1, kAstI32];
|
||||
var kSig_i_iii = [3, kAstI32, kAstI32, kAstI32, 1, kAstI32];
|
||||
var kSig_d_dd = [2, kAstF64, kAstF64, 1, kAstF64];
|
||||
var kSig_l_ll = [2, kAstI64, kAstI64, 1, kAstI64];
|
||||
var kSig_i_dd = [2, kAstF64, kAstF64, 1, kAstI32];
|
||||
var kSig_v_v = [0, 0];
|
||||
var kSig_i_v = [0, 1, kAstI32];
|
||||
var kSig_i = makeSig([], [kAstI32]);
|
||||
var kSig_d = makeSig([], [kAstF64]);
|
||||
var kSig_i_i = makeSig([kAstI32], [kAstI32]);
|
||||
var kSig_i_ii = makeSig([kAstI32, kAstI32], [kAstI32]);
|
||||
var kSig_i_iii = makeSig([kAstI32, kAstI32, kAstI32], [kAstI32]);
|
||||
var kSig_d_dd = makeSig([kAstF64, kAstF64], [kAstF64]);
|
||||
var kSig_l_ll = makeSig([kAstI64, kAstI64], [kAstI64]);
|
||||
var kSig_i_dd = makeSig([kAstF64, kAstF64], [kAstI32]);
|
||||
var kSig_v_v = makeSig([], []);
|
||||
var kSig_i_v = makeSig([], [kAstI32]);
|
||||
|
||||
function makeSig_v_xx(x) {
|
||||
return [2, x, x, 0];
|
||||
function makeSig(params, results) {
|
||||
return {params: params, results: results};
|
||||
}
|
||||
|
||||
function makeSig_v_x(x) {
|
||||
return [1, x, 0];
|
||||
return makeSig([x], []);
|
||||
}
|
||||
|
||||
function makeSig_r_xx(r, x) {
|
||||
return [2, x, x, 1, r];
|
||||
function makeSig_v_xx(x) {
|
||||
return makeSig([x, x], []);
|
||||
}
|
||||
|
||||
function makeSig_r_v(r) {
|
||||
return makeSig([], [r]);
|
||||
}
|
||||
|
||||
function makeSig_r_x(r, x) {
|
||||
return [1, x, 1, r];
|
||||
return makeSig([x], [r]);
|
||||
}
|
||||
|
||||
function makeSig_r_xx(r, x) {
|
||||
return makeSig([x, x], [r]);
|
||||
}
|
||||
|
||||
// Opcodes
|
||||
|
@ -2,348 +2,353 @@
|
||||
// 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 = [];
|
||||
}
|
||||
class Binary extends Array {
|
||||
emit_u8(val) {
|
||||
this.push(val);
|
||||
}
|
||||
|
||||
WasmFunctionBuilder.prototype.exportAs = function(name) {
|
||||
this.exports.push(name);
|
||||
return this;
|
||||
}
|
||||
emit_u16(val) {
|
||||
this.push(val & 0xff);
|
||||
this.push((val >> 8) & 0xff);
|
||||
}
|
||||
|
||||
WasmFunctionBuilder.prototype.exportFunc = function() {
|
||||
this.exports.push(this.name);
|
||||
return this;
|
||||
}
|
||||
emit_u32(val) {
|
||||
this.push(val & 0xff);
|
||||
this.push((val >> 8) & 0xff);
|
||||
this.push((val >> 16) & 0xff);
|
||||
this.push((val >> 24) & 0xff);
|
||||
}
|
||||
|
||||
WasmFunctionBuilder.prototype.addBody = function(body) {
|
||||
this.body = body;
|
||||
return this;
|
||||
}
|
||||
emit_varint(val) {
|
||||
while (true) {
|
||||
let v = val & 0xff;
|
||||
val = val >>> 7;
|
||||
if (val == 0) {
|
||||
this.push(v);
|
||||
break;
|
||||
}
|
||||
this.push(v | 0x80);
|
||||
}
|
||||
}
|
||||
|
||||
WasmFunctionBuilder.prototype.addLocals = function(locals) {
|
||||
this.locals = locals;
|
||||
return this;
|
||||
}
|
||||
emit_bytes(data) {
|
||||
for (let i = 0; i < data.length; i++) {
|
||||
this.push(data[i] & 0xff);
|
||||
}
|
||||
}
|
||||
|
||||
function WasmModuleBuilder() {
|
||||
this.signatures = [];
|
||||
this.imports = [];
|
||||
this.functions = [];
|
||||
this.exports = [];
|
||||
this.function_table = [];
|
||||
this.data_segments = [];
|
||||
this.explicit = [];
|
||||
return this;
|
||||
}
|
||||
|
||||
WasmModuleBuilder.prototype.addStart = function(start_index) {
|
||||
this.start_index = start_index;
|
||||
}
|
||||
|
||||
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 [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;
|
||||
this.functions.push(func);
|
||||
return func;
|
||||
}
|
||||
|
||||
WasmModuleBuilder.prototype.addImportWithModule = function(module, name, sig) {
|
||||
var sig_index = (typeof sig) == "number" ? sig : this.addSignature(sig);
|
||||
this.imports.push({module: module, name: name, sig_index: sig_index});
|
||||
return this.imports.length - 1;
|
||||
}
|
||||
|
||||
WasmModuleBuilder.prototype.addImport = function(name, sig) {
|
||||
this.addImportWithModule(name, undefined, sig);
|
||||
}
|
||||
|
||||
WasmModuleBuilder.prototype.addDataSegment = function(addr, data, init) {
|
||||
this.data_segments.push({addr: addr, data: data, init: init});
|
||||
return this.data_segments.length - 1;
|
||||
}
|
||||
|
||||
WasmModuleBuilder.prototype.appendToFunctionTable = function(array) {
|
||||
this.function_table = this.function_table.concat(array);
|
||||
return this;
|
||||
}
|
||||
|
||||
function emit_u8(bytes, val) {
|
||||
bytes.push(val & 0xff);
|
||||
}
|
||||
|
||||
function emit_u16(bytes, val) {
|
||||
bytes.push(val & 0xff);
|
||||
bytes.push((val >> 8) & 0xff);
|
||||
}
|
||||
|
||||
function emit_u32(bytes, val) {
|
||||
bytes.push(val & 0xff);
|
||||
bytes.push((val >> 8) & 0xff);
|
||||
bytes.push((val >> 16) & 0xff);
|
||||
bytes.push((val >> 24) & 0xff);
|
||||
}
|
||||
|
||||
function emit_string(bytes, string) {
|
||||
emit_string(string) {
|
||||
// When testing illegal names, we pass a byte array directly.
|
||||
if (string instanceof Array) {
|
||||
emit_varint(bytes, string.length);
|
||||
emit_bytes(bytes, string);
|
||||
this.emit_varint(string.length);
|
||||
this.emit_bytes(string);
|
||||
return;
|
||||
}
|
||||
|
||||
// This is the hacky way to convert a JavaScript scring to a UTF8 encoded
|
||||
// This is the hacky way to convert a JavaScript string to a UTF8 encoded
|
||||
// string only containing single-byte characters.
|
||||
var string_utf8 = unescape(encodeURIComponent(string));
|
||||
emit_varint(bytes, string_utf8.length);
|
||||
for (var i = 0; i < string_utf8.length; i++) {
|
||||
emit_u8(bytes, string_utf8.charCodeAt(i));
|
||||
let string_utf8 = unescape(encodeURIComponent(string));
|
||||
this.emit_varint(string_utf8.length);
|
||||
for (let i = 0; i < string_utf8.length; i++) {
|
||||
this.emit_u8(string_utf8.charCodeAt(i));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function emit_varint(bytes, val) {
|
||||
while (true) {
|
||||
var v = val & 0xff;
|
||||
val = val >>> 7;
|
||||
if (val == 0) {
|
||||
bytes.push(v);
|
||||
break;
|
||||
}
|
||||
bytes.push(v | 0x80);
|
||||
}
|
||||
}
|
||||
emit_header() {
|
||||
this.push(kWasmH0, kWasmH1, kWasmH2, kWasmH3,
|
||||
kWasmV0, kWasmV1, kWasmV2, kWasmV3);
|
||||
}
|
||||
|
||||
function emit_bytes(bytes, data) {
|
||||
for (var i = 0; i < data.length; i++) {
|
||||
bytes.push(data[i] & 0xff);
|
||||
emit_section(section_code, content_generator) {
|
||||
// Emit section name.
|
||||
this.emit_string(section_names[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);
|
||||
}
|
||||
}
|
||||
|
||||
function emit_section(bytes, section_code, content_generator) {
|
||||
// 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 = [];
|
||||
content_generator(tmp_bytes);
|
||||
// Emit section length.
|
||||
emit_varint(bytes, tmp_bytes.length);
|
||||
// Copy the temporary buffer.
|
||||
Array.prototype.push.apply(bytes, tmp_bytes);
|
||||
class WasmFunctionBuilder {
|
||||
constructor(name, type_index) {
|
||||
this.name = name;
|
||||
this.type_index = type_index;
|
||||
this.exports = [];
|
||||
}
|
||||
|
||||
exportAs(name) {
|
||||
this.exports.push(name);
|
||||
return this;
|
||||
}
|
||||
|
||||
exportFunc() {
|
||||
this.exports.push(this.name);
|
||||
return this;
|
||||
}
|
||||
|
||||
addBody(body) {
|
||||
this.body = body;
|
||||
return this;
|
||||
}
|
||||
|
||||
addLocals(locals) {
|
||||
this.locals = locals;
|
||||
return this;
|
||||
}
|
||||
}
|
||||
|
||||
WasmModuleBuilder.prototype.toArray = function(debug) {
|
||||
// Add header bytes
|
||||
var bytes = [];
|
||||
bytes = bytes.concat([kWasmH0, kWasmH1, kWasmH2, kWasmH3,
|
||||
kWasmV0, kWasmV1, kWasmV2, kWasmV3]);
|
||||
class WasmModuleBuilder {
|
||||
constructor() {
|
||||
this.types = [];
|
||||
this.imports = [];
|
||||
this.functions = [];
|
||||
this.exports = [];
|
||||
this.table = [];
|
||||
this.segments = [];
|
||||
this.explicit = [];
|
||||
}
|
||||
|
||||
var wasm = this;
|
||||
addStart(start_index) {
|
||||
this.start_index = start_index;
|
||||
}
|
||||
|
||||
// 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) {
|
||||
emit_u8(bytes, kWasmFunctionTypeForm);
|
||||
for (var j = 0; j < sig.length; j++) {
|
||||
emit_u8(bytes, sig[j]);
|
||||
}
|
||||
}
|
||||
});
|
||||
addMemory(min, max, exp) {
|
||||
this.memory = {min: min, max: max, exp: exp};
|
||||
return this;
|
||||
}
|
||||
|
||||
addExplicitSection(bytes) {
|
||||
this.explicit.push(bytes);
|
||||
return this;
|
||||
}
|
||||
|
||||
addType(type) {
|
||||
// TODO: canonicalize types?
|
||||
this.types.push(type);
|
||||
return this.types.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;
|
||||
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;
|
||||
}
|
||||
|
||||
addImport(name, type) {
|
||||
return this.addImportWithModule(name, undefined, type);
|
||||
}
|
||||
|
||||
addDataSegment(addr, data, init) {
|
||||
this.segments.push({addr: addr, data: data, init: init});
|
||||
return this.segments.length - 1;
|
||||
}
|
||||
|
||||
appendToTable(array) {
|
||||
this.table.push(...array);
|
||||
return this;
|
||||
}
|
||||
|
||||
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 => {
|
||||
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);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Add imports section
|
||||
if (wasm.imports.length > 0) {
|
||||
if (debug) print("emitting imports @ " + bytes.length);
|
||||
emit_section(bytes, kDeclImportTable, function(bytes) {
|
||||
emit_varint(bytes, wasm.imports.length);
|
||||
for (imp of wasm.imports) {
|
||||
emit_varint(bytes, imp.sig_index);
|
||||
emit_string(bytes, imp.module);
|
||||
emit_string(bytes, imp.name || '');
|
||||
}
|
||||
});
|
||||
if (debug) print("emitting imports @ " + binary.length);
|
||||
binary.emit_section(kDeclImports, 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 || '');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Add functions declarations
|
||||
var names = false;
|
||||
var exports = 0;
|
||||
let has_names = false;
|
||||
let names = false;
|
||||
let exports = 0;
|
||||
if (wasm.functions.length > 0) {
|
||||
var has_names = false;
|
||||
|
||||
// emit function signatures
|
||||
if (debug) print("emitting function sigs @ " + bytes.length);
|
||||
emit_section(bytes, kDeclFunctionSignatures, function(bytes) {
|
||||
emit_varint(bytes, wasm.functions.length);
|
||||
for (func of wasm.functions) {
|
||||
has_names = has_names || (func.name != undefined &&
|
||||
func.name.length > 0);
|
||||
exports += func.exports.length;
|
||||
|
||||
emit_varint(bytes, func.sig_index);
|
||||
}
|
||||
});
|
||||
|
||||
if (debug) print("emitting function decls @ " + binary.length);
|
||||
binary.emit_section(kDeclFunctions, 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 function table.
|
||||
if (wasm.function_table.length > 0) {
|
||||
if (debug) print("emitting function table @ " + bytes.length);
|
||||
emit_section(bytes, kDeclFunctionTable, function(bytes) {
|
||||
emit_varint(bytes, wasm.function_table.length);
|
||||
for (index of wasm.function_table) {
|
||||
emit_varint(bytes, index);
|
||||
}
|
||||
});
|
||||
// Add table.
|
||||
if (wasm.table.length > 0) {
|
||||
if (debug) print("emitting table @ " + binary.length);
|
||||
binary.emit_section(kDeclTable, section => {
|
||||
section.emit_varint(wasm.table.length);
|
||||
for (let index of wasm.table) {
|
||||
section.emit_varint(index);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Add memory section
|
||||
if (wasm.memory != undefined) {
|
||||
if (debug) print("emitting memory @ " + bytes.length);
|
||||
emit_section(bytes, kDeclMemory, function(bytes) {
|
||||
emit_varint(bytes, wasm.memory.min);
|
||||
emit_varint(bytes, wasm.memory.max);
|
||||
emit_u8(bytes, wasm.memory.exp ? 1 : 0);
|
||||
});
|
||||
if (debug) print("emitting memory @ " + binary.length);
|
||||
binary.emit_section(kDeclMemory, section => {
|
||||
section.emit_varint(wasm.memory.min);
|
||||
section.emit_varint(wasm.memory.max);
|
||||
section.emit_u8(wasm.memory.exp ? 1 : 0);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
// Add export table.
|
||||
if (exports > 0) {
|
||||
if (debug) print("emitting exports @ " + bytes.length);
|
||||
emit_section(bytes, kDeclExportTable, function(bytes) {
|
||||
emit_varint(bytes, exports);
|
||||
for (func of wasm.functions) {
|
||||
for (exp of func.exports) {
|
||||
emit_varint(bytes, func.index);
|
||||
emit_string(bytes, exp);
|
||||
}
|
||||
}
|
||||
});
|
||||
if (debug) print("emitting exports @ " + binary.length);
|
||||
binary.emit_section(kDeclExports, section => {
|
||||
section.emit_varint(exports);
|
||||
for (let func of wasm.functions) {
|
||||
for (let exp of func.exports) {
|
||||
section.emit_varint(func.index);
|
||||
section.emit_string(exp);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Add start function section.
|
||||
if (wasm.start_index != undefined) {
|
||||
if (debug) print("emitting start function @ " + bytes.length);
|
||||
emit_section(bytes, kDeclStartFunction, function(bytes) {
|
||||
emit_varint(bytes, wasm.start_index);
|
||||
});
|
||||
if (debug) print("emitting start function @ " + binary.length);
|
||||
binary.emit_section(kDeclStart, section => {
|
||||
section.emit_varint(wasm.start_index);
|
||||
});
|
||||
}
|
||||
|
||||
// Add function bodies.
|
||||
if (wasm.functions.length > 0) {
|
||||
// emit function bodies
|
||||
if (debug) print("emitting function bodies @ " + bytes.length);
|
||||
emit_section(bytes, kDeclFunctionBodies, function(bytes) {
|
||||
emit_varint(bytes, wasm.functions.length);
|
||||
for (func of wasm.functions) {
|
||||
// Function body length will be patched later.
|
||||
var local_decls = [];
|
||||
var l = func.locals;
|
||||
if (l != undefined) {
|
||||
var local_decls_count = 0;
|
||||
if (l.i32_count > 0) {
|
||||
local_decls.push({count: l.i32_count, type: kAstI32});
|
||||
}
|
||||
if (l.i64_count > 0) {
|
||||
local_decls.push({count: l.i64_count, type: kAstI64});
|
||||
}
|
||||
if (l.f32_count > 0) {
|
||||
local_decls.push({count: l.f32_count, type: kAstF32});
|
||||
}
|
||||
if (l.f64_count > 0) {
|
||||
local_decls.push({count: l.f64_count, type: kAstF64});
|
||||
}
|
||||
}
|
||||
var header = new Array();
|
||||
|
||||
emit_varint(header, local_decls.length);
|
||||
for (decl of local_decls) {
|
||||
emit_varint(header, decl.count);
|
||||
emit_u8(header, decl.type);
|
||||
}
|
||||
|
||||
emit_varint(bytes, header.length + func.body.length);
|
||||
emit_bytes(bytes, header);
|
||||
emit_bytes(bytes, func.body);
|
||||
// emit function bodies
|
||||
if (debug) print("emitting code @ " + binary.length);
|
||||
binary.emit_section(kDeclCode, 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});
|
||||
}
|
||||
});
|
||||
if (l.i64_count > 0) {
|
||||
local_decls.push({count: l.i64_count, type: kAstI64});
|
||||
}
|
||||
if (l.f32_count > 0) {
|
||||
local_decls.push({count: l.f32_count, type: kAstF32});
|
||||
}
|
||||
if (l.f64_count > 0) {
|
||||
local_decls.push({count: l.f64_count, type: kAstF64});
|
||||
}
|
||||
}
|
||||
|
||||
let header = new Binary;
|
||||
header.emit_varint(local_decls.length);
|
||||
for (let decl of local_decls) {
|
||||
header.emit_varint(decl.count);
|
||||
header.emit_u8(decl.type);
|
||||
}
|
||||
|
||||
section.emit_varint(header.length + func.body.length);
|
||||
section.emit_bytes(header);
|
||||
section.emit_bytes(func.body);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Add data segments.
|
||||
if (wasm.data_segments.length > 0) {
|
||||
if (debug) print("emitting data segments @ " + bytes.length);
|
||||
emit_section(bytes, kDeclDataSegments, function(bytes) {
|
||||
emit_varint(bytes, wasm.data_segments.length);
|
||||
for (seg of wasm.data_segments) {
|
||||
emit_varint(bytes, seg.addr);
|
||||
emit_varint(bytes, seg.data.length);
|
||||
emit_bytes(bytes, seg.data);
|
||||
}
|
||||
});
|
||||
if (wasm.segments.length > 0) {
|
||||
if (debug) print("emitting data segments @ " + binary.length);
|
||||
binary.emit_section(kDeclData, section => {
|
||||
section.emit_varint(wasm.segments.length);
|
||||
for (let seg of wasm.segments) {
|
||||
section.emit_varint(seg.addr);
|
||||
section.emit_varint(seg.data.length);
|
||||
section.emit_bytes(seg.data);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Add any explicitly added sections
|
||||
for (exp of wasm.explicit) {
|
||||
if (debug) print("emitting explicit @ " + bytes.length);
|
||||
emit_bytes(bytes, exp);
|
||||
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 @ " + bytes.length);
|
||||
emit_section(bytes, kDeclNames, function(bytes) {
|
||||
emit_varint(bytes, wasm.functions.length);
|
||||
for (func of wasm.functions) {
|
||||
var name = func.name == undefined ? "" : func.name;
|
||||
emit_string(bytes, name);
|
||||
emit_u8(bytes, 0); // local names count == 0
|
||||
}
|
||||
});
|
||||
if (debug) print("emitting names @ " + binary.length);
|
||||
binary.emit_section(kDeclNames, 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
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// End the module.
|
||||
if (debug) print("emitting end @ " + bytes.length);
|
||||
emit_section(bytes, kDeclEnd, function(bytes) {});
|
||||
return binary;
|
||||
}
|
||||
|
||||
return bytes;
|
||||
}
|
||||
|
||||
WasmModuleBuilder.prototype.toBuffer = function(debug) {
|
||||
var bytes = this.toArray(debug);
|
||||
var buffer = new ArrayBuffer(bytes.length);
|
||||
var view = new Uint8Array(buffer);
|
||||
for (var i = 0; i < bytes.length; i++) {
|
||||
var val = bytes[i];
|
||||
if ((typeof val) == "string") val = val.charCodeAt(0);
|
||||
view[i] = val | 0;
|
||||
toBuffer(debug) {
|
||||
let bytes = this.toArray(debug);
|
||||
let buffer = new ArrayBuffer(bytes.length);
|
||||
let view = new Uint8Array(buffer);
|
||||
for (let i = 0; i < bytes.length; i++) {
|
||||
let val = bytes[i];
|
||||
if ((typeof val) == "string") val = val.charCodeAt(0);
|
||||
view[i] = val | 0;
|
||||
}
|
||||
return buffer;
|
||||
}
|
||||
}
|
||||
|
||||
WasmModuleBuilder.prototype.instantiate = function(...args) {
|
||||
var module = new WebAssembly.Module(this.toBuffer());
|
||||
var instance = new WebAssembly.Instance(module, ...args);
|
||||
return instance;
|
||||
instantiate(...args) {
|
||||
let module = new WebAssembly.Module(this.toBuffer());
|
||||
let instance = new WebAssembly.Instance(module, ...args);
|
||||
return instance;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user