Skip to content

Commit baea536

Browse files
xtucxtuc
committed
feat: implicit Table and Memory
1 parent 0b9efd6 commit baea536

7 files changed

Lines changed: 73 additions & 10 deletions

File tree

‎lib/BaseWasmMainTemplatePlugin.js‎

Lines changed: 45 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,25 +50,60 @@ function generateImportObject(module) {
5050
for (const pair of depsByRequest) {
5151
const properties = [];
5252
for (const data of pair[1]) {
53-
let params = "";
54-
let result = "void 0";
55-
5653
if (data.description.type === "FuncImportDescr") {
57-
params = data.description.params.map(
54+
const params = data.description.params.map(
5855
(param, k) => "p" + k + param.valtype
5956
);
6057

61-
result = `__webpack_require__(${JSON.stringify(
58+
const result = `__webpack_require__(${JSON.stringify(
6259
data.module.id
6360
)})[${JSON.stringify(data.usedName)}](${params})`;
61+
62+
properties.push(
63+
`\n\t\t${JSON.stringify(data.exportName)}: function(${params}) {
64+
return ${result};
65+
}`
66+
);
6467
}
6568

66-
properties.push(
67-
`\n\t\t${JSON.stringify(data.exportName)}: function(${params}) {
68-
return ${result};
69-
}`
70-
);
69+
if (data.description.type === "Memory") {
70+
const {min, max} = data.description.limits;
71+
72+
const params = {
73+
initial: min
74+
};
75+
76+
if (typeof max === "number") {
77+
params.maximum = max;
78+
}
79+
80+
properties.push(
81+
`\n\t\t${JSON.stringify(
82+
data.exportName
83+
)}: new WebAssembly.Memory(${JSON.stringify(params)})`
84+
);
85+
}
86+
87+
if (data.description.type === "Table") {
88+
const {min, max} = data.description.limits;
89+
90+
const params = {
91+
element: data.description.elementType,
92+
initial: min
93+
};
94+
95+
if (typeof max === "number") {
96+
params.maximum = max;
97+
}
98+
99+
properties.push(
100+
`\n\t\t${JSON.stringify(
101+
data.exportName
102+
)}: new WebAssembly.Table(${JSON.stringify(params)})`
103+
);
104+
}
71105
}
106+
72107
importsCode.push(
73108
`\n\t${JSON.stringify(pair[0])}: {${properties.join(",")}\n\t}`
74109
);

‎test/cases/wasm/import-memory/env.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const mem = new WebAssembly.Memory({ initial: 1 });

‎test/cases/wasm/import-memory/index.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// test.wasm:
2+
//
3+
// (module
4+
// (import "./env" "mem" (memory $./env.mem 1))
5+
// (func (export "test") (result i32)
6+
// (i32.load8_s (i32.const 0))
7+
// )
8+
// )
9+
it("should use the implicit Memory object", function() {
10+
return import("./test.wasm");
11+
});

‎test/cases/wasm/import-memory/test.wasm‎

68 Bytes
Binary file not shown.

‎test/cases/wasm/import-table/env.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export const tbl = new WebAssembly.Table({element: 'anyfunc', initial: 10});

‎test/cases/wasm/import-table/index.js‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// register.wasm
2+
//
3+
// (module
4+
// (import "./env" "tbl" (table 1 anyfunc))
5+
// (func $a (result i32)
6+
// (i32.const 11)
7+
// )
8+
//
9+
// (elem (i32.const 0) $a)
10+
// )
11+
//
12+
it("should use the implicit Table object", function() {
13+
return import("./register.wasm");
14+
});
15+

‎test/cases/wasm/import-table/register.wasm‎

71 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)