72dd5738a6
This reverts commite79d4f06fd
. Reason for revert: Fixed compile error Original change's description: > Revert "[wasm] Move the ModuleEnv to compiler and make it immutable." > > This reverts commitd04660db3f
. > > Reason for revert: Suspect for blocking the roll: > https://chromium-review.googlesource.com/c/621191 > > See: > https://build.chromium.org/p/tryserver.chromium.win/builders/win_optional_gpu_tests_rel/builds/13583 > > Original change's description: > > [wasm] Move the ModuleEnv to compiler and make it immutable. > > > > This CL (finally) makes the contract between the compiler and the module > > environment clear. In order to compile a function, the caller must provide > > an instance of the compiler::ModuleEnv struct, which contains references > > to code, function and signature tables, memory start, etc. > > > > R=mtrofin@chromium.org,ahaas@chromium.org > > > > Bug: > > Change-Id: I68e44d5da2c5ad44dad402029c2e57f2d5d25b4f > > Reviewed-on: https://chromium-review.googlesource.com/613880 > > Reviewed-by: Mircea Trofin <mtrofin@chromium.org> > > Reviewed-by: Andreas Haas <ahaas@chromium.org> > > Commit-Queue: Ben Titzer <titzer@chromium.org> > > Cr-Commit-Position: refs/heads/master@{#47418} > > TBR=titzer@chromium.org,mtrofin@chromium.org,ahaas@chromium.org > > Change-Id: I60a369a43121720fbb13ea6c2ec6ca948d60a20b > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/622547 > Commit-Queue: Michael Achenbach <machenbach@chromium.org> > Reviewed-by: Michael Achenbach <machenbach@chromium.org> > Cr-Commit-Position: refs/heads/master@{#47451} TBR=machenbach@chromium.org,titzer@chromium.org,mtrofin@chromium.org,ahaas@chromium.org Change-Id: Ie0efa6204c41b2cb672586a7ac0a622ca13ce5fe No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/622033 Commit-Queue: Mircea Trofin <mtrofin@chromium.org> Reviewed-by: Mircea Trofin <mtrofin@chromium.org> Cr-Commit-Position: refs/heads/master@{#47453}
167 lines
5.4 KiB
JavaScript
167 lines
5.4 KiB
JavaScript
// 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
|
|
|
|
load('test/mjsunit/wasm/wasm-constants.js');
|
|
load('test/mjsunit/wasm/wasm-module-builder.js');
|
|
|
|
var debug = true;
|
|
|
|
function instantiate(buffer, ffi) {
|
|
return new WebAssembly.Instance(WebAssembly.Module(buffer), ffi);
|
|
}
|
|
|
|
(function BasicTest() {
|
|
print("BasicTest");
|
|
let builder = new WasmModuleBuilder();
|
|
builder.addMemory(1, 2, false);
|
|
builder.addFunction("foo", kSig_i_v)
|
|
.addBody([kExprI32Const, 11])
|
|
.exportAs("blarg");
|
|
|
|
var buffer = builder.toBuffer(debug);
|
|
var instance = instantiate(buffer);
|
|
assertEquals(11, instance.exports.blarg());
|
|
})();
|
|
|
|
(function ImportTest() {
|
|
print("ImportTest");
|
|
let builder = new WasmModuleBuilder();
|
|
var index = builder.addImport("", "print", makeSig_v_x(kWasmI32));
|
|
builder.addFunction("foo", kSig_v_v)
|
|
.addBody([kExprI32Const, 13, kExprCallFunction, index])
|
|
.exportAs("main");
|
|
|
|
var buffer = builder.toBuffer(debug);
|
|
var instance = instantiate(buffer, {"": {print: print}});
|
|
print("should print 13! ");
|
|
instance.exports.main();
|
|
})();
|
|
|
|
(function LocalsTest() {
|
|
print("LocalsTest");
|
|
let builder = new WasmModuleBuilder();
|
|
builder.addFunction(undefined, kSig_i_i)
|
|
.addLocals({i32_count: 1})
|
|
.addBody([kExprGetLocal, 0, kExprSetLocal, 1, kExprGetLocal, 1])
|
|
.exportAs("main");
|
|
|
|
var buffer = builder.toBuffer(debug);
|
|
var instance = instantiate(buffer);
|
|
assertEquals(19, instance.exports.main(19));
|
|
assertEquals(27777, instance.exports.main(27777));
|
|
})();
|
|
|
|
(function LocalsTest2() {
|
|
print("LocalsTest2");
|
|
// TODO(titzer): i64 only works on 64-bit platforms.
|
|
var types = [
|
|
{locals: {i32_count: 1}, type: kWasmI32},
|
|
// {locals: {i64_count: 1}, type: kWasmI64},
|
|
{locals: {f32_count: 1}, type: kWasmF32},
|
|
{locals: {f64_count: 1}, type: kWasmF64},
|
|
];
|
|
|
|
for (p of types) {
|
|
let builder = new WasmModuleBuilder();
|
|
builder.addFunction(undefined, makeSig_r_x(p.type, p.type))
|
|
.addLocals(p.locals)
|
|
.addBody([kExprGetLocal, 0, kExprSetLocal, 1, kExprGetLocal, 1])
|
|
.exportAs("main");
|
|
|
|
var buffer = builder.toBuffer(debug);
|
|
var instance = instantiate(buffer);
|
|
assertEquals(19, instance.exports.main(19));
|
|
assertEquals(27777, instance.exports.main(27777));
|
|
}
|
|
})();
|
|
|
|
(function CallTest() {
|
|
print("CallTest");
|
|
let builder = new WasmModuleBuilder();
|
|
builder.addFunction("add", kSig_i_ii)
|
|
.addBody([kExprGetLocal, 0, kExprGetLocal, 1, kExprI32Add]);
|
|
builder.addFunction("main", kSig_i_ii)
|
|
.addBody([kExprGetLocal, 0, kExprGetLocal, 1, kExprCallFunction, 0])
|
|
.exportAs("main");
|
|
|
|
var instance = builder.instantiate();
|
|
assertEquals(44, instance.exports.main(11, 33));
|
|
assertEquals(7777, instance.exports.main(2222, 5555));
|
|
})();
|
|
|
|
(function IndirectCallTest() {
|
|
print("IndirectCallTest");
|
|
let builder = new WasmModuleBuilder();
|
|
builder.addFunction("add", kSig_i_ii)
|
|
.addBody([kExprGetLocal, 0, kExprGetLocal, 1, kExprI32Add]);
|
|
builder.addFunction("main", kSig_i_iii)
|
|
.addBody([kExprGetLocal,
|
|
1, kExprGetLocal, 2, kExprGetLocal, 0, kExprCallIndirect, 0, kTableZero])
|
|
.exportAs("main");
|
|
builder.appendToTable([0]);
|
|
|
|
var instance = builder.instantiate();
|
|
assertEquals(44, instance.exports.main(0, 11, 33));
|
|
assertEquals(7777, instance.exports.main(0, 2222, 5555));
|
|
assertThrows(function() { instance.exports.main(1, 1, 1); });
|
|
})();
|
|
|
|
(function DataSegmentTest() {
|
|
print("DataSegmentTest");
|
|
let builder = new WasmModuleBuilder();
|
|
builder.addMemory(1, 1, false);
|
|
builder.addFunction("load", kSig_i_i)
|
|
.addBody([kExprGetLocal, 0, kExprI32LoadMem, 0, 0])
|
|
.exportAs("load");
|
|
builder.addDataSegment(0, [9, 9, 9, 9]);
|
|
|
|
var buffer = builder.toBuffer(debug);
|
|
var instance = instantiate(buffer);
|
|
assertEquals(151587081, instance.exports.load(0));
|
|
})();
|
|
|
|
|
|
(function BasicTestWithUint8Array() {
|
|
print("BasicTestWithUint8Array");
|
|
let builder = new WasmModuleBuilder();
|
|
builder.addMemory(1, 2, false);
|
|
builder.addFunction("foo", kSig_i_v)
|
|
.addBody([kExprI32Const, 17])
|
|
.exportAs("blarg");
|
|
|
|
var buffer = builder.toBuffer(debug);
|
|
var array = new Uint8Array(buffer);
|
|
var instance = instantiate(array);
|
|
assertEquals(17, instance.exports.blarg());
|
|
|
|
var kPad = 5;
|
|
var buffer2 = new ArrayBuffer(kPad + buffer.byteLength + kPad);
|
|
var whole = new Uint8Array(buffer2);
|
|
for (var i = 0; i < whole.byteLength; i++) {
|
|
whole[i] = 0xff;
|
|
}
|
|
var array2 = new Uint8Array(buffer2, kPad, buffer.byteLength);
|
|
for (var i = 0; i < array2.byteLength; i++) {
|
|
array2[i] = array[i];
|
|
}
|
|
var instance = instantiate(array2);
|
|
assertEquals(17, instance.exports.blarg());
|
|
})();
|
|
|
|
(function ImportTestTwoLevel() {
|
|
print("ImportTestTwoLevel");
|
|
let builder = new WasmModuleBuilder();
|
|
var index = builder.addImport("mod", "print", makeSig_v_x(kWasmI32));
|
|
builder.addFunction("foo", kSig_v_v)
|
|
.addBody([kExprI32Const, 19, kExprCallFunction, index])
|
|
.exportAs("main");
|
|
|
|
var buffer = builder.toBuffer(debug);
|
|
var instance = instantiate(buffer, {mod: {print: print}});
|
|
print("should print 19! ");
|
|
instance.exports.main();
|
|
})();
|