porffor 0.2.0-77e30e8 → 0.2.0-80c08d4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CONTRIBUTING.md +248 -0
- package/LICENSE +20 -20
- package/README.md +164 -77
- package/asur/README.md +2 -0
- package/asur/index.js +1262 -0
- package/byg/index.js +237 -0
- package/compiler/2c.js +325 -72
- package/compiler/{sections.js → assemble.js} +64 -16
- package/compiler/builtins/annexb_string.js +72 -0
- package/compiler/builtins/annexb_string.ts +18 -0
- package/compiler/builtins/array.ts +145 -0
- package/compiler/builtins/base64.ts +76 -0
- package/compiler/builtins/crypto.ts +120 -0
- package/compiler/builtins/date.ts +2071 -0
- package/compiler/builtins/escape.ts +141 -0
- package/compiler/builtins/int.ts +147 -0
- package/compiler/builtins/number.ts +527 -0
- package/compiler/builtins/porffor.d.ts +59 -0
- package/compiler/builtins/string.ts +1055 -0
- package/compiler/builtins/tostring.ts +45 -0
- package/compiler/builtins.js +580 -272
- package/compiler/{codeGen.js → codegen.js} +1373 -528
- package/compiler/decompile.js +11 -13
- package/compiler/embedding.js +22 -22
- package/compiler/encoding.js +98 -114
- package/compiler/generated_builtins.js +1481 -0
- package/compiler/index.js +40 -37
- package/compiler/log.js +6 -3
- package/compiler/opt.js +65 -29
- package/compiler/parse.js +44 -11
- package/compiler/precompile.js +128 -0
- package/compiler/prefs.js +27 -0
- package/compiler/prototype.js +177 -37
- package/compiler/types.js +37 -0
- package/compiler/wasmSpec.js +31 -7
- package/compiler/wrap.js +144 -46
- package/package.json +9 -5
- package/porf +4 -0
- package/rhemyn/compile.js +46 -27
- package/rhemyn/parse.js +322 -320
- package/rhemyn/test/parse.js +58 -58
- package/runner/compare.js +34 -34
- package/runner/debug.js +122 -0
- package/runner/index.js +91 -11
- package/runner/profiler.js +102 -0
- package/runner/repl.js +44 -11
- package/runner/sizes.js +37 -37
- package/compiler/builtins/base64.js +0 -92
- package/runner/info.js +0 -89
- package/runner/profile.js +0 -46
- package/runner/results.json +0 -1
- package/runner/transform.js +0 -15
- package/util/enum.js +0 -20
@@ -1,5 +1,5 @@
|
|
1
1
|
import { Blocktype, Opcodes, Valtype, PageSize, ValtypeSize } from "./wasmSpec.js";
|
2
|
-
import { ieee754_binary64, signedLEB128, unsignedLEB128 } from "./encoding.js";
|
2
|
+
import { ieee754_binary64, signedLEB128, unsignedLEB128, encodeVector } from "./encoding.js";
|
3
3
|
import { operatorOpcode } from "./expression.js";
|
4
4
|
import { BuiltinFuncs, BuiltinVars, importedFuncs, NULL, UNDEFINED } from "./builtins.js";
|
5
5
|
import { PrototypeFuncs } from "./prototype.js";
|
@@ -7,6 +7,8 @@ import { number, i32x4, enforceOneByte, enforceTwoBytes, enforceFourBytes, enfor
|
|
7
7
|
import { log } from "./log.js";
|
8
8
|
import parse from "./parse.js";
|
9
9
|
import * as Rhemyn from "../rhemyn/compile.js";
|
10
|
+
import Prefs from './prefs.js';
|
11
|
+
import { TYPES, TYPE_NAMES } from './types.js';
|
10
12
|
|
11
13
|
let globals = {};
|
12
14
|
let globalInd = 0;
|
@@ -23,39 +25,41 @@ const debug = str => {
|
|
23
25
|
const logChar = n => {
|
24
26
|
code.push(...number(n));
|
25
27
|
|
26
|
-
code.push(Opcodes.call);
|
27
|
-
code.push(...unsignedLEB128(0));
|
28
|
+
code.push([ Opcodes.call, 0 ]);
|
28
29
|
};
|
29
30
|
|
30
31
|
for (let i = 0; i < str.length; i++) {
|
31
32
|
logChar(str.charCodeAt(i));
|
32
33
|
}
|
33
34
|
|
34
|
-
logChar(
|
35
|
+
logChar(10); // new line
|
35
36
|
|
36
37
|
return code;
|
37
38
|
};
|
38
39
|
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
this.name = 'TodoError';
|
44
|
-
}
|
40
|
+
class TodoError extends Error {
|
41
|
+
constructor(message) {
|
42
|
+
super(message);
|
43
|
+
this.name = 'TodoError';
|
45
44
|
}
|
45
|
+
}
|
46
|
+
const todo = (scope, msg, expectsValue = undefined) => {
|
47
|
+
switch (Prefs.todoTime ?? 'runtime') {
|
48
|
+
case 'compile':
|
49
|
+
throw new TodoError(msg);
|
46
50
|
|
47
|
-
|
48
|
-
|
49
|
-
const code = [];
|
50
|
-
|
51
|
-
code.push(...debug(`todo! ` + msg));
|
52
|
-
code.push(Opcodes.unreachable);
|
51
|
+
case 'runtime':
|
52
|
+
return internalThrow(scope, 'TodoError', msg, expectsValue);
|
53
53
|
|
54
|
-
|
54
|
+
// return [
|
55
|
+
// ...debug(`todo! ${msg}`),
|
56
|
+
// [ Opcodes.unreachable ]
|
57
|
+
// ];
|
58
|
+
}
|
55
59
|
};
|
56
60
|
|
57
61
|
const isFuncType = type => type === 'FunctionDeclaration' || type === 'FunctionExpression' || type === 'ArrowFunctionExpression';
|
58
|
-
const generate = (scope, decl, global = false, name = undefined) => {
|
62
|
+
const generate = (scope, decl, global = false, name = undefined, valueUnused = false) => {
|
59
63
|
switch (decl.type) {
|
60
64
|
case 'BinaryExpression':
|
61
65
|
return generateBinaryExp(scope, decl, global, name);
|
@@ -68,7 +72,12 @@ const generate = (scope, decl, global = false, name = undefined) => {
|
|
68
72
|
|
69
73
|
case 'ArrowFunctionExpression':
|
70
74
|
case 'FunctionDeclaration':
|
71
|
-
generateFunc(scope, decl);
|
75
|
+
const func = generateFunc(scope, decl);
|
76
|
+
|
77
|
+
if (decl.type.endsWith('Expression')) {
|
78
|
+
return number(func.index);
|
79
|
+
}
|
80
|
+
|
72
81
|
return [];
|
73
82
|
|
74
83
|
case 'BlockStatement':
|
@@ -81,7 +90,7 @@ const generate = (scope, decl, global = false, name = undefined) => {
|
|
81
90
|
return generateExp(scope, decl);
|
82
91
|
|
83
92
|
case 'CallExpression':
|
84
|
-
return generateCall(scope, decl, global, name);
|
93
|
+
return generateCall(scope, decl, global, name, valueUnused);
|
85
94
|
|
86
95
|
case 'NewExpression':
|
87
96
|
return generateNew(scope, decl, global, name);
|
@@ -99,7 +108,7 @@ const generate = (scope, decl, global = false, name = undefined) => {
|
|
99
108
|
return generateUnary(scope, decl);
|
100
109
|
|
101
110
|
case 'UpdateExpression':
|
102
|
-
return generateUpdate(scope, decl);
|
111
|
+
return generateUpdate(scope, decl, global, name, valueUnused);
|
103
112
|
|
104
113
|
case 'IfStatement':
|
105
114
|
return generateIf(scope, decl);
|
@@ -110,6 +119,9 @@ const generate = (scope, decl, global = false, name = undefined) => {
|
|
110
119
|
case 'WhileStatement':
|
111
120
|
return generateWhile(scope, decl);
|
112
121
|
|
122
|
+
case 'DoWhileStatement':
|
123
|
+
return generateDoWhile(scope, decl);
|
124
|
+
|
113
125
|
case 'ForOfStatement':
|
114
126
|
return generateForOf(scope, decl);
|
115
127
|
|
@@ -119,6 +131,9 @@ const generate = (scope, decl, global = false, name = undefined) => {
|
|
119
131
|
case 'ContinueStatement':
|
120
132
|
return generateContinue(scope, decl);
|
121
133
|
|
134
|
+
case 'LabeledStatement':
|
135
|
+
return generateLabel(scope, decl);
|
136
|
+
|
122
137
|
case 'EmptyStatement':
|
123
138
|
return generateEmpty(scope, decl);
|
124
139
|
|
@@ -132,7 +147,7 @@ const generate = (scope, decl, global = false, name = undefined) => {
|
|
132
147
|
return generateTry(scope, decl);
|
133
148
|
|
134
149
|
case 'DebuggerStatement':
|
135
|
-
// todo:
|
150
|
+
// todo: hook into terminal debugger
|
136
151
|
return [];
|
137
152
|
|
138
153
|
case 'ArrayExpression':
|
@@ -146,16 +161,22 @@ const generate = (scope, decl, global = false, name = undefined) => {
|
|
146
161
|
const funcsBefore = funcs.length;
|
147
162
|
generate(scope, decl.declaration);
|
148
163
|
|
149
|
-
if (funcsBefore
|
164
|
+
if (funcsBefore !== funcs.length) {
|
165
|
+
// new func added
|
166
|
+
const newFunc = funcs[funcs.length - 1];
|
167
|
+
newFunc.export = true;
|
168
|
+
}
|
169
|
+
|
170
|
+
// if (funcsBefore === funcs.length) throw new Error('no new func added in export');
|
150
171
|
|
151
|
-
const newFunc = funcs[funcs.length - 1];
|
152
|
-
newFunc.export = true;
|
172
|
+
// const newFunc = funcs[funcs.length - 1];
|
173
|
+
// newFunc.export = true;
|
153
174
|
|
154
175
|
return [];
|
155
176
|
|
156
177
|
case 'TaggedTemplateExpression': {
|
157
178
|
const funcs = {
|
158
|
-
|
179
|
+
__Porffor_wasm: str => {
|
159
180
|
let out = [];
|
160
181
|
|
161
182
|
for (const line of str.split('\n')) {
|
@@ -163,8 +184,8 @@ const generate = (scope, decl, global = false, name = undefined) => {
|
|
163
184
|
if (asm[0] === '') continue; // blank
|
164
185
|
|
165
186
|
if (asm[0] === 'local') {
|
166
|
-
const [ name,
|
167
|
-
scope.locals[name] = { idx:
|
187
|
+
const [ name, type ] = asm.slice(1);
|
188
|
+
scope.locals[name] = { idx: scope.localInd++, type: Valtype[type] };
|
168
189
|
continue;
|
169
190
|
}
|
170
191
|
|
@@ -174,47 +195,74 @@ const generate = (scope, decl, global = false, name = undefined) => {
|
|
174
195
|
}
|
175
196
|
|
176
197
|
if (asm[0] === 'memory') {
|
177
|
-
allocPage('asm instrinsic');
|
198
|
+
allocPage(scope, 'asm instrinsic');
|
178
199
|
// todo: add to store/load offset insts
|
179
200
|
continue;
|
180
201
|
}
|
181
202
|
|
182
203
|
let inst = Opcodes[asm[0].replace('.', '_')];
|
183
|
-
if (
|
204
|
+
if (inst == null) throw new Error(`inline asm: inst ${asm[0]} not found`);
|
184
205
|
|
185
206
|
if (!Array.isArray(inst)) inst = [ inst ];
|
186
|
-
const immediates = asm.slice(1).map(x =>
|
207
|
+
const immediates = asm.slice(1).map(x => {
|
208
|
+
const int = parseInt(x);
|
209
|
+
if (Number.isNaN(int)) return scope.locals[x]?.idx;
|
210
|
+
return int;
|
211
|
+
});
|
187
212
|
|
188
|
-
out.push([ ...inst, ...immediates ]);
|
213
|
+
out.push([ ...inst, ...immediates.flatMap(x => signedLEB128(x)) ]);
|
189
214
|
}
|
190
215
|
|
191
216
|
return out;
|
192
217
|
},
|
193
218
|
|
194
|
-
|
195
|
-
|
219
|
+
__Porffor_bs: str => [
|
220
|
+
...makeString(scope, str, global, name, true),
|
196
221
|
|
197
|
-
|
198
|
-
...number(
|
199
|
-
|
222
|
+
...(name ? setType(scope, name, TYPES._bytestring) : [
|
223
|
+
...number(TYPES._bytestring, Valtype.i32),
|
224
|
+
...setLastType(scope)
|
225
|
+
])
|
226
|
+
],
|
227
|
+
__Porffor_s: str => [
|
228
|
+
...makeString(scope, str, global, name, false),
|
200
229
|
|
201
|
-
|
202
|
-
...number(
|
203
|
-
|
204
|
-
]
|
205
|
-
|
206
|
-
}
|
230
|
+
...(name ? setType(scope, name, TYPES.string) : [
|
231
|
+
...number(TYPES.string, Valtype.i32),
|
232
|
+
...setLastType(scope)
|
233
|
+
])
|
234
|
+
],
|
235
|
+
};
|
207
236
|
|
208
|
-
const
|
237
|
+
const func = decl.tag.name;
|
209
238
|
// hack for inline asm
|
210
|
-
if (!funcs[
|
239
|
+
if (!funcs[func]) return todo(scope, 'tagged template expressions not implemented', true);
|
240
|
+
|
241
|
+
const { quasis, expressions } = decl.quasi;
|
242
|
+
let str = quasis[0].value.raw;
|
211
243
|
|
212
|
-
|
213
|
-
|
244
|
+
for (let i = 0; i < expressions.length; i++) {
|
245
|
+
const e = expressions[i];
|
246
|
+
if (!e.name) {
|
247
|
+
if (e.type === 'BinaryExpression' && e.operator === '+' && e.left.type === 'Identifier' && e.right.type === 'Literal') {
|
248
|
+
str += lookupName(scope, e.left.name)[0].idx + e.right.value;
|
249
|
+
} else todo(scope, 'unsupported expression in intrinsic');
|
250
|
+
} else str += lookupName(scope, e.name)[0].idx;
|
251
|
+
|
252
|
+
str += quasis[i + 1].value.raw;
|
253
|
+
}
|
254
|
+
|
255
|
+
return funcs[func](str);
|
214
256
|
}
|
215
257
|
|
216
258
|
default:
|
217
|
-
|
259
|
+
// ignore typescript nodes
|
260
|
+
if (decl.type.startsWith('TS') ||
|
261
|
+
decl.type === 'ImportDeclaration' && decl.importKind === 'type') {
|
262
|
+
return [];
|
263
|
+
}
|
264
|
+
|
265
|
+
return todo(scope, `no generation for ${decl.type}!`);
|
218
266
|
}
|
219
267
|
};
|
220
268
|
|
@@ -242,7 +290,7 @@ const lookupName = (scope, _name) => {
|
|
242
290
|
return [ undefined, undefined ];
|
243
291
|
};
|
244
292
|
|
245
|
-
const internalThrow = (scope, constructor, message, expectsValue =
|
293
|
+
const internalThrow = (scope, constructor, message, expectsValue = Prefs.alwaysValueInternalThrows) => [
|
246
294
|
...generateThrow(scope, {
|
247
295
|
argument: {
|
248
296
|
type: 'NewExpression',
|
@@ -264,25 +312,33 @@ const generateIdent = (scope, decl) => {
|
|
264
312
|
const name = mapName(rawName);
|
265
313
|
let local = scope.locals[rawName];
|
266
314
|
|
267
|
-
if (builtinVars
|
315
|
+
if (Object.hasOwn(builtinVars, name)) {
|
268
316
|
if (builtinVars[name].floatOnly && valtype[0] === 'i') throw new Error(`Cannot use ${unhackName(name)} with integer valtype`);
|
269
|
-
|
317
|
+
|
318
|
+
let wasm = builtinVars[name];
|
319
|
+
if (typeof wasm === 'function') wasm = asmFuncToAsm(wasm, { name });
|
320
|
+
return wasm.slice();
|
321
|
+
}
|
322
|
+
|
323
|
+
if (Object.hasOwn(builtinFuncs, name) || Object.hasOwn(internalConstrs, name)) {
|
324
|
+
// todo: return an actual something
|
325
|
+
return number(1);
|
270
326
|
}
|
271
327
|
|
272
|
-
if (
|
328
|
+
if (isExistingProtoFunc(name)) {
|
273
329
|
// todo: return an actual something
|
274
330
|
return number(1);
|
275
331
|
}
|
276
332
|
|
277
|
-
if (local === undefined) {
|
333
|
+
if (local?.idx === undefined) {
|
278
334
|
// no local var with name
|
279
|
-
if (
|
280
|
-
if (funcIndex
|
335
|
+
if (Object.hasOwn(importedFuncs, name)) return number(importedFuncs[name]);
|
336
|
+
if (Object.hasOwn(funcIndex, name)) return number(funcIndex[name]);
|
281
337
|
|
282
|
-
if (globals
|
338
|
+
if (Object.hasOwn(globals, name)) return [ [ Opcodes.global_get, globals[name].idx ] ];
|
283
339
|
}
|
284
340
|
|
285
|
-
if (local === undefined && rawName.startsWith('__')) {
|
341
|
+
if (local?.idx === undefined && rawName.startsWith('__')) {
|
286
342
|
// return undefined if unknown key in already known var
|
287
343
|
let parent = rawName.slice(2).split('_').slice(0, -1).join('_');
|
288
344
|
if (parent.includes('_')) parent = '__' + parent;
|
@@ -291,7 +347,7 @@ const generateIdent = (scope, decl) => {
|
|
291
347
|
if (!parentLookup[1]) return number(UNDEFINED);
|
292
348
|
}
|
293
349
|
|
294
|
-
if (local === undefined) return internalThrow(scope, 'ReferenceError', `${unhackName(name)} is not defined`, true);
|
350
|
+
if (local?.idx === undefined) return internalThrow(scope, 'ReferenceError', `${unhackName(name)} is not defined`, true);
|
295
351
|
|
296
352
|
return [ [ Opcodes.local_get, local.idx ] ];
|
297
353
|
};
|
@@ -304,14 +360,18 @@ const generateReturn = (scope, decl) => {
|
|
304
360
|
// just bare "return"
|
305
361
|
return [
|
306
362
|
...number(UNDEFINED), // "undefined" if func returns
|
307
|
-
...
|
363
|
+
...(scope.returnType != null ? [] : [
|
364
|
+
...number(TYPES.undefined, Valtype.i32) // type undefined
|
365
|
+
]),
|
308
366
|
[ Opcodes.return ]
|
309
367
|
];
|
310
368
|
}
|
311
369
|
|
312
370
|
return [
|
313
371
|
...generate(scope, decl.argument),
|
314
|
-
...
|
372
|
+
...(scope.returnType != null ? [] : [
|
373
|
+
...getNodeType(scope, decl.argument)
|
374
|
+
]),
|
315
375
|
[ Opcodes.return ]
|
316
376
|
];
|
317
377
|
};
|
@@ -325,7 +385,8 @@ const localTmp = (scope, name, type = valtypeBinary) => {
|
|
325
385
|
return idx;
|
326
386
|
};
|
327
387
|
|
328
|
-
const isIntOp = op => op && (op[0] >=
|
388
|
+
const isIntOp = op => op && ((op[0] >= 0x45 && op[0] <= 0x4f) || (op[0] >= 0x67 && op[0] <= 0x78) || op[0] === 0x41);
|
389
|
+
const isFloatToIntOp = op => op && (op[0] >= 0xb7 && op[0] <= 0xba);
|
329
390
|
|
330
391
|
const performLogicOp = (scope, op, left, right, leftType, rightType) => {
|
331
392
|
const checks = {
|
@@ -334,7 +395,7 @@ const performLogicOp = (scope, op, left, right, leftType, rightType) => {
|
|
334
395
|
'??': nullish
|
335
396
|
};
|
336
397
|
|
337
|
-
if (!checks[op]) return todo(`logic operator ${op} not implemented yet
|
398
|
+
if (!checks[op]) return todo(scope, `logic operator ${op} not implemented yet`, true);
|
338
399
|
|
339
400
|
// generic structure for {a} OP {b}
|
340
401
|
// -->
|
@@ -342,8 +403,8 @@ const performLogicOp = (scope, op, left, right, leftType, rightType) => {
|
|
342
403
|
|
343
404
|
// if we can, use int tmp and convert at the end to help prevent unneeded conversions
|
344
405
|
// (like if we are in an if condition - very common)
|
345
|
-
const leftIsInt =
|
346
|
-
const rightIsInt =
|
406
|
+
const leftIsInt = isFloatToIntOp(left[left.length - 1]);
|
407
|
+
const rightIsInt = isFloatToIntOp(right[right.length - 1]);
|
347
408
|
|
348
409
|
const canInt = leftIsInt && rightIsInt;
|
349
410
|
|
@@ -360,12 +421,12 @@ const performLogicOp = (scope, op, left, right, leftType, rightType) => {
|
|
360
421
|
...right,
|
361
422
|
// note type
|
362
423
|
...rightType,
|
363
|
-
|
424
|
+
...setLastType(scope),
|
364
425
|
[ Opcodes.else ],
|
365
426
|
[ Opcodes.local_get, localTmp(scope, 'logictmpi', Valtype.i32) ],
|
366
427
|
// note type
|
367
428
|
...leftType,
|
368
|
-
|
429
|
+
...setLastType(scope),
|
369
430
|
[ Opcodes.end ],
|
370
431
|
Opcodes.i32_from
|
371
432
|
];
|
@@ -379,17 +440,17 @@ const performLogicOp = (scope, op, left, right, leftType, rightType) => {
|
|
379
440
|
...right,
|
380
441
|
// note type
|
381
442
|
...rightType,
|
382
|
-
|
443
|
+
...setLastType(scope),
|
383
444
|
[ Opcodes.else ],
|
384
445
|
[ Opcodes.local_get, localTmp(scope, 'logictmp') ],
|
385
446
|
// note type
|
386
447
|
...leftType,
|
387
|
-
|
448
|
+
...setLastType(scope),
|
388
449
|
[ Opcodes.end ]
|
389
450
|
];
|
390
451
|
};
|
391
452
|
|
392
|
-
const concatStrings = (scope, left, right, global, name, assign) => {
|
453
|
+
const concatStrings = (scope, left, right, global, name, assign = false, bytestrings = false) => {
|
393
454
|
// todo: this should be rewritten into a built-in/func: String.prototype.concat
|
394
455
|
// todo: convert left and right to strings if not
|
395
456
|
// todo: optimize by looking up names in arrays and using that if exists?
|
@@ -399,11 +460,8 @@ const concatStrings = (scope, left, right, global, name, assign) => {
|
|
399
460
|
const rightLength = localTmp(scope, 'concat_right_length', Valtype.i32);
|
400
461
|
const leftLength = localTmp(scope, 'concat_left_length', Valtype.i32);
|
401
462
|
|
402
|
-
|
403
|
-
|
404
|
-
|
405
|
-
if (assign) {
|
406
|
-
const pointer = arrays.get(name ?? '$undeclared');
|
463
|
+
if (assign && Prefs.aotPointerOpt) {
|
464
|
+
const pointer = scope.arrays?.get(name ?? '$undeclared');
|
407
465
|
|
408
466
|
return [
|
409
467
|
// setup right
|
@@ -428,11 +486,11 @@ const concatStrings = (scope, left, right, global, name, assign) => {
|
|
428
486
|
[ Opcodes.i32_store, Math.log2(ValtypeSize.i32) - 1, ...unsignedLEB128(pointer) ],
|
429
487
|
|
430
488
|
// copy right
|
431
|
-
// dst = out pointer + length size + current length *
|
489
|
+
// dst = out pointer + length size + current length * sizeof valtype
|
432
490
|
...number(pointer + ValtypeSize.i32, Valtype.i32),
|
433
491
|
|
434
492
|
[ Opcodes.local_get, leftLength ],
|
435
|
-
...number(ValtypeSize.i16, Valtype.i32),
|
493
|
+
...number(bytestrings ? ValtypeSize.i8 : ValtypeSize.i16, Valtype.i32),
|
436
494
|
[ Opcodes.i32_mul ],
|
437
495
|
[ Opcodes.i32_add ],
|
438
496
|
|
@@ -441,9 +499,9 @@ const concatStrings = (scope, left, right, global, name, assign) => {
|
|
441
499
|
...number(ValtypeSize.i32, Valtype.i32),
|
442
500
|
[ Opcodes.i32_add ],
|
443
501
|
|
444
|
-
// size = right length *
|
502
|
+
// size = right length * sizeof valtype
|
445
503
|
[ Opcodes.local_get, rightLength ],
|
446
|
-
...number(ValtypeSize.i16, Valtype.i32),
|
504
|
+
...number(bytestrings ? ValtypeSize.i8 : ValtypeSize.i16, Valtype.i32),
|
447
505
|
[ Opcodes.i32_mul ],
|
448
506
|
|
449
507
|
[ ...Opcodes.memory_copy, 0x00, 0x00 ],
|
@@ -501,11 +559,11 @@ const concatStrings = (scope, left, right, global, name, assign) => {
|
|
501
559
|
[ ...Opcodes.memory_copy, 0x00, 0x00 ],
|
502
560
|
|
503
561
|
// copy right
|
504
|
-
// dst = out pointer + length size + left length *
|
562
|
+
// dst = out pointer + length size + left length * sizeof valtype
|
505
563
|
...number(pointer + ValtypeSize.i32, Valtype.i32),
|
506
564
|
|
507
565
|
[ Opcodes.local_get, leftLength ],
|
508
|
-
...number(ValtypeSize.i16, Valtype.i32),
|
566
|
+
...number(bytestrings ? ValtypeSize.i8 : ValtypeSize.i16, Valtype.i32),
|
509
567
|
[ Opcodes.i32_mul ],
|
510
568
|
[ Opcodes.i32_add ],
|
511
569
|
|
@@ -514,9 +572,9 @@ const concatStrings = (scope, left, right, global, name, assign) => {
|
|
514
572
|
...number(ValtypeSize.i32, Valtype.i32),
|
515
573
|
[ Opcodes.i32_add ],
|
516
574
|
|
517
|
-
// size = right length *
|
575
|
+
// size = right length * sizeof valtype
|
518
576
|
[ Opcodes.local_get, rightLength ],
|
519
|
-
...number(ValtypeSize.i16, Valtype.i32),
|
577
|
+
...number(bytestrings ? ValtypeSize.i8 : ValtypeSize.i16, Valtype.i32),
|
520
578
|
[ Opcodes.i32_mul ],
|
521
579
|
|
522
580
|
[ ...Opcodes.memory_copy, 0x00, 0x00 ],
|
@@ -526,7 +584,7 @@ const concatStrings = (scope, left, right, global, name, assign) => {
|
|
526
584
|
];
|
527
585
|
};
|
528
586
|
|
529
|
-
const compareStrings = (scope, left, right) => {
|
587
|
+
const compareStrings = (scope, left, right, bytestrings = false) => {
|
530
588
|
// todo: this should be rewritten into a func
|
531
589
|
// todo: convert left and right to strings if not
|
532
590
|
// todo: optimize by looking up names in arrays and using that if exists?
|
@@ -535,7 +593,6 @@ const compareStrings = (scope, left, right) => {
|
|
535
593
|
const leftPointer = localTmp(scope, 'compare_left_pointer', Valtype.i32);
|
536
594
|
const leftLength = localTmp(scope, 'compare_left_length', Valtype.i32);
|
537
595
|
const rightPointer = localTmp(scope, 'compare_right_pointer', Valtype.i32);
|
538
|
-
const rightLength = localTmp(scope, 'compare_right_length', Valtype.i32);
|
539
596
|
|
540
597
|
const index = localTmp(scope, 'compare_index', Valtype.i32);
|
541
598
|
const indexEnd = localTmp(scope, 'compare_index_end', Valtype.i32);
|
@@ -563,7 +620,6 @@ const compareStrings = (scope, left, right) => {
|
|
563
620
|
|
564
621
|
[ Opcodes.local_get, rightPointer ],
|
565
622
|
[ Opcodes.i32_load, Math.log2(ValtypeSize[valtype]) - 1, ...unsignedLEB128(0) ],
|
566
|
-
[ Opcodes.local_tee, rightLength ],
|
567
623
|
|
568
624
|
// fast path: check leftLength != rightLength
|
569
625
|
[ Opcodes.i32_ne ],
|
@@ -578,11 +634,13 @@ const compareStrings = (scope, left, right) => {
|
|
578
634
|
...number(0, Valtype.i32),
|
579
635
|
[ Opcodes.local_set, index ],
|
580
636
|
|
581
|
-
// setup index end as length * sizeof
|
637
|
+
// setup index end as length * sizeof valtype (1 for bytestring, 2 for string)
|
582
638
|
// we do this instead of having to do mul/div each iter for perf™
|
583
639
|
[ Opcodes.local_get, leftLength ],
|
584
|
-
...
|
585
|
-
|
640
|
+
...(bytestrings ? [] : [
|
641
|
+
...number(ValtypeSize.i16, Valtype.i32),
|
642
|
+
[ Opcodes.i32_mul ],
|
643
|
+
]),
|
586
644
|
[ Opcodes.local_set, indexEnd ],
|
587
645
|
|
588
646
|
// iterate over each char and check if eq
|
@@ -592,13 +650,17 @@ const compareStrings = (scope, left, right) => {
|
|
592
650
|
[ Opcodes.local_get, index ],
|
593
651
|
[ Opcodes.local_get, leftPointer ],
|
594
652
|
[ Opcodes.i32_add ],
|
595
|
-
|
653
|
+
bytestrings ?
|
654
|
+
[ Opcodes.i32_load8_u, 0, ValtypeSize.i32 ] :
|
655
|
+
[ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
|
596
656
|
|
597
657
|
// fetch right
|
598
658
|
[ Opcodes.local_get, index ],
|
599
659
|
[ Opcodes.local_get, rightPointer ],
|
600
660
|
[ Opcodes.i32_add ],
|
601
|
-
|
661
|
+
bytestrings ?
|
662
|
+
[ Opcodes.i32_load8_u, 0, ValtypeSize.i32 ] :
|
663
|
+
[ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
|
602
664
|
|
603
665
|
// not equal, "return" false
|
604
666
|
[ Opcodes.i32_ne ],
|
@@ -607,13 +669,13 @@ const compareStrings = (scope, left, right) => {
|
|
607
669
|
[ Opcodes.br, 2 ],
|
608
670
|
[ Opcodes.end ],
|
609
671
|
|
610
|
-
// index += sizeof
|
672
|
+
// index += sizeof valtype (1 for bytestring, 2 for string)
|
611
673
|
[ Opcodes.local_get, index ],
|
612
|
-
...number(ValtypeSize.i16, Valtype.i32),
|
674
|
+
...number(bytestrings ? ValtypeSize.i8 : ValtypeSize.i16, Valtype.i32),
|
613
675
|
[ Opcodes.i32_add ],
|
614
676
|
[ Opcodes.local_tee, index ],
|
615
677
|
|
616
|
-
// if index != index end (length * sizeof
|
678
|
+
// if index != index end (length * sizeof valtype), loop
|
617
679
|
[ Opcodes.local_get, indexEnd ],
|
618
680
|
[ Opcodes.i32_ne ],
|
619
681
|
[ Opcodes.br_if, 0 ],
|
@@ -634,16 +696,18 @@ const compareStrings = (scope, left, right) => {
|
|
634
696
|
};
|
635
697
|
|
636
698
|
const truthy = (scope, wasm, type, intIn = false, intOut = false) => {
|
637
|
-
if (
|
699
|
+
if (isFloatToIntOp(wasm[wasm.length - 1])) return [
|
638
700
|
...wasm,
|
639
701
|
...(!intIn && intOut ? [ Opcodes.i32_to_u ] : [])
|
640
702
|
];
|
703
|
+
// if (isIntOp(wasm[wasm.length - 1])) return [ ...wasm ];
|
641
704
|
|
642
|
-
const
|
705
|
+
const useTmp = knownType(scope, type) == null;
|
706
|
+
const tmp = useTmp && localTmp(scope, `#logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
|
643
707
|
|
644
708
|
const def = [
|
645
709
|
// if value != 0
|
646
|
-
[ Opcodes.local_get, tmp ],
|
710
|
+
...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
|
647
711
|
|
648
712
|
// ...(intIn ? [ [ Opcodes.i32_eqz ] ] : [ ...Opcodes.eqz ]),
|
649
713
|
...(!intOut || (intIn && intOut) ? [] : [ Opcodes.i32_to_u ]),
|
@@ -655,7 +719,7 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false) => {
|
|
655
719
|
|
656
720
|
return [
|
657
721
|
...wasm,
|
658
|
-
[ Opcodes.local_set, tmp ],
|
722
|
+
...(!useTmp ? [] : [ [ Opcodes.local_set, tmp ] ]),
|
659
723
|
|
660
724
|
...typeSwitch(scope, type, {
|
661
725
|
// [TYPES.number]: def,
|
@@ -664,7 +728,7 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false) => {
|
|
664
728
|
...number(1, intOut ? Valtype.i32 : valtypeBinary)
|
665
729
|
],
|
666
730
|
[TYPES.string]: [
|
667
|
-
[ Opcodes.local_get, tmp ],
|
731
|
+
...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
|
668
732
|
...(intIn ? [] : [ Opcodes.i32_to_u ]),
|
669
733
|
|
670
734
|
// get length
|
@@ -675,16 +739,27 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false) => {
|
|
675
739
|
[ Opcodes.i32_eqz ], */
|
676
740
|
...(intOut ? [] : [ Opcodes.i32_from_u ])
|
677
741
|
],
|
742
|
+
[TYPES._bytestring]: [ // duplicate of string
|
743
|
+
...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
|
744
|
+
...(intIn ? [] : [ Opcodes.i32_to_u ]),
|
745
|
+
|
746
|
+
// get length
|
747
|
+
[ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
|
748
|
+
|
749
|
+
...(intOut ? [] : [ Opcodes.i32_from_u ])
|
750
|
+
],
|
678
751
|
default: def
|
679
752
|
}, intOut ? Valtype.i32 : valtypeBinary)
|
680
753
|
];
|
681
754
|
};
|
682
755
|
|
683
756
|
const falsy = (scope, wasm, type, intIn = false, intOut = false) => {
|
684
|
-
const
|
757
|
+
const useTmp = knownType(scope, type) == null;
|
758
|
+
const tmp = useTmp && localTmp(scope, `#logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
|
759
|
+
|
685
760
|
return [
|
686
761
|
...wasm,
|
687
|
-
[ Opcodes.local_set, tmp ],
|
762
|
+
...(!useTmp ? [] : [ [ Opcodes.local_set, tmp ] ]),
|
688
763
|
|
689
764
|
...typeSwitch(scope, type, {
|
690
765
|
[TYPES._array]: [
|
@@ -692,7 +767,18 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false) => {
|
|
692
767
|
...number(0, intOut ? Valtype.i32 : valtypeBinary)
|
693
768
|
],
|
694
769
|
[TYPES.string]: [
|
695
|
-
[ Opcodes.local_get, tmp ],
|
770
|
+
...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
|
771
|
+
...(intIn ? [] : [ Opcodes.i32_to_u ]),
|
772
|
+
|
773
|
+
// get length
|
774
|
+
[ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
|
775
|
+
|
776
|
+
// if length == 0
|
777
|
+
[ Opcodes.i32_eqz ],
|
778
|
+
...(intOut ? [] : [ Opcodes.i32_from_u ])
|
779
|
+
],
|
780
|
+
[TYPES._bytestring]: [ // duplicate of string
|
781
|
+
...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
|
696
782
|
...(intIn ? [] : [ Opcodes.i32_to_u ]),
|
697
783
|
|
698
784
|
// get length
|
@@ -704,7 +790,7 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false) => {
|
|
704
790
|
],
|
705
791
|
default: [
|
706
792
|
// if value == 0
|
707
|
-
[ Opcodes.local_get, tmp ],
|
793
|
+
...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
|
708
794
|
|
709
795
|
...(intIn ? [ [ Opcodes.i32_eqz ] ] : [ ...Opcodes.eqz ]),
|
710
796
|
...(intOut ? [] : [ Opcodes.i32_from_u ])
|
@@ -714,10 +800,12 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false) => {
|
|
714
800
|
};
|
715
801
|
|
716
802
|
const nullish = (scope, wasm, type, intIn = false, intOut = false) => {
|
717
|
-
const
|
803
|
+
const useTmp = knownType(scope, type) == null;
|
804
|
+
const tmp = useTmp && localTmp(scope, `#logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
|
805
|
+
|
718
806
|
return [
|
719
807
|
...wasm,
|
720
|
-
[ Opcodes.local_set, tmp ],
|
808
|
+
...(!useTmp ? [] : [ [ Opcodes.local_set, tmp ] ]),
|
721
809
|
|
722
810
|
...typeSwitch(scope, type, {
|
723
811
|
[TYPES.undefined]: [
|
@@ -726,7 +814,7 @@ const nullish = (scope, wasm, type, intIn = false, intOut = false) => {
|
|
726
814
|
],
|
727
815
|
[TYPES.object]: [
|
728
816
|
// object, null if == 0
|
729
|
-
[ Opcodes.local_get, tmp ],
|
817
|
+
...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
|
730
818
|
|
731
819
|
...(intIn ? [ [ Opcodes.i32_eqz ] ] : [ ...Opcodes.eqz ]),
|
732
820
|
...(intOut ? [] : [ Opcodes.i32_from_u ])
|
@@ -755,11 +843,14 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
|
|
755
843
|
return performLogicOp(scope, op, left, right, leftType, rightType);
|
756
844
|
}
|
757
845
|
|
846
|
+
const knownLeft = knownType(scope, leftType);
|
847
|
+
const knownRight = knownType(scope, rightType);
|
848
|
+
|
758
849
|
const eqOp = ['==', '===', '!=', '!==', '>', '>=', '<', '<='].includes(op);
|
759
850
|
const strictOp = op === '===' || op === '!==';
|
760
851
|
|
761
852
|
const startOut = [], endOut = [];
|
762
|
-
const
|
853
|
+
const finalize = out => startOut.concat(out, endOut);
|
763
854
|
|
764
855
|
// if strict (in)equal check types match
|
765
856
|
if (strictOp) {
|
@@ -804,31 +895,59 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
|
|
804
895
|
// todo: if equality op and an operand is undefined, return false
|
805
896
|
// todo: niche null hell with 0
|
806
897
|
|
807
|
-
|
808
|
-
|
809
|
-
|
810
|
-
|
811
|
-
|
812
|
-
|
813
|
-
|
814
|
-
|
815
|
-
|
816
|
-
|
817
|
-
|
818
|
-
|
819
|
-
|
820
|
-
|
821
|
-
|
822
|
-
|
823
|
-
|
824
|
-
|
825
|
-
|
826
|
-
|
827
|
-
|
828
|
-
|
829
|
-
|
830
|
-
|
831
|
-
|
898
|
+
if (knownLeft === TYPES.string || knownRight === TYPES.string) {
|
899
|
+
if (op === '+') {
|
900
|
+
// todo: this should be dynamic too but for now only static
|
901
|
+
// string concat (a + b)
|
902
|
+
return concatStrings(scope, left, right, _global, _name, assign, false);
|
903
|
+
}
|
904
|
+
|
905
|
+
// not an equality op, NaN
|
906
|
+
if (!eqOp) return number(NaN);
|
907
|
+
|
908
|
+
// else leave bool ops
|
909
|
+
// todo: convert string to number if string and number/bool
|
910
|
+
// todo: string (>|>=|<|<=) string
|
911
|
+
|
912
|
+
// string comparison
|
913
|
+
if (op === '===' || op === '==') {
|
914
|
+
return compareStrings(scope, left, right);
|
915
|
+
}
|
916
|
+
|
917
|
+
if (op === '!==' || op === '!=') {
|
918
|
+
return [
|
919
|
+
...compareStrings(scope, left, right),
|
920
|
+
[ Opcodes.i32_eqz ]
|
921
|
+
];
|
922
|
+
}
|
923
|
+
}
|
924
|
+
|
925
|
+
if (knownLeft === TYPES._bytestring || knownRight === TYPES._bytestring) {
|
926
|
+
if (op === '+') {
|
927
|
+
// todo: this should be dynamic too but for now only static
|
928
|
+
// string concat (a + b)
|
929
|
+
return concatStrings(scope, left, right, _global, _name, assign, true);
|
930
|
+
}
|
931
|
+
|
932
|
+
// not an equality op, NaN
|
933
|
+
if (!eqOp) return number(NaN);
|
934
|
+
|
935
|
+
// else leave bool ops
|
936
|
+
// todo: convert string to number if string and number/bool
|
937
|
+
// todo: string (>|>=|<|<=) string
|
938
|
+
|
939
|
+
// string comparison
|
940
|
+
if (op === '===' || op === '==') {
|
941
|
+
return compareStrings(scope, left, right, true);
|
942
|
+
}
|
943
|
+
|
944
|
+
if (op === '!==' || op === '!=') {
|
945
|
+
return [
|
946
|
+
...compareStrings(scope, left, right, true),
|
947
|
+
[ Opcodes.i32_eqz ]
|
948
|
+
];
|
949
|
+
}
|
950
|
+
}
|
832
951
|
|
833
952
|
let ops = operatorOpcode[valtype][op];
|
834
953
|
|
@@ -838,24 +957,69 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
|
|
838
957
|
includeBuiltin(scope, builtinName);
|
839
958
|
const idx = funcIndex[builtinName];
|
840
959
|
|
841
|
-
return
|
960
|
+
return finalize([
|
842
961
|
...left,
|
843
962
|
...right,
|
844
963
|
[ Opcodes.call, idx ]
|
845
964
|
]);
|
846
965
|
}
|
847
966
|
|
848
|
-
if (!ops) return todo(`operator ${op} not implemented yet
|
967
|
+
if (!ops) return todo(scope, `operator ${op} not implemented yet`, true);
|
849
968
|
|
850
969
|
if (!Array.isArray(ops)) ops = [ ops ];
|
851
970
|
ops = [ ops ];
|
852
971
|
|
853
972
|
let tmpLeft, tmpRight;
|
854
973
|
// if equal op, check if strings for compareStrings
|
855
|
-
|
974
|
+
// todo: intelligent partial skip later
|
975
|
+
// if neither known are string, stop this madness
|
976
|
+
// we already do known checks earlier, so don't need to recheck
|
977
|
+
|
978
|
+
if ((op === '===' || op === '==' || op === '!==' || op === '!=') && (knownLeft == null && knownRight == null)) {
|
856
979
|
tmpLeft = localTmp(scope, '__tmpop_left');
|
857
980
|
tmpRight = localTmp(scope, '__tmpop_right');
|
858
981
|
|
982
|
+
// returns false for one string, one not - but more ops/slower
|
983
|
+
// ops.unshift(...stringOnly([
|
984
|
+
// // if left is string
|
985
|
+
// ...leftType,
|
986
|
+
// ...number(TYPES.string, Valtype.i32),
|
987
|
+
// [ Opcodes.i32_eq ],
|
988
|
+
|
989
|
+
// // if right is string
|
990
|
+
// ...rightType,
|
991
|
+
// ...number(TYPES.string, Valtype.i32),
|
992
|
+
// [ Opcodes.i32_eq ],
|
993
|
+
|
994
|
+
// // if either are true
|
995
|
+
// [ Opcodes.i32_or ],
|
996
|
+
// [ Opcodes.if, Blocktype.void ],
|
997
|
+
|
998
|
+
// // todo: convert non-strings to strings, for now fail immediately if one is not
|
999
|
+
// // if left is not string
|
1000
|
+
// ...leftType,
|
1001
|
+
// ...number(TYPES.string, Valtype.i32),
|
1002
|
+
// [ Opcodes.i32_ne ],
|
1003
|
+
|
1004
|
+
// // if right is not string
|
1005
|
+
// ...rightType,
|
1006
|
+
// ...number(TYPES.string, Valtype.i32),
|
1007
|
+
// [ Opcodes.i32_ne ],
|
1008
|
+
|
1009
|
+
// // if either are true
|
1010
|
+
// [ Opcodes.i32_or ],
|
1011
|
+
// [ Opcodes.if, Blocktype.void ],
|
1012
|
+
// ...number(0, Valtype.i32),
|
1013
|
+
// [ Opcodes.br, 2 ],
|
1014
|
+
// [ Opcodes.end ],
|
1015
|
+
|
1016
|
+
// ...compareStrings(scope, [ [ Opcodes.local_get, tmpLeft ] ], [ [ Opcodes.local_get, tmpRight ] ]),
|
1017
|
+
// ...(op === '!==' || op === '!=' ? [ [ Opcodes.i32_eqz ] ] : []),
|
1018
|
+
// [ Opcodes.br, 1 ],
|
1019
|
+
// [ Opcodes.end ],
|
1020
|
+
// ]));
|
1021
|
+
|
1022
|
+
// does not handle one string, one not (such cases go past)
|
859
1023
|
ops.unshift(...stringOnly([
|
860
1024
|
// if left is string
|
861
1025
|
...leftType,
|
@@ -867,30 +1031,28 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
|
|
867
1031
|
...number(TYPES.string, Valtype.i32),
|
868
1032
|
[ Opcodes.i32_eq ],
|
869
1033
|
|
870
|
-
// if
|
871
|
-
[ Opcodes.
|
1034
|
+
// if both are true
|
1035
|
+
[ Opcodes.i32_and ],
|
872
1036
|
[ Opcodes.if, Blocktype.void ],
|
1037
|
+
...compareStrings(scope, [ [ Opcodes.local_get, tmpLeft ] ], [ [ Opcodes.local_get, tmpRight ] ]),
|
1038
|
+
...(op === '!==' || op === '!=' ? [ [ Opcodes.i32_eqz ] ] : []),
|
1039
|
+
[ Opcodes.br, 1 ],
|
1040
|
+
[ Opcodes.end ],
|
873
1041
|
|
874
|
-
//
|
875
|
-
// if left is not string
|
1042
|
+
// if left is bytestring
|
876
1043
|
...leftType,
|
877
|
-
...number(TYPES.
|
878
|
-
[ Opcodes.
|
1044
|
+
...number(TYPES._bytestring, Valtype.i32),
|
1045
|
+
[ Opcodes.i32_eq ],
|
879
1046
|
|
880
|
-
// if right is
|
1047
|
+
// if right is bytestring
|
881
1048
|
...rightType,
|
882
|
-
...number(TYPES.
|
883
|
-
[ Opcodes.
|
1049
|
+
...number(TYPES._bytestring, Valtype.i32),
|
1050
|
+
[ Opcodes.i32_eq ],
|
884
1051
|
|
885
|
-
// if
|
886
|
-
[ Opcodes.
|
1052
|
+
// if both are true
|
1053
|
+
[ Opcodes.i32_and ],
|
887
1054
|
[ Opcodes.if, Blocktype.void ],
|
888
|
-
...
|
889
|
-
[ Opcodes.br, 1 ],
|
890
|
-
[ Opcodes.end ],
|
891
|
-
|
892
|
-
...compareStrings(scope, [ [ Opcodes.local_get, tmpLeft ] ], [ [ Opcodes.local_get, tmpRight ] ]),
|
893
|
-
// ...compareStrings(scope, [ [ Opcodes.local_get, tmpLeft ] ], [ [ Opcodes.local_get, tmpRight ] ]),
|
1055
|
+
...compareStrings(scope, [ [ Opcodes.local_get, tmpLeft ] ], [ [ Opcodes.local_get, tmpRight ] ], true),
|
894
1056
|
...(op === '!==' || op === '!=' ? [ [ Opcodes.i32_eqz ] ] : []),
|
895
1057
|
[ Opcodes.br, 1 ],
|
896
1058
|
[ Opcodes.end ],
|
@@ -904,7 +1066,7 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
|
|
904
1066
|
// }
|
905
1067
|
}
|
906
1068
|
|
907
|
-
return
|
1069
|
+
return finalize([
|
908
1070
|
...left,
|
909
1071
|
...(tmpLeft != null ? stringOnly([ [ Opcodes.local_tee, tmpLeft ] ]) : []),
|
910
1072
|
...right,
|
@@ -921,7 +1083,22 @@ const generateBinaryExp = (scope, decl, _global, _name) => {
|
|
921
1083
|
return out;
|
922
1084
|
};
|
923
1085
|
|
924
|
-
const
|
1086
|
+
const asmFuncToAsm = (func, { name = '#unknown_asm_func', params = [], locals = [], returns = [], localInd = 0 }) => {
|
1087
|
+
return func({ name, params, locals, returns, localInd }, {
|
1088
|
+
TYPES, TYPE_NAMES, typeSwitch, makeArray, makeString, allocPage,
|
1089
|
+
builtin: name => {
|
1090
|
+
let idx = funcIndex[name] ?? importedFuncs[name];
|
1091
|
+
if (idx === undefined && builtinFuncs[name]) {
|
1092
|
+
includeBuiltin(null, name);
|
1093
|
+
idx = funcIndex[name];
|
1094
|
+
}
|
1095
|
+
|
1096
|
+
return idx;
|
1097
|
+
}
|
1098
|
+
});
|
1099
|
+
};
|
1100
|
+
|
1101
|
+
const asmFunc = (name, { wasm, params, locals: localTypes, globals: globalTypes = [], globalInits, returns, returnType, localNames = [], globalNames = [], data: _data = [] }) => {
|
925
1102
|
const existing = funcs.find(x => x.name === name);
|
926
1103
|
if (existing) return existing;
|
927
1104
|
|
@@ -933,6 +1110,14 @@ const asmFunc = (name, { wasm, params, locals: localTypes, globals: globalTypes
|
|
933
1110
|
locals[nameParam(i)] = { idx: i, type: allLocals[i] };
|
934
1111
|
}
|
935
1112
|
|
1113
|
+
for (const x of _data) {
|
1114
|
+
const copy = { ...x };
|
1115
|
+
copy.offset += pages.size * pageSize;
|
1116
|
+
data.push(copy);
|
1117
|
+
}
|
1118
|
+
|
1119
|
+
if (typeof wasm === 'function') wasm = asmFuncToAsm(wasm, { name, params, locals, returns, localInd: allLocals.length });
|
1120
|
+
|
936
1121
|
let baseGlobalIdx, i = 0;
|
937
1122
|
for (const type of globalTypes) {
|
938
1123
|
if (baseGlobalIdx === undefined) baseGlobalIdx = globalInd;
|
@@ -955,7 +1140,7 @@ const asmFunc = (name, { wasm, params, locals: localTypes, globals: globalTypes
|
|
955
1140
|
params,
|
956
1141
|
locals,
|
957
1142
|
returns,
|
958
|
-
returnType:
|
1143
|
+
returnType: returnType ?? TYPES.number,
|
959
1144
|
wasm,
|
960
1145
|
internal: true,
|
961
1146
|
index: currentFuncIndex++
|
@@ -978,6 +1163,7 @@ const generateLogicExp = (scope, decl) => {
|
|
978
1163
|
return performLogicOp(scope, decl.operator, generate(scope, decl.left), generate(scope, decl.right), getNodeType(scope, decl.left), getNodeType(scope, decl.right));
|
979
1164
|
};
|
980
1165
|
|
1166
|
+
// potential future ideas for nan boxing (unused):
|
981
1167
|
// T = JS type, V = value/pointer
|
982
1168
|
// 0bTTT
|
983
1169
|
// qNAN: 0 11111111111 1000000000000000000000000000000000000000000000000001
|
@@ -1001,47 +1187,29 @@ const generateLogicExp = (scope, decl) => {
|
|
1001
1187
|
// 4: internal type
|
1002
1188
|
// 5: pointer
|
1003
1189
|
|
1004
|
-
const
|
1005
|
-
|
1006
|
-
|
1007
|
-
string: 0x02,
|
1008
|
-
undefined: 0x03,
|
1009
|
-
object: 0x04,
|
1010
|
-
function: 0x05,
|
1011
|
-
symbol: 0x06,
|
1012
|
-
bigint: 0x07,
|
1013
|
-
|
1014
|
-
// these are not "typeof" types but tracked internally
|
1015
|
-
_array: 0x10,
|
1016
|
-
_regexp: 0x11
|
1017
|
-
};
|
1018
|
-
|
1019
|
-
const TYPE_NAMES = {
|
1020
|
-
[TYPES.number]: 'Number',
|
1021
|
-
[TYPES.boolean]: 'Boolean',
|
1022
|
-
[TYPES.string]: 'String',
|
1023
|
-
[TYPES.undefined]: 'undefined',
|
1024
|
-
[TYPES.object]: 'Object',
|
1025
|
-
[TYPES.function]: 'Function',
|
1026
|
-
[TYPES.symbol]: 'Symbol',
|
1027
|
-
[TYPES.bigint]: 'BigInt',
|
1190
|
+
const isExistingProtoFunc = name => {
|
1191
|
+
if (name.startsWith('__Array_prototype')) return !!prototypeFuncs[TYPES._array][name.slice(18)];
|
1192
|
+
if (name.startsWith('__String_prototype_')) return !!prototypeFuncs[TYPES.string][name.slice(19)];
|
1028
1193
|
|
1029
|
-
|
1030
|
-
[TYPES._regexp]: 'RegExp'
|
1194
|
+
return false;
|
1031
1195
|
};
|
1032
1196
|
|
1033
1197
|
const getType = (scope, _name) => {
|
1034
1198
|
const name = mapName(_name);
|
1035
1199
|
|
1200
|
+
// if (scope.locals[name] && !scope.locals[name + '#type']) console.log(name);
|
1201
|
+
|
1202
|
+
if (typedInput && scope.locals[name]?.metadata?.type != null) return number(scope.locals[name].metadata.type, Valtype.i32);
|
1036
1203
|
if (scope.locals[name]) return [ [ Opcodes.local_get, scope.locals[name + '#type'].idx ] ];
|
1204
|
+
|
1205
|
+
if (typedInput && globals[name]?.metadata?.type != null) return number(globals[name].metadata.type, Valtype.i32);
|
1037
1206
|
if (globals[name]) return [ [ Opcodes.global_get, globals[name + '#type'].idx ] ];
|
1038
1207
|
|
1039
1208
|
let type = TYPES.undefined;
|
1040
|
-
if (builtinVars[name]) type =
|
1209
|
+
if (builtinVars[name]) type = builtinVars[name].type ?? TYPES.number;
|
1041
1210
|
if (builtinFuncs[name] !== undefined || importedFuncs[name] !== undefined || funcIndex[name] !== undefined || internalConstrs[name] !== undefined) type = TYPES.function;
|
1042
1211
|
|
1043
|
-
if (name
|
1044
|
-
name.startsWith('__String_prototype_') && prototypeFuncs[TYPES.string][name.slice(19)]) type = TYPES.function;
|
1212
|
+
if (isExistingProtoFunc(name)) type = TYPES.function;
|
1045
1213
|
|
1046
1214
|
return number(type, Valtype.i32);
|
1047
1215
|
};
|
@@ -1051,17 +1219,29 @@ const setType = (scope, _name, type) => {
|
|
1051
1219
|
|
1052
1220
|
const out = typeof type === 'number' ? number(type, Valtype.i32) : type;
|
1053
1221
|
|
1222
|
+
if (typedInput && scope.locals[name]?.metadata?.type != null) return [];
|
1054
1223
|
if (scope.locals[name]) return [
|
1055
1224
|
...out,
|
1056
1225
|
[ Opcodes.local_set, scope.locals[name + '#type'].idx ]
|
1057
1226
|
];
|
1058
1227
|
|
1228
|
+
if (typedInput && globals[name]?.metadata?.type != null) return [];
|
1059
1229
|
if (globals[name]) return [
|
1060
1230
|
...out,
|
1061
1231
|
[ Opcodes.global_set, globals[name + '#type'].idx ]
|
1062
1232
|
];
|
1063
1233
|
|
1064
1234
|
// throw new Error('could not find var');
|
1235
|
+
return [];
|
1236
|
+
};
|
1237
|
+
|
1238
|
+
const getLastType = scope => {
|
1239
|
+
scope.gotLastType = true;
|
1240
|
+
return [ [ Opcodes.local_get, localTmp(scope, '#last_type', Valtype.i32) ] ];
|
1241
|
+
};
|
1242
|
+
|
1243
|
+
const setLastType = scope => {
|
1244
|
+
return [ [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ] ];
|
1065
1245
|
};
|
1066
1246
|
|
1067
1247
|
const getNodeType = (scope, node) => {
|
@@ -1069,6 +1249,8 @@ const getNodeType = (scope, node) => {
|
|
1069
1249
|
if (node.type === 'Literal') {
|
1070
1250
|
if (node.regex) return TYPES._regexp;
|
1071
1251
|
|
1252
|
+
if (typeof node.value === 'string' && byteStringable(node.value)) return TYPES._bytestring;
|
1253
|
+
|
1072
1254
|
return TYPES[typeof node.value];
|
1073
1255
|
}
|
1074
1256
|
|
@@ -1082,6 +1264,27 @@ const getNodeType = (scope, node) => {
|
|
1082
1264
|
|
1083
1265
|
if (node.type === 'CallExpression' || node.type === 'NewExpression') {
|
1084
1266
|
const name = node.callee.name;
|
1267
|
+
if (!name) {
|
1268
|
+
// iife
|
1269
|
+
if (scope.locals['#last_type']) return getLastType(scope);
|
1270
|
+
|
1271
|
+
// presume
|
1272
|
+
// todo: warn here?
|
1273
|
+
return TYPES.number;
|
1274
|
+
}
|
1275
|
+
|
1276
|
+
if (node.type === 'NewExpression' && builtinFuncs[name + '$constructor']) {
|
1277
|
+
if (builtinFuncs[name + '$constructor'].typedReturns) {
|
1278
|
+
if (scope.locals['#last_type']) return getLastType(scope);
|
1279
|
+
|
1280
|
+
// presume
|
1281
|
+
// todo: warn here?
|
1282
|
+
return TYPES.number;
|
1283
|
+
}
|
1284
|
+
|
1285
|
+
return builtinFuncs[name + '$constructor'].returnType ?? TYPES.number;
|
1286
|
+
}
|
1287
|
+
|
1085
1288
|
const func = funcs.find(x => x.name === name);
|
1086
1289
|
|
1087
1290
|
if (func) {
|
@@ -1089,10 +1292,27 @@ const getNodeType = (scope, node) => {
|
|
1089
1292
|
if (func.returnType) return func.returnType;
|
1090
1293
|
}
|
1091
1294
|
|
1092
|
-
if (builtinFuncs[name]) return
|
1295
|
+
if (builtinFuncs[name] && !builtinFuncs[name].typedReturns) return builtinFuncs[name].returnType ?? TYPES.number;
|
1093
1296
|
if (internalConstrs[name]) return internalConstrs[name].type;
|
1094
1297
|
|
1095
|
-
|
1298
|
+
// check if this is a prototype function
|
1299
|
+
// if so and there is only one impl (eg charCodeAt)
|
1300
|
+
// use that return type as that is the only possibility
|
1301
|
+
// (if non-matching type it would error out)
|
1302
|
+
if (name.startsWith('__')) {
|
1303
|
+
const spl = name.slice(2).split('_');
|
1304
|
+
|
1305
|
+
const func = spl[spl.length - 1];
|
1306
|
+
const protoFuncs = Object.keys(prototypeFuncs).filter(x => x != TYPES._bytestring && prototypeFuncs[x][func] != null);
|
1307
|
+
if (protoFuncs.length === 1) return protoFuncs[0].returnType ?? TYPES.number;
|
1308
|
+
}
|
1309
|
+
|
1310
|
+
if (name.startsWith('__Porffor_wasm_')) {
|
1311
|
+
// todo: return undefined for non-returning ops
|
1312
|
+
return TYPES.number;
|
1313
|
+
}
|
1314
|
+
|
1315
|
+
if (scope.locals['#last_type']) return getLastType(scope);
|
1096
1316
|
|
1097
1317
|
// presume
|
1098
1318
|
// todo: warn here?
|
@@ -1140,6 +1360,15 @@ const getNodeType = (scope, node) => {
|
|
1140
1360
|
|
1141
1361
|
if (node.type === 'BinaryExpression') {
|
1142
1362
|
if (['==', '===', '!=', '!==', '>', '>=', '<', '<='].includes(node.operator)) return TYPES.boolean;
|
1363
|
+
if (node.operator !== '+') return TYPES.number;
|
1364
|
+
|
1365
|
+
const knownLeft = knownType(scope, getNodeType(scope, node.left));
|
1366
|
+
const knownRight = knownType(scope, getNodeType(scope, node.right));
|
1367
|
+
|
1368
|
+
// todo: this should be dynamic but for now only static
|
1369
|
+
if (knownLeft === TYPES.string || knownRight === TYPES.string) return TYPES.string;
|
1370
|
+
if (knownLeft === TYPES._bytestring || knownRight === TYPES._bytestring) return TYPES._bytestring;
|
1371
|
+
|
1143
1372
|
return TYPES.number;
|
1144
1373
|
|
1145
1374
|
// todo: string concat types
|
@@ -1164,7 +1393,7 @@ const getNodeType = (scope, node) => {
|
|
1164
1393
|
if (node.operator === '!') return TYPES.boolean;
|
1165
1394
|
if (node.operator === 'void') return TYPES.undefined;
|
1166
1395
|
if (node.operator === 'delete') return TYPES.boolean;
|
1167
|
-
if (node.operator === 'typeof') return TYPES.string;
|
1396
|
+
if (node.operator === 'typeof') return Prefs.bytestring ? TYPES._bytestring : TYPES.string;
|
1168
1397
|
|
1169
1398
|
return TYPES.number;
|
1170
1399
|
}
|
@@ -1173,11 +1402,23 @@ const getNodeType = (scope, node) => {
|
|
1173
1402
|
// hack: if something.length, number type
|
1174
1403
|
if (node.property.name === 'length') return TYPES.number;
|
1175
1404
|
|
1176
|
-
//
|
1405
|
+
// ts hack
|
1406
|
+
if (scope.locals[node.object.name]?.metadata?.type === TYPES.string) return TYPES.string;
|
1407
|
+
if (scope.locals[node.object.name]?.metadata?.type === TYPES._bytestring) return TYPES._bytestring;
|
1408
|
+
if (scope.locals[node.object.name]?.metadata?.type === TYPES._array) return TYPES.number;
|
1409
|
+
|
1410
|
+
if (scope.locals['#last_type']) return getLastType(scope);
|
1411
|
+
|
1412
|
+
// presume
|
1177
1413
|
return TYPES.number;
|
1178
1414
|
}
|
1179
1415
|
|
1180
|
-
if (
|
1416
|
+
if (node.type === 'TaggedTemplateExpression') {
|
1417
|
+
// hack
|
1418
|
+
if (node.tag.name.startsWith('__Porffor_')) return TYPES.number;
|
1419
|
+
}
|
1420
|
+
|
1421
|
+
if (scope.locals['#last_type']) return getLastType(scope);
|
1181
1422
|
|
1182
1423
|
// presume
|
1183
1424
|
// todo: warn here?
|
@@ -1193,8 +1434,8 @@ const getNodeType = (scope, node) => {
|
|
1193
1434
|
const generateLiteral = (scope, decl, global, name) => {
|
1194
1435
|
if (decl.value === null) return number(NULL);
|
1195
1436
|
|
1437
|
+
// hack: just return 1 for regex literals
|
1196
1438
|
if (decl.regex) {
|
1197
|
-
scope.regex[name] = decl.regex;
|
1198
1439
|
return number(1);
|
1199
1440
|
}
|
1200
1441
|
|
@@ -1207,19 +1448,10 @@ const generateLiteral = (scope, decl, global, name) => {
|
|
1207
1448
|
return number(decl.value ? 1 : 0);
|
1208
1449
|
|
1209
1450
|
case 'string':
|
1210
|
-
|
1211
|
-
const rawElements = new Array(str.length);
|
1212
|
-
let j = 0;
|
1213
|
-
for (let i = 0; i < str.length; i++) {
|
1214
|
-
rawElements[i] = str.charCodeAt(i);
|
1215
|
-
}
|
1216
|
-
|
1217
|
-
return makeArray(scope, {
|
1218
|
-
rawElements
|
1219
|
-
}, global, name, false, 'i16')[0];
|
1451
|
+
return makeString(scope, decl.value, global, name);
|
1220
1452
|
|
1221
1453
|
default:
|
1222
|
-
return todo(`cannot generate literal of type ${typeof decl.value}
|
1454
|
+
return todo(scope, `cannot generate literal of type ${typeof decl.value}`, true);
|
1223
1455
|
}
|
1224
1456
|
};
|
1225
1457
|
|
@@ -1228,6 +1460,8 @@ const countLeftover = wasm => {
|
|
1228
1460
|
|
1229
1461
|
for (let i = 0; i < wasm.length; i++) {
|
1230
1462
|
const inst = wasm[i];
|
1463
|
+
if (inst[0] == null) continue;
|
1464
|
+
|
1231
1465
|
if (depth === 0 && (inst[0] === Opcodes.if || inst[0] === Opcodes.block || inst[0] === Opcodes.loop)) {
|
1232
1466
|
if (inst[0] === Opcodes.if) count--;
|
1233
1467
|
if (inst[1] !== Blocktype.void) count++;
|
@@ -1236,18 +1470,25 @@ const countLeftover = wasm => {
|
|
1236
1470
|
if (inst[0] === Opcodes.end) depth--;
|
1237
1471
|
|
1238
1472
|
if (depth === 0)
|
1239
|
-
if ([Opcodes.throw,Opcodes.drop, Opcodes.local_set, Opcodes.global_set].includes(inst[0])) count--;
|
1240
|
-
else if ([null, Opcodes.i32_eqz, Opcodes.i64_eqz, Opcodes.f64_ceil, Opcodes.f64_floor, Opcodes.f64_trunc, Opcodes.f64_nearest, Opcodes.f64_sqrt, Opcodes.local_tee, Opcodes.i32_wrap_i64, Opcodes.i64_extend_i32_s, Opcodes.i64_extend_i32_u, Opcodes.f32_demote_f64, Opcodes.f64_promote_f32, Opcodes.f64_convert_i32_s, Opcodes.f64_convert_i32_u, Opcodes.i32_clz, Opcodes.i32_ctz, Opcodes.i32_popcnt, Opcodes.f64_neg, Opcodes.end, Opcodes.i32_trunc_sat_f64_s[0], Opcodes.i32x4_extract_lane, Opcodes.i16x8_extract_lane, Opcodes.i32_load, Opcodes.i64_load, Opcodes.f64_load, Opcodes.v128_load, Opcodes.i32_load16_u, Opcodes.i32_load16_s, Opcodes.memory_grow].includes(inst[0]) && (inst[0] !== 0xfc || inst[1] < 0x0a)) {}
|
1241
|
-
else if ([Opcodes.local_get, Opcodes.global_get, Opcodes.f64_const, Opcodes.i32_const, Opcodes.i64_const, Opcodes.v128_const].includes(inst[0])) count++;
|
1242
|
-
else if ([Opcodes.i32_store, Opcodes.i64_store, Opcodes.f64_store, Opcodes.i32_store16].includes(inst[0])) count -= 2;
|
1473
|
+
if ([Opcodes.throw, Opcodes.drop, Opcodes.local_set, Opcodes.global_set].includes(inst[0])) count--;
|
1474
|
+
else if ([null, Opcodes.i32_eqz, Opcodes.i64_eqz, Opcodes.f64_ceil, Opcodes.f64_floor, Opcodes.f64_trunc, Opcodes.f64_nearest, Opcodes.f64_sqrt, Opcodes.local_tee, Opcodes.i32_wrap_i64, Opcodes.i64_extend_i32_s, Opcodes.i64_extend_i32_u, Opcodes.f32_demote_f64, Opcodes.f64_promote_f32, Opcodes.f64_convert_i32_s, Opcodes.f64_convert_i32_u, Opcodes.i32_clz, Opcodes.i32_ctz, Opcodes.i32_popcnt, Opcodes.f64_neg, Opcodes.end, Opcodes.i32_trunc_sat_f64_s[0], Opcodes.i32x4_extract_lane, Opcodes.i16x8_extract_lane, Opcodes.i32_load, Opcodes.i64_load, Opcodes.f64_load, Opcodes.v128_load, Opcodes.i32_load16_u, Opcodes.i32_load16_s, Opcodes.i32_load8_u, Opcodes.i32_load8_s, Opcodes.memory_grow].includes(inst[0]) && (inst[0] !== 0xfc || inst[1] < 0x0a)) {}
|
1475
|
+
else if ([Opcodes.local_get, Opcodes.global_get, Opcodes.f64_const, Opcodes.i32_const, Opcodes.i64_const, Opcodes.v128_const, Opcodes.memory_size].includes(inst[0])) count++;
|
1476
|
+
else if ([Opcodes.i32_store, Opcodes.i64_store, Opcodes.f64_store, Opcodes.i32_store16, Opcodes.i32_store8].includes(inst[0])) count -= 2;
|
1243
1477
|
else if (Opcodes.memory_copy[0] === inst[0] && Opcodes.memory_copy[1] === inst[1]) count -= 3;
|
1244
1478
|
else if (inst[0] === Opcodes.return) count = 0;
|
1245
1479
|
else if (inst[0] === Opcodes.call) {
|
1246
1480
|
let func = funcs.find(x => x.index === inst[1]);
|
1247
|
-
if (
|
1248
|
-
count
|
1249
|
-
} else
|
1250
|
-
|
1481
|
+
if (inst[1] === -1) {
|
1482
|
+
// todo: count for calling self
|
1483
|
+
} else if (!func && inst[1] < importedFuncs.length) {
|
1484
|
+
count -= importedFuncs[inst[1]].params;
|
1485
|
+
count += importedFuncs[inst[1]].returns;
|
1486
|
+
} else {
|
1487
|
+
if (func) {
|
1488
|
+
count -= func.params.length;
|
1489
|
+
} else count--;
|
1490
|
+
if (func) count += func.returns.length;
|
1491
|
+
}
|
1251
1492
|
} else count--;
|
1252
1493
|
|
1253
1494
|
// console.log(count, decompile([ inst ]).slice(0, -1));
|
@@ -1265,7 +1506,7 @@ const disposeLeftover = wasm => {
|
|
1265
1506
|
const generateExp = (scope, decl) => {
|
1266
1507
|
const expression = decl.expression;
|
1267
1508
|
|
1268
|
-
const out = generate(scope, expression);
|
1509
|
+
const out = generate(scope, expression, undefined, undefined, true);
|
1269
1510
|
disposeLeftover(out);
|
1270
1511
|
|
1271
1512
|
return out;
|
@@ -1323,7 +1564,7 @@ const RTArrayUtil = {
|
|
1323
1564
|
]
|
1324
1565
|
};
|
1325
1566
|
|
1326
|
-
const generateCall = (scope, decl, _global, _name) => {
|
1567
|
+
const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
|
1327
1568
|
/* const callee = decl.callee;
|
1328
1569
|
const args = decl.arguments;
|
1329
1570
|
|
@@ -1339,10 +1580,21 @@ const generateCall = (scope, decl, _global, _name) => {
|
|
1339
1580
|
name = func.name;
|
1340
1581
|
}
|
1341
1582
|
|
1342
|
-
if (name === 'eval' && decl.arguments[0]
|
1583
|
+
if (name === 'eval' && decl.arguments[0]?.type === 'Literal') {
|
1343
1584
|
// literal eval hack
|
1344
|
-
const code = decl.arguments[0]
|
1345
|
-
|
1585
|
+
const code = decl.arguments[0]?.value ?? '';
|
1586
|
+
|
1587
|
+
let parsed;
|
1588
|
+
try {
|
1589
|
+
parsed = parse(code, []);
|
1590
|
+
} catch (e) {
|
1591
|
+
if (e.name === 'SyntaxError') {
|
1592
|
+
// throw syntax errors of evals at runtime instead
|
1593
|
+
return internalThrow(scope, 'SyntaxError', e.message, true);
|
1594
|
+
}
|
1595
|
+
|
1596
|
+
throw e;
|
1597
|
+
}
|
1346
1598
|
|
1347
1599
|
const out = generate(scope, {
|
1348
1600
|
type: 'BlockStatement',
|
@@ -1356,13 +1608,13 @@ const generateCall = (scope, decl, _global, _name) => {
|
|
1356
1608
|
const finalStatement = parsed.body[parsed.body.length - 1];
|
1357
1609
|
out.push(
|
1358
1610
|
...getNodeType(scope, finalStatement),
|
1359
|
-
|
1611
|
+
...setLastType(scope)
|
1360
1612
|
);
|
1361
1613
|
} else if (countLeftover(out) === 0) {
|
1362
1614
|
out.push(...number(UNDEFINED));
|
1363
1615
|
out.push(
|
1364
1616
|
...number(TYPES.undefined, Valtype.i32),
|
1365
|
-
|
1617
|
+
...setLastType(scope)
|
1366
1618
|
);
|
1367
1619
|
}
|
1368
1620
|
|
@@ -1380,39 +1632,47 @@ const generateCall = (scope, decl, _global, _name) => {
|
|
1380
1632
|
if (name && name.startsWith('__')) {
|
1381
1633
|
const spl = name.slice(2).split('_');
|
1382
1634
|
|
1383
|
-
|
1384
|
-
protoName = func;
|
1635
|
+
protoName = spl[spl.length - 1];
|
1385
1636
|
|
1386
1637
|
target = { ...decl.callee };
|
1387
1638
|
target.name = spl.slice(0, -1).join('_');
|
1639
|
+
|
1640
|
+
// failed to lookup name, abort
|
1641
|
+
if (!lookupName(scope, target.name)[0]) protoName = null;
|
1388
1642
|
}
|
1389
1643
|
|
1390
1644
|
// literal.func()
|
1391
1645
|
if (!name && decl.callee.type === 'MemberExpression') {
|
1392
1646
|
// megahack for /regex/.func()
|
1393
|
-
|
1394
|
-
|
1395
|
-
const
|
1647
|
+
const funcName = decl.callee.property.name;
|
1648
|
+
if (decl.callee.object.regex && Object.hasOwn(Rhemyn, funcName)) {
|
1649
|
+
const regex = decl.callee.object.regex.pattern;
|
1650
|
+
const rhemynName = `regex_${funcName}_${regex}`;
|
1651
|
+
|
1652
|
+
if (!funcIndex[rhemynName]) {
|
1653
|
+
const func = Rhemyn[funcName](regex, currentFuncIndex++, rhemynName);
|
1396
1654
|
|
1397
|
-
|
1398
|
-
|
1655
|
+
funcIndex[func.name] = func.index;
|
1656
|
+
funcs.push(func);
|
1657
|
+
}
|
1399
1658
|
|
1659
|
+
const idx = funcIndex[rhemynName];
|
1400
1660
|
return [
|
1401
1661
|
// make string arg
|
1402
1662
|
...generate(scope, decl.arguments[0]),
|
1663
|
+
Opcodes.i32_to_u,
|
1664
|
+
...getNodeType(scope, decl.arguments[0]),
|
1403
1665
|
|
1404
1666
|
// call regex func
|
1405
|
-
Opcodes.
|
1406
|
-
[ Opcodes.call, func.index ],
|
1667
|
+
[ Opcodes.call, idx ],
|
1407
1668
|
Opcodes.i32_from_u,
|
1408
1669
|
|
1409
1670
|
...number(TYPES.boolean, Valtype.i32),
|
1410
|
-
|
1671
|
+
...setLastType(scope)
|
1411
1672
|
];
|
1412
1673
|
}
|
1413
1674
|
|
1414
|
-
|
1415
|
-
protoName = func;
|
1675
|
+
protoName = decl.callee.property.name;
|
1416
1676
|
|
1417
1677
|
target = decl.callee.object;
|
1418
1678
|
}
|
@@ -1433,23 +1693,48 @@ const generateCall = (scope, decl, _global, _name) => {
|
|
1433
1693
|
// }
|
1434
1694
|
|
1435
1695
|
if (protoName) {
|
1696
|
+
const protoBC = {};
|
1697
|
+
|
1698
|
+
const builtinProtoCands = Object.keys(builtinFuncs).filter(x => x.startsWith('__') && x.endsWith('_prototype_' + protoName));
|
1699
|
+
|
1700
|
+
if (!decl._protoInternalCall && builtinProtoCands.length > 0) {
|
1701
|
+
for (const x of builtinProtoCands) {
|
1702
|
+
const type = TYPES[x.split('_prototype_')[0].slice(2).toLowerCase()];
|
1703
|
+
if (type == null) continue;
|
1704
|
+
|
1705
|
+
protoBC[type] = generateCall(scope, {
|
1706
|
+
callee: {
|
1707
|
+
type: 'Identifier',
|
1708
|
+
name: x
|
1709
|
+
},
|
1710
|
+
arguments: [ target, ...decl.arguments ],
|
1711
|
+
_protoInternalCall: true
|
1712
|
+
});
|
1713
|
+
}
|
1714
|
+
}
|
1715
|
+
|
1436
1716
|
const protoCands = Object.keys(prototypeFuncs).reduce((acc, x) => {
|
1437
|
-
|
1438
|
-
if (f) acc[x] = f;
|
1717
|
+
if (Object.hasOwn(prototypeFuncs[x], protoName)) acc[x] = prototypeFuncs[x][protoName];
|
1439
1718
|
return acc;
|
1440
1719
|
}, {});
|
1441
1720
|
|
1442
|
-
// no prototype function candidates, ignore
|
1443
1721
|
if (Object.keys(protoCands).length > 0) {
|
1444
1722
|
// use local for cached i32 length as commonly used
|
1445
1723
|
const lengthLocal = localTmp(scope, '__proto_length_cache', Valtype.i32);
|
1446
1724
|
const pointerLocal = localTmp(scope, '__proto_pointer_cache', Valtype.i32);
|
1447
|
-
const getPointer = [ [ Opcodes.local_get, pointerLocal ] ];
|
1448
1725
|
|
1449
1726
|
// TODO: long-term, prototypes should be their individual separate funcs
|
1450
1727
|
|
1728
|
+
const rawPointer = [
|
1729
|
+
...generate(scope, target),
|
1730
|
+
Opcodes.i32_to_u
|
1731
|
+
];
|
1732
|
+
|
1733
|
+
const usePointerCache = !Object.values(protoCands).every(x => x.noPointerCache === true);
|
1734
|
+
const getPointer = usePointerCache ? [ [ Opcodes.local_get, pointerLocal ] ] : rawPointer;
|
1735
|
+
|
1736
|
+
let allOptUnused = true;
|
1451
1737
|
let lengthI32CacheUsed = false;
|
1452
|
-
const protoBC = {};
|
1453
1738
|
for (const x in protoCands) {
|
1454
1739
|
const protoFunc = protoCands[x];
|
1455
1740
|
if (protoFunc.noArgRetLength && decl.arguments.length === 0) {
|
@@ -1457,7 +1742,7 @@ const generateCall = (scope, decl, _global, _name) => {
|
|
1457
1742
|
...RTArrayUtil.getLength(getPointer),
|
1458
1743
|
|
1459
1744
|
...number(TYPES.number, Valtype.i32),
|
1460
|
-
|
1745
|
+
...setLastType(scope)
|
1461
1746
|
];
|
1462
1747
|
continue;
|
1463
1748
|
}
|
@@ -1467,6 +1752,7 @@ const generateCall = (scope, decl, _global, _name) => {
|
|
1467
1752
|
const protoLocal = protoFunc.local ? localTmp(scope, `__${protoName}_tmp`, protoFunc.local) : -1;
|
1468
1753
|
const protoLocal2 = protoFunc.local2 ? localTmp(scope, `__${protoName}_tmp2`, protoFunc.local2) : -1;
|
1469
1754
|
|
1755
|
+
let optUnused = false;
|
1470
1756
|
const protoOut = protoFunc(getPointer, {
|
1471
1757
|
getCachedI32: () => {
|
1472
1758
|
lengthI32CacheUsed = true;
|
@@ -1481,23 +1767,30 @@ const generateCall = (scope, decl, _global, _name) => {
|
|
1481
1767
|
return makeArray(scope, {
|
1482
1768
|
rawElements: new Array(length)
|
1483
1769
|
}, _global, _name, true, itemType);
|
1770
|
+
}, () => {
|
1771
|
+
optUnused = true;
|
1772
|
+
return unusedValue;
|
1484
1773
|
});
|
1485
1774
|
|
1775
|
+
if (!optUnused) allOptUnused = false;
|
1776
|
+
|
1486
1777
|
protoBC[x] = [
|
1487
|
-
[ Opcodes.block, valtypeBinary ],
|
1778
|
+
[ Opcodes.block, unusedValue && optUnused ? Blocktype.void : valtypeBinary ],
|
1488
1779
|
...protoOut,
|
1489
1780
|
|
1490
1781
|
...number(protoFunc.returnType ?? TYPES.number, Valtype.i32),
|
1491
|
-
|
1782
|
+
...setLastType(scope),
|
1492
1783
|
[ Opcodes.end ]
|
1493
1784
|
];
|
1494
1785
|
}
|
1495
1786
|
|
1496
|
-
|
1497
|
-
...generate(scope, target),
|
1787
|
+
// todo: if some cands use optUnused and some don't, we will probably crash
|
1498
1788
|
|
1499
|
-
|
1500
|
-
|
1789
|
+
return [
|
1790
|
+
...(usePointerCache ? [
|
1791
|
+
...rawPointer,
|
1792
|
+
[ Opcodes.local_set, pointerLocal ],
|
1793
|
+
] : []),
|
1501
1794
|
|
1502
1795
|
...(!lengthI32CacheUsed ? [] : [
|
1503
1796
|
...RTArrayUtil.getLengthI32(getPointer),
|
@@ -1509,13 +1802,22 @@ const generateCall = (scope, decl, _global, _name) => {
|
|
1509
1802
|
|
1510
1803
|
// TODO: error better
|
1511
1804
|
default: internalThrow(scope, 'TypeError', `'${protoName}' proto func tried to be called on a type without an impl`)
|
1512
|
-
}, valtypeBinary),
|
1805
|
+
}, allOptUnused && unusedValue ? Blocktype.void : valtypeBinary),
|
1513
1806
|
];
|
1514
1807
|
}
|
1808
|
+
|
1809
|
+
if (Object.keys(protoBC).length > 0) {
|
1810
|
+
return typeSwitch(scope, getNodeType(scope, target), {
|
1811
|
+
...protoBC,
|
1812
|
+
|
1813
|
+
// TODO: error better
|
1814
|
+
default: internalThrow(scope, 'TypeError', `'${protoName}' proto func tried to be called on a type without an impl`)
|
1815
|
+
}, valtypeBinary);
|
1816
|
+
}
|
1515
1817
|
}
|
1516
1818
|
|
1517
1819
|
// TODO: only allows callee as literal
|
1518
|
-
if (!name) return todo(`only literal callees (got ${decl.callee.type})`);
|
1820
|
+
if (!name) return todo(scope, `only literal callees (got ${decl.callee.type})`);
|
1519
1821
|
|
1520
1822
|
let idx = funcIndex[name] ?? importedFuncs[name];
|
1521
1823
|
if (idx === undefined && builtinFuncs[name]) {
|
@@ -1525,20 +1827,20 @@ const generateCall = (scope, decl, _global, _name) => {
|
|
1525
1827
|
idx = funcIndex[name];
|
1526
1828
|
|
1527
1829
|
// infer arguments types from builtins params
|
1528
|
-
const func = funcs.find(x => x.name === name);
|
1529
|
-
for (let i = 0; i < decl.arguments.length; i++) {
|
1530
|
-
|
1531
|
-
|
1532
|
-
|
1533
|
-
|
1534
|
-
|
1535
|
-
|
1536
|
-
|
1537
|
-
|
1538
|
-
|
1539
|
-
|
1540
|
-
|
1541
|
-
}
|
1830
|
+
// const func = funcs.find(x => x.name === name);
|
1831
|
+
// for (let i = 0; i < decl.arguments.length; i++) {
|
1832
|
+
// const arg = decl.arguments[i];
|
1833
|
+
// if (!arg.name) continue;
|
1834
|
+
|
1835
|
+
// const local = scope.locals[arg.name];
|
1836
|
+
// if (!local) continue;
|
1837
|
+
|
1838
|
+
// local.type = func.params[i];
|
1839
|
+
// if (local.type === Valtype.v128) {
|
1840
|
+
// // specify vec subtype inferred from last vec type in function name
|
1841
|
+
// local.vecType = name.split('_').reverse().find(x => x.includes('x'));
|
1842
|
+
// }
|
1843
|
+
// }
|
1542
1844
|
}
|
1543
1845
|
|
1544
1846
|
if (idx === undefined && internalConstrs[name]) return internalConstrs[name].generate(scope, decl, _global, _name);
|
@@ -1548,15 +1850,63 @@ const generateCall = (scope, decl, _global, _name) => {
|
|
1548
1850
|
idx = -1;
|
1549
1851
|
}
|
1550
1852
|
|
1853
|
+
if (idx === undefined && name.startsWith('__Porffor_wasm_')) {
|
1854
|
+
const wasmOps = {
|
1855
|
+
// pointer, align, offset
|
1856
|
+
i32_load: { imms: 2, args: [ true ], returns: 1 },
|
1857
|
+
// pointer, value, align, offset
|
1858
|
+
i32_store: { imms: 2, args: [ true, true ], returns: 0 },
|
1859
|
+
// pointer, align, offset
|
1860
|
+
i32_load8_u: { imms: 2, args: [ true ], returns: 1 },
|
1861
|
+
// pointer, value, align, offset
|
1862
|
+
i32_store8: { imms: 2, args: [ true, true ], returns: 0 },
|
1863
|
+
// pointer, align, offset
|
1864
|
+
i32_load16_u: { imms: 2, args: [ true ], returns: 1 },
|
1865
|
+
// pointer, value, align, offset
|
1866
|
+
i32_store16: { imms: 2, args: [ true, true ], returns: 0 },
|
1867
|
+
|
1868
|
+
// pointer, align, offset
|
1869
|
+
f64_load: { imms: 2, args: [ true ], returns: 0 }, // 0 due to not i32
|
1870
|
+
// pointer, value, align, offset
|
1871
|
+
f64_store: { imms: 2, args: [ true, false ], returns: 0 },
|
1872
|
+
|
1873
|
+
// value
|
1874
|
+
i32_const: { imms: 1, args: [], returns: 1 },
|
1875
|
+
};
|
1876
|
+
|
1877
|
+
const opName = name.slice('__Porffor_wasm_'.length);
|
1878
|
+
|
1879
|
+
if (wasmOps[opName]) {
|
1880
|
+
const op = wasmOps[opName];
|
1881
|
+
|
1882
|
+
const argOut = [];
|
1883
|
+
for (let i = 0; i < op.args.length; i++) argOut.push(
|
1884
|
+
...generate(scope, decl.arguments[i]),
|
1885
|
+
...(op.args[i] ? [ Opcodes.i32_to ] : [])
|
1886
|
+
);
|
1887
|
+
|
1888
|
+
// literals only
|
1889
|
+
const imms = decl.arguments.slice(op.args.length).map(x => x.value);
|
1890
|
+
|
1891
|
+
return [
|
1892
|
+
...argOut,
|
1893
|
+
[ Opcodes[opName], ...imms ],
|
1894
|
+
...(new Array(op.returns).fill(Opcodes.i32_from))
|
1895
|
+
];
|
1896
|
+
}
|
1897
|
+
}
|
1898
|
+
|
1551
1899
|
if (idx === undefined) {
|
1552
|
-
if (scope.locals[name] !== undefined || globals[name] !== undefined || builtinVars[name] !== undefined) return internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function
|
1553
|
-
return internalThrow(scope, 'ReferenceError', `${unhackName(name)} is not defined
|
1900
|
+
if (scope.locals[name] !== undefined || globals[name] !== undefined || builtinVars[name] !== undefined) return internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function`, true);
|
1901
|
+
return internalThrow(scope, 'ReferenceError', `${unhackName(name)} is not defined`, true);
|
1554
1902
|
}
|
1555
1903
|
|
1556
1904
|
const func = funcs.find(x => x.index === idx);
|
1557
1905
|
|
1558
1906
|
const userFunc = (funcIndex[name] && !importedFuncs[name] && !builtinFuncs[name] && !internalConstrs[name]) || idx === -1;
|
1559
|
-
const
|
1907
|
+
const typedParams = userFunc || builtinFuncs[name]?.typedParams;
|
1908
|
+
const typedReturns = (func ? func.returnType == null : userFunc) || builtinFuncs[name]?.typedReturns;
|
1909
|
+
const paramCount = func && (typedParams ? func.params.length / 2 : func.params.length);
|
1560
1910
|
|
1561
1911
|
let args = decl.arguments;
|
1562
1912
|
if (func && args.length < paramCount) {
|
@@ -1572,14 +1922,24 @@ const generateCall = (scope, decl, _global, _name) => {
|
|
1572
1922
|
if (func && func.throws) scope.throws = true;
|
1573
1923
|
|
1574
1924
|
let out = [];
|
1575
|
-
for (
|
1925
|
+
for (let i = 0; i < args.length; i++) {
|
1926
|
+
const arg = args[i];
|
1576
1927
|
out = out.concat(generate(scope, arg));
|
1577
|
-
|
1928
|
+
|
1929
|
+
if (builtinFuncs[name] && builtinFuncs[name].params[i * (typedParams ? 2 : 1)] === Valtype.i32 && valtypeBinary !== Valtype.i32) {
|
1930
|
+
out.push(Opcodes.i32_to);
|
1931
|
+
}
|
1932
|
+
|
1933
|
+
if (importedFuncs[name] && name.startsWith('profile')) {
|
1934
|
+
out.push(Opcodes.i32_to);
|
1935
|
+
}
|
1936
|
+
|
1937
|
+
if (typedParams) out = out.concat(getNodeType(scope, arg));
|
1578
1938
|
}
|
1579
1939
|
|
1580
1940
|
out.push([ Opcodes.call, idx ]);
|
1581
1941
|
|
1582
|
-
if (!
|
1942
|
+
if (!typedReturns) {
|
1583
1943
|
// let type;
|
1584
1944
|
// if (builtinFuncs[name]) type = TYPES[builtinFuncs[name].returnType ?? 'number'];
|
1585
1945
|
// if (internalConstrs[name]) type = internalConstrs[name].type;
|
@@ -1589,7 +1949,11 @@ const generateCall = (scope, decl, _global, _name) => {
|
|
1589
1949
|
// ...number(type, Valtype.i32),
|
1590
1950
|
// [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
|
1591
1951
|
// );
|
1592
|
-
} else out.push(
|
1952
|
+
} else out.push(...setLastType(scope));
|
1953
|
+
|
1954
|
+
if (builtinFuncs[name] && builtinFuncs[name].returns?.[0] === Valtype.i32 && valtypeBinary !== Valtype.i32) {
|
1955
|
+
out.push(Opcodes.i32_from);
|
1956
|
+
}
|
1593
1957
|
|
1594
1958
|
return out;
|
1595
1959
|
};
|
@@ -1597,8 +1961,21 @@ const generateCall = (scope, decl, _global, _name) => {
|
|
1597
1961
|
const generateNew = (scope, decl, _global, _name) => {
|
1598
1962
|
// hack: basically treat this as a normal call for builtins for now
|
1599
1963
|
const name = mapName(decl.callee.name);
|
1964
|
+
|
1600
1965
|
if (internalConstrs[name] && !internalConstrs[name].notConstr) return internalConstrs[name].generate(scope, decl, _global, _name);
|
1601
|
-
|
1966
|
+
|
1967
|
+
if (builtinFuncs[name + '$constructor']) {
|
1968
|
+
// custom ...$constructor override builtin func
|
1969
|
+
return generateCall(scope, {
|
1970
|
+
...decl,
|
1971
|
+
callee: {
|
1972
|
+
type: 'Identifier',
|
1973
|
+
name: name + '$constructor'
|
1974
|
+
}
|
1975
|
+
}, _global, _name);
|
1976
|
+
}
|
1977
|
+
|
1978
|
+
if (!builtinFuncs[name]) return todo(scope, `new statement is not supported yet`); // return todo(scope, `new statement is not supported yet (new ${unhackName(name)})`);
|
1602
1979
|
|
1603
1980
|
return generateCall(scope, decl, _global, _name);
|
1604
1981
|
};
|
@@ -1614,45 +1991,152 @@ const unhackName = name => {
|
|
1614
1991
|
return name;
|
1615
1992
|
};
|
1616
1993
|
|
1617
|
-
const
|
1618
|
-
|
1994
|
+
const knownType = (scope, type) => {
|
1995
|
+
if (type.length === 1 && type[0][0] === Opcodes.i32_const) {
|
1996
|
+
return type[0][1];
|
1997
|
+
}
|
1619
1998
|
|
1620
|
-
|
1621
|
-
|
1622
|
-
[ Opcodes.local_set, tmp ],
|
1623
|
-
[ Opcodes.block, returns ]
|
1624
|
-
];
|
1999
|
+
if (typedInput && type.length === 1 && type[0][0] === Opcodes.local_get) {
|
2000
|
+
const idx = type[0][1];
|
1625
2001
|
|
1626
|
-
|
2002
|
+
// type idx = var idx + 1
|
2003
|
+
const v = Object.values(scope.locals).find(x => x.idx === idx - 1);
|
2004
|
+
if (v.metadata?.type != null) return v.metadata.type;
|
2005
|
+
}
|
1627
2006
|
|
1628
|
-
|
1629
|
-
|
2007
|
+
return null;
|
2008
|
+
};
|
1630
2009
|
|
1631
|
-
|
1632
|
-
|
1633
|
-
|
1634
|
-
|
2010
|
+
const brTable = (input, bc, returns) => {
|
2011
|
+
const out = [];
|
2012
|
+
const keys = Object.keys(bc);
|
2013
|
+
const count = keys.length;
|
1635
2014
|
|
1636
|
-
|
1637
|
-
|
1638
|
-
|
1639
|
-
|
2015
|
+
if (count === 1) {
|
2016
|
+
// return [
|
2017
|
+
// ...input,
|
2018
|
+
// ...bc[keys[0]]
|
2019
|
+
// ];
|
2020
|
+
return bc[keys[0]];
|
1640
2021
|
}
|
1641
2022
|
|
1642
|
-
|
1643
|
-
|
1644
|
-
|
2023
|
+
if (count === 2) {
|
2024
|
+
// just use if else
|
2025
|
+
const other = keys.find(x => x !== 'default');
|
2026
|
+
return [
|
2027
|
+
...input,
|
2028
|
+
...number(other, Valtype.i32),
|
2029
|
+
[ Opcodes.i32_eq ],
|
2030
|
+
[ Opcodes.if, returns ],
|
2031
|
+
...bc[other],
|
2032
|
+
[ Opcodes.else ],
|
2033
|
+
...bc.default,
|
2034
|
+
[ Opcodes.end ]
|
2035
|
+
];
|
2036
|
+
}
|
1645
2037
|
|
1646
|
-
|
2038
|
+
for (let i = 0; i < count; i++) {
|
2039
|
+
if (i === 0) out.push([ Opcodes.block, returns, 'br table start' ]);
|
2040
|
+
else out.push([ Opcodes.block, Blocktype.void ]);
|
2041
|
+
}
|
1647
2042
|
|
1648
|
-
|
1649
|
-
|
2043
|
+
const nums = keys.filter(x => +x);
|
2044
|
+
const offset = Math.min(...nums);
|
2045
|
+
const max = Math.max(...nums);
|
1650
2046
|
|
1651
|
-
const
|
1652
|
-
|
2047
|
+
const table = [];
|
2048
|
+
let br = 1;
|
1653
2049
|
|
1654
|
-
|
1655
|
-
|
2050
|
+
for (let i = offset; i <= max; i++) {
|
2051
|
+
// if branch for this num, go to that block
|
2052
|
+
if (bc[i]) {
|
2053
|
+
table.push(br);
|
2054
|
+
br++;
|
2055
|
+
continue;
|
2056
|
+
}
|
2057
|
+
|
2058
|
+
// else default
|
2059
|
+
table.push(0);
|
2060
|
+
}
|
2061
|
+
|
2062
|
+
out.push(
|
2063
|
+
[ Opcodes.block, Blocktype.void ],
|
2064
|
+
...input,
|
2065
|
+
...(offset > 0 ? [
|
2066
|
+
...number(offset, Valtype.i32),
|
2067
|
+
[ Opcodes.i32_sub ]
|
2068
|
+
] : []),
|
2069
|
+
[ Opcodes.br_table, ...encodeVector(table), 0 ]
|
2070
|
+
);
|
2071
|
+
|
2072
|
+
// if you can guess why we sort the wrong way and then reverse
|
2073
|
+
// (instead of just sorting the correct way)
|
2074
|
+
// dm me and if you are correct and the first person
|
2075
|
+
// I will somehow shout you out or something
|
2076
|
+
const orderedBc = keys.sort((a, b) => b - a).reverse();
|
2077
|
+
|
2078
|
+
br = count - 1;
|
2079
|
+
for (const x of orderedBc) {
|
2080
|
+
out.push(
|
2081
|
+
[ Opcodes.end ],
|
2082
|
+
...bc[x],
|
2083
|
+
...(br === 0 ? [] : [ [ Opcodes.br, br ] ])
|
2084
|
+
);
|
2085
|
+
br--;
|
2086
|
+
}
|
2087
|
+
|
2088
|
+
return [
|
2089
|
+
...out,
|
2090
|
+
[ Opcodes.end, 'br table end' ]
|
2091
|
+
];
|
2092
|
+
};
|
2093
|
+
|
2094
|
+
const typeSwitch = (scope, type, bc, returns = valtypeBinary) => {
|
2095
|
+
if (!Prefs.bytestring) delete bc[TYPES._bytestring];
|
2096
|
+
|
2097
|
+
const known = knownType(scope, type);
|
2098
|
+
if (known != null) {
|
2099
|
+
return bc[known] ?? bc.default;
|
2100
|
+
}
|
2101
|
+
|
2102
|
+
if (Prefs.typeswitchUseBrtable)
|
2103
|
+
return brTable(type, bc, returns);
|
2104
|
+
|
2105
|
+
const tmp = localTmp(scope, '#typeswitch_tmp', Valtype.i32);
|
2106
|
+
const out = [
|
2107
|
+
...type,
|
2108
|
+
[ Opcodes.local_set, tmp ],
|
2109
|
+
[ Opcodes.block, returns ]
|
2110
|
+
];
|
2111
|
+
|
2112
|
+
for (const x in bc) {
|
2113
|
+
if (x === 'default') continue;
|
2114
|
+
|
2115
|
+
// if type == x
|
2116
|
+
out.push([ Opcodes.local_get, tmp ]);
|
2117
|
+
out.push(...number(x, Valtype.i32));
|
2118
|
+
out.push([ Opcodes.i32_eq ]);
|
2119
|
+
|
2120
|
+
out.push([ Opcodes.if, Blocktype.void, `TYPESWITCH|${TYPE_NAMES[x]}` ]);
|
2121
|
+
out.push(...bc[x]);
|
2122
|
+
out.push([ Opcodes.br, 1 ]);
|
2123
|
+
out.push([ Opcodes.end ]);
|
2124
|
+
}
|
2125
|
+
|
2126
|
+
// default
|
2127
|
+
if (bc.default) out.push(...bc.default);
|
2128
|
+
else if (returns !== Blocktype.void) out.push(...number(0, returns));
|
2129
|
+
|
2130
|
+
out.push([ Opcodes.end, 'TYPESWITCH_end' ]);
|
2131
|
+
|
2132
|
+
return out;
|
2133
|
+
};
|
2134
|
+
|
2135
|
+
const allocVar = (scope, name, global = false, type = true) => {
|
2136
|
+
const target = global ? globals : scope.locals;
|
2137
|
+
|
2138
|
+
// already declared
|
2139
|
+
if (target[name]) {
|
1656
2140
|
// parser should catch this but sanity check anyway
|
1657
2141
|
// if (decl.kind !== 'var') return internalThrow(scope, 'SyntaxError', `Identifier '${unhackName(name)}' has already been declared`);
|
1658
2142
|
|
@@ -1662,12 +2146,62 @@ const allocVar = (scope, name, global = false) => {
|
|
1662
2146
|
let idx = global ? globalInd++ : scope.localInd++;
|
1663
2147
|
target[name] = { idx, type: valtypeBinary };
|
1664
2148
|
|
1665
|
-
|
1666
|
-
|
2149
|
+
if (type) {
|
2150
|
+
let typeIdx = global ? globalInd++ : scope.localInd++;
|
2151
|
+
target[name + '#type'] = { idx: typeIdx, type: Valtype.i32 };
|
2152
|
+
}
|
1667
2153
|
|
1668
2154
|
return idx;
|
1669
2155
|
};
|
1670
2156
|
|
2157
|
+
const addVarMetadata = (scope, name, global = false, metadata = {}) => {
|
2158
|
+
const target = global ? globals : scope.locals;
|
2159
|
+
|
2160
|
+
target[name].metadata ??= {};
|
2161
|
+
for (const x in metadata) {
|
2162
|
+
if (metadata[x] != null) target[name].metadata[x] = metadata[x];
|
2163
|
+
}
|
2164
|
+
};
|
2165
|
+
|
2166
|
+
const typeAnnoToPorfType = x => {
|
2167
|
+
if (!x) return null;
|
2168
|
+
if (TYPES[x.toLowerCase()] != null) return TYPES[x.toLowerCase()];
|
2169
|
+
if (TYPES['_' + x.toLowerCase()] != null) return TYPES['_' + x.toLowerCase()];
|
2170
|
+
|
2171
|
+
switch (x) {
|
2172
|
+
case 'i32':
|
2173
|
+
case 'i64':
|
2174
|
+
case 'f64':
|
2175
|
+
return TYPES.number;
|
2176
|
+
}
|
2177
|
+
|
2178
|
+
return null;
|
2179
|
+
};
|
2180
|
+
|
2181
|
+
const extractTypeAnnotation = decl => {
|
2182
|
+
let a = decl;
|
2183
|
+
while (a.typeAnnotation) a = a.typeAnnotation;
|
2184
|
+
|
2185
|
+
let type = null, elementType = null;
|
2186
|
+
if (a.typeName) {
|
2187
|
+
type = a.typeName.name;
|
2188
|
+
} else if (a.type.endsWith('Keyword')) {
|
2189
|
+
type = a.type.slice(2, -7).toLowerCase();
|
2190
|
+
} else if (a.type === 'TSArrayType') {
|
2191
|
+
type = 'array';
|
2192
|
+
elementType = extractTypeAnnotation(a.elementType).type;
|
2193
|
+
}
|
2194
|
+
|
2195
|
+
const typeName = type;
|
2196
|
+
type = typeAnnoToPorfType(type);
|
2197
|
+
|
2198
|
+
if (type === TYPES._bytestring && !Prefs.bytestring) type = TYPES.string;
|
2199
|
+
|
2200
|
+
// if (decl.name) console.log(decl.name, { type, elementType });
|
2201
|
+
|
2202
|
+
return { type, typeName, elementType };
|
2203
|
+
};
|
2204
|
+
|
1671
2205
|
const generateVar = (scope, decl) => {
|
1672
2206
|
let out = [];
|
1673
2207
|
|
@@ -1675,10 +2209,13 @@ const generateVar = (scope, decl) => {
|
|
1675
2209
|
|
1676
2210
|
// global variable if in top scope (main) and var ..., or if wanted
|
1677
2211
|
const global = topLevel || decl._bare; // decl.kind === 'var';
|
2212
|
+
const target = global ? globals : scope.locals;
|
1678
2213
|
|
1679
2214
|
for (const x of decl.declarations) {
|
1680
2215
|
const name = mapName(x.id.name);
|
1681
2216
|
|
2217
|
+
if (!name) return todo(scope, 'destructuring is not supported yet');
|
2218
|
+
|
1682
2219
|
if (x.init && isFuncType(x.init.type)) {
|
1683
2220
|
// hack for let a = function () { ... }
|
1684
2221
|
x.init.id = { name };
|
@@ -1694,11 +2231,29 @@ const generateVar = (scope, decl) => {
|
|
1694
2231
|
continue; // always ignore
|
1695
2232
|
}
|
1696
2233
|
|
1697
|
-
|
1698
|
-
|
1699
|
-
|
2234
|
+
// // generate init before allocating var
|
2235
|
+
// let generated;
|
2236
|
+
// if (x.init) generated = generate(scope, x.init, global, name);
|
2237
|
+
|
2238
|
+
const typed = typedInput && x.id.typeAnnotation;
|
2239
|
+
let idx = allocVar(scope, name, global, !(typed && extractTypeAnnotation(x.id).type != null));
|
1700
2240
|
|
1701
|
-
|
2241
|
+
if (typed) {
|
2242
|
+
addVarMetadata(scope, name, global, extractTypeAnnotation(x.id));
|
2243
|
+
}
|
2244
|
+
|
2245
|
+
if (x.init) {
|
2246
|
+
const generated = generate(scope, x.init, global, name);
|
2247
|
+
if (scope.arrays?.get(name) != null) {
|
2248
|
+
// hack to set local as pointer before
|
2249
|
+
out.push(...number(scope.arrays.get(name)), [ global ? Opcodes.global_set : Opcodes.local_set, idx ]);
|
2250
|
+
if (generated.at(-1) == Opcodes.i32_from_u) generated.pop();
|
2251
|
+
generated.pop();
|
2252
|
+
out = out.concat(generated);
|
2253
|
+
} else {
|
2254
|
+
out = out.concat(generated);
|
2255
|
+
out.push([ global ? Opcodes.global_set : Opcodes.local_set, idx ]);
|
2256
|
+
}
|
1702
2257
|
out.push(...setType(scope, name, getNodeType(scope, x.init)));
|
1703
2258
|
}
|
1704
2259
|
|
@@ -1709,7 +2264,8 @@ const generateVar = (scope, decl) => {
|
|
1709
2264
|
return out;
|
1710
2265
|
};
|
1711
2266
|
|
1712
|
-
|
2267
|
+
// todo: optimize this func for valueUnused
|
2268
|
+
const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
|
1713
2269
|
const { type, name } = decl.left;
|
1714
2270
|
|
1715
2271
|
if (type === 'ObjectPattern') {
|
@@ -1724,22 +2280,30 @@ const generateAssign = (scope, decl) => {
|
|
1724
2280
|
return [];
|
1725
2281
|
}
|
1726
2282
|
|
2283
|
+
const op = decl.operator.slice(0, -1) || '=';
|
2284
|
+
|
1727
2285
|
// hack: .length setter
|
1728
2286
|
if (decl.left.type === 'MemberExpression' && decl.left.property.name === 'length') {
|
1729
2287
|
const name = decl.left.object.name;
|
1730
|
-
const pointer = arrays
|
2288
|
+
const pointer = scope.arrays?.get(name);
|
1731
2289
|
|
1732
|
-
const aotPointer = pointer != null;
|
2290
|
+
const aotPointer = Prefs.aotPointerOpt && pointer != null;
|
1733
2291
|
|
1734
2292
|
const newValueTmp = localTmp(scope, '__length_setter_tmp');
|
2293
|
+
const pointerTmp = op === '=' ? null : localTmp(scope, '__member_setter_ptr_tmp', Valtype.i32);
|
1735
2294
|
|
1736
2295
|
return [
|
1737
2296
|
...(aotPointer ? number(0, Valtype.i32) : [
|
1738
2297
|
...generate(scope, decl.left.object),
|
1739
2298
|
Opcodes.i32_to_u
|
1740
2299
|
]),
|
2300
|
+
...(!pointerTmp ? [] : [ [ Opcodes.local_tee, pointerTmp ] ]),
|
1741
2301
|
|
1742
|
-
...generate(scope, decl.right),
|
2302
|
+
...(op === '=' ? generate(scope, decl.right) : performOp(scope, op, [
|
2303
|
+
[ Opcodes.local_get, pointerTmp ],
|
2304
|
+
[ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
|
2305
|
+
Opcodes.i32_from_u
|
2306
|
+
], generate(scope, decl.right), number(TYPES.number, Valtype.i32), getNodeType(scope, decl.right))),
|
1743
2307
|
[ Opcodes.local_tee, newValueTmp ],
|
1744
2308
|
|
1745
2309
|
Opcodes.i32_to_u,
|
@@ -1749,14 +2313,12 @@ const generateAssign = (scope, decl) => {
|
|
1749
2313
|
];
|
1750
2314
|
}
|
1751
2315
|
|
1752
|
-
const op = decl.operator.slice(0, -1) || '=';
|
1753
|
-
|
1754
2316
|
// arr[i]
|
1755
2317
|
if (decl.left.type === 'MemberExpression' && decl.left.computed) {
|
1756
2318
|
const name = decl.left.object.name;
|
1757
|
-
const pointer = arrays
|
2319
|
+
const pointer = scope.arrays?.get(name);
|
1758
2320
|
|
1759
|
-
const aotPointer = pointer != null;
|
2321
|
+
const aotPointer = Prefs.aotPointerOpt && pointer != null;
|
1760
2322
|
|
1761
2323
|
const newValueTmp = localTmp(scope, '__member_setter_val_tmp');
|
1762
2324
|
const pointerTmp = op === '=' ? -1 : localTmp(scope, '__member_setter_ptr_tmp', Valtype.i32);
|
@@ -1812,6 +2374,8 @@ const generateAssign = (scope, decl) => {
|
|
1812
2374
|
];
|
1813
2375
|
}
|
1814
2376
|
|
2377
|
+
if (!name) return todo(scope, 'destructuring is not supported yet', true);
|
2378
|
+
|
1815
2379
|
const [ local, isGlobal ] = lookupName(scope, name);
|
1816
2380
|
|
1817
2381
|
if (local === undefined) {
|
@@ -1858,9 +2422,7 @@ const generateAssign = (scope, decl) => {
|
|
1858
2422
|
], getType(scope, name), getNodeType(scope, decl.right), isGlobal, name, true),
|
1859
2423
|
[ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ],
|
1860
2424
|
|
1861
|
-
|
1862
|
-
// hack: type is idx+1
|
1863
|
-
[ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx + 1 ],
|
2425
|
+
...setType(scope, name, getLastType(scope))
|
1864
2426
|
];
|
1865
2427
|
}
|
1866
2428
|
|
@@ -1871,9 +2433,7 @@ const generateAssign = (scope, decl) => {
|
|
1871
2433
|
|
1872
2434
|
// todo: string concat types
|
1873
2435
|
|
1874
|
-
|
1875
|
-
...number(TYPES.number, Valtype.i32),
|
1876
|
-
[ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx + 1 ],
|
2436
|
+
...setType(scope, name, TYPES.number)
|
1877
2437
|
];
|
1878
2438
|
};
|
1879
2439
|
|
@@ -1919,7 +2479,7 @@ const generateUnary = (scope, decl) => {
|
|
1919
2479
|
return out;
|
1920
2480
|
}
|
1921
2481
|
|
1922
|
-
case 'delete':
|
2482
|
+
case 'delete': {
|
1923
2483
|
let toReturn = true, toGenerate = true;
|
1924
2484
|
|
1925
2485
|
if (decl.argument.type === 'Identifier') {
|
@@ -1941,38 +2501,60 @@ const generateUnary = (scope, decl) => {
|
|
1941
2501
|
|
1942
2502
|
out.push(...number(toReturn ? 1 : 0));
|
1943
2503
|
return out;
|
2504
|
+
}
|
1944
2505
|
|
1945
|
-
case 'typeof':
|
1946
|
-
|
2506
|
+
case 'typeof': {
|
2507
|
+
let overrideType, toGenerate = true;
|
2508
|
+
|
2509
|
+
if (decl.argument.type === 'Identifier') {
|
2510
|
+
const out = generateIdent(scope, decl.argument);
|
2511
|
+
|
2512
|
+
// if ReferenceError (undeclared var), ignore and return undefined
|
2513
|
+
if (out[1]) {
|
2514
|
+
// does not exist (2 ops from throw)
|
2515
|
+
overrideType = number(TYPES.undefined, Valtype.i32);
|
2516
|
+
toGenerate = false;
|
2517
|
+
}
|
2518
|
+
}
|
2519
|
+
|
2520
|
+
const out = toGenerate ? generate(scope, decl.argument) : [];
|
2521
|
+
disposeLeftover(out);
|
2522
|
+
|
2523
|
+
out.push(...typeSwitch(scope, overrideType ?? getNodeType(scope, decl.argument), {
|
1947
2524
|
[TYPES.number]: makeString(scope, 'number', false, '#typeof_result'),
|
1948
2525
|
[TYPES.boolean]: makeString(scope, 'boolean', false, '#typeof_result'),
|
1949
2526
|
[TYPES.string]: makeString(scope, 'string', false, '#typeof_result'),
|
1950
2527
|
[TYPES.undefined]: makeString(scope, 'undefined', false, '#typeof_result'),
|
1951
2528
|
[TYPES.function]: makeString(scope, 'function', false, '#typeof_result'),
|
1952
2529
|
|
2530
|
+
[TYPES._bytestring]: makeString(scope, 'string', false, '#typeof_result'),
|
2531
|
+
|
1953
2532
|
// object and internal types
|
1954
2533
|
default: makeString(scope, 'object', false, '#typeof_result'),
|
1955
|
-
});
|
2534
|
+
}));
|
2535
|
+
|
2536
|
+
return out;
|
2537
|
+
}
|
1956
2538
|
|
1957
2539
|
default:
|
1958
|
-
return todo(`unary operator ${decl.operator} not implemented yet
|
2540
|
+
return todo(scope, `unary operator ${decl.operator} not implemented yet`, true);
|
1959
2541
|
}
|
1960
2542
|
};
|
1961
2543
|
|
1962
|
-
const generateUpdate = (scope, decl) => {
|
2544
|
+
const generateUpdate = (scope, decl, _global, _name, valueUnused = false) => {
|
1963
2545
|
const { name } = decl.argument;
|
1964
2546
|
|
1965
2547
|
const [ local, isGlobal ] = lookupName(scope, name);
|
1966
2548
|
|
1967
2549
|
if (local === undefined) {
|
1968
|
-
return todo(`update expression with undefined variable
|
2550
|
+
return todo(scope, `update expression with undefined variable`, true);
|
1969
2551
|
}
|
1970
2552
|
|
1971
2553
|
const idx = local.idx;
|
1972
2554
|
const out = [];
|
1973
2555
|
|
1974
2556
|
out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
|
1975
|
-
if (!decl.prefix) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
|
2557
|
+
if (!decl.prefix && !valueUnused) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
|
1976
2558
|
|
1977
2559
|
switch (decl.operator) {
|
1978
2560
|
case '++':
|
@@ -1985,7 +2567,7 @@ const generateUpdate = (scope, decl) => {
|
|
1985
2567
|
}
|
1986
2568
|
|
1987
2569
|
out.push([ isGlobal ? Opcodes.global_set : Opcodes.local_set, idx ]);
|
1988
|
-
if (decl.prefix) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
|
2570
|
+
if (decl.prefix && !valueUnused) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
|
1989
2571
|
|
1990
2572
|
return out;
|
1991
2573
|
};
|
@@ -2025,7 +2607,7 @@ const generateConditional = (scope, decl) => {
|
|
2025
2607
|
// note type
|
2026
2608
|
out.push(
|
2027
2609
|
...getNodeType(scope, decl.consequent),
|
2028
|
-
|
2610
|
+
...setLastType(scope)
|
2029
2611
|
);
|
2030
2612
|
|
2031
2613
|
out.push([ Opcodes.else ]);
|
@@ -2034,7 +2616,7 @@ const generateConditional = (scope, decl) => {
|
|
2034
2616
|
// note type
|
2035
2617
|
out.push(
|
2036
2618
|
...getNodeType(scope, decl.alternate),
|
2037
|
-
|
2619
|
+
...setLastType(scope)
|
2038
2620
|
);
|
2039
2621
|
|
2040
2622
|
out.push([ Opcodes.end ]);
|
@@ -2048,15 +2630,17 @@ const generateFor = (scope, decl) => {
|
|
2048
2630
|
const out = [];
|
2049
2631
|
|
2050
2632
|
if (decl.init) {
|
2051
|
-
out.push(...generate(scope, decl.init));
|
2633
|
+
out.push(...generate(scope, decl.init, false, undefined, true));
|
2052
2634
|
disposeLeftover(out);
|
2053
2635
|
}
|
2054
2636
|
|
2055
2637
|
out.push([ Opcodes.loop, Blocktype.void ]);
|
2056
2638
|
depth.push('for');
|
2057
2639
|
|
2058
|
-
out.push(...generate(scope, decl.test));
|
2059
|
-
|
2640
|
+
if (decl.test) out.push(...generate(scope, decl.test), Opcodes.i32_to);
|
2641
|
+
else out.push(...number(1, Valtype.i32));
|
2642
|
+
|
2643
|
+
out.push([ Opcodes.if, Blocktype.void ]);
|
2060
2644
|
depth.push('if');
|
2061
2645
|
|
2062
2646
|
out.push([ Opcodes.block, Blocktype.void ]);
|
@@ -2064,8 +2648,7 @@ const generateFor = (scope, decl) => {
|
|
2064
2648
|
out.push(...generate(scope, decl.body));
|
2065
2649
|
out.push([ Opcodes.end ]);
|
2066
2650
|
|
2067
|
-
out.push(...generate(scope, decl.update));
|
2068
|
-
depth.pop();
|
2651
|
+
if (decl.update) out.push(...generate(scope, decl.update, false, undefined, true));
|
2069
2652
|
|
2070
2653
|
out.push([ Opcodes.br, 1 ]);
|
2071
2654
|
out.push([ Opcodes.end ], [ Opcodes.end ]);
|
@@ -2093,6 +2676,36 @@ const generateWhile = (scope, decl) => {
|
|
2093
2676
|
return out;
|
2094
2677
|
};
|
2095
2678
|
|
2679
|
+
const generateDoWhile = (scope, decl) => {
|
2680
|
+
const out = [];
|
2681
|
+
|
2682
|
+
out.push([ Opcodes.loop, Blocktype.void ]);
|
2683
|
+
depth.push('dowhile');
|
2684
|
+
|
2685
|
+
// block for break (includes all)
|
2686
|
+
out.push([ Opcodes.block, Blocktype.void ]);
|
2687
|
+
depth.push('block');
|
2688
|
+
|
2689
|
+
// block for continue
|
2690
|
+
// includes body but not test+loop so we can exit body at anytime
|
2691
|
+
// and still test+loop after
|
2692
|
+
out.push([ Opcodes.block, Blocktype.void ]);
|
2693
|
+
depth.push('block');
|
2694
|
+
|
2695
|
+
out.push(...generate(scope, decl.body));
|
2696
|
+
|
2697
|
+
out.push([ Opcodes.end ]);
|
2698
|
+
depth.pop();
|
2699
|
+
|
2700
|
+
out.push(...generate(scope, decl.test), Opcodes.i32_to);
|
2701
|
+
out.push([ Opcodes.br_if, 1 ]);
|
2702
|
+
|
2703
|
+
out.push([ Opcodes.end ], [ Opcodes.end ]);
|
2704
|
+
depth.pop(); depth.pop();
|
2705
|
+
|
2706
|
+
return out;
|
2707
|
+
};
|
2708
|
+
|
2096
2709
|
const generateForOf = (scope, decl) => {
|
2097
2710
|
const out = [];
|
2098
2711
|
|
@@ -2122,8 +2735,17 @@ const generateForOf = (scope, decl) => {
|
|
2122
2735
|
// setup local for left
|
2123
2736
|
generate(scope, decl.left);
|
2124
2737
|
|
2125
|
-
|
2738
|
+
let leftName = decl.left.declarations?.[0]?.id?.name;
|
2739
|
+
if (!leftName && decl.left.name) {
|
2740
|
+
leftName = decl.left.name;
|
2741
|
+
|
2742
|
+
generateVar(scope, { kind: 'var', _bare: true, declarations: [ { id: { name: leftName } } ] })
|
2743
|
+
}
|
2744
|
+
|
2745
|
+
// if (!leftName) console.log(decl.left?.declarations?.[0]?.id ?? decl.left);
|
2746
|
+
|
2126
2747
|
const [ local, isGlobal ] = lookupName(scope, leftName);
|
2748
|
+
if (!local) return todo(scope, 'for of failed to get left local (probably destructure)');
|
2127
2749
|
|
2128
2750
|
depth.push('block');
|
2129
2751
|
depth.push('block');
|
@@ -2131,13 +2753,15 @@ const generateForOf = (scope, decl) => {
|
|
2131
2753
|
// // todo: we should only do this for strings but we don't know at compile-time :(
|
2132
2754
|
// hack: this is naughty and will break things!
|
2133
2755
|
let newOut = number(0, Valtype.f64), newPointer = -1;
|
2134
|
-
if (pages.
|
2756
|
+
if (pages.hasAnyString) {
|
2757
|
+
// todo: we use i16 even for bytestrings which should not make a bad thing happen, just be confusing for debugging?
|
2135
2758
|
0, [ newOut, newPointer ] = makeArray(scope, {
|
2136
2759
|
rawElements: new Array(1)
|
2137
2760
|
}, isGlobal, leftName, true, 'i16');
|
2138
2761
|
}
|
2139
2762
|
|
2140
2763
|
// set type for local
|
2764
|
+
// todo: optimize away counter and use end pointer
|
2141
2765
|
out.push(...typeSwitch(scope, getNodeType(scope, decl.right), {
|
2142
2766
|
[TYPES._array]: [
|
2143
2767
|
...setType(scope, leftName, TYPES.number),
|
@@ -2222,6 +2846,56 @@ const generateForOf = (scope, decl) => {
|
|
2222
2846
|
[ Opcodes.end ],
|
2223
2847
|
[ Opcodes.end ]
|
2224
2848
|
],
|
2849
|
+
[TYPES._bytestring]: [
|
2850
|
+
...setType(scope, leftName, TYPES._bytestring),
|
2851
|
+
|
2852
|
+
[ Opcodes.loop, Blocktype.void ],
|
2853
|
+
|
2854
|
+
// setup new/out array
|
2855
|
+
...newOut,
|
2856
|
+
[ Opcodes.drop ],
|
2857
|
+
|
2858
|
+
...number(0, Valtype.i32), // base 0 for store after
|
2859
|
+
|
2860
|
+
// load current string ind {arg}
|
2861
|
+
[ Opcodes.local_get, pointer ],
|
2862
|
+
[ Opcodes.local_get, counter ],
|
2863
|
+
[ Opcodes.i32_add ],
|
2864
|
+
[ Opcodes.i32_load8_u, 0, ...unsignedLEB128(ValtypeSize.i32) ],
|
2865
|
+
|
2866
|
+
// store to new string ind 0
|
2867
|
+
[ Opcodes.i32_store8, 0, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
|
2868
|
+
|
2869
|
+
// return new string (page)
|
2870
|
+
...number(newPointer),
|
2871
|
+
|
2872
|
+
[ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx ],
|
2873
|
+
|
2874
|
+
[ Opcodes.block, Blocktype.void ],
|
2875
|
+
[ Opcodes.block, Blocktype.void ],
|
2876
|
+
...generate(scope, decl.body),
|
2877
|
+
[ Opcodes.end ],
|
2878
|
+
|
2879
|
+
// increment iter pointer
|
2880
|
+
// [ Opcodes.local_get, pointer ],
|
2881
|
+
// ...number(1, Valtype.i32),
|
2882
|
+
// [ Opcodes.i32_add ],
|
2883
|
+
// [ Opcodes.local_set, pointer ],
|
2884
|
+
|
2885
|
+
// increment counter by 1
|
2886
|
+
[ Opcodes.local_get, counter ],
|
2887
|
+
...number(1, Valtype.i32),
|
2888
|
+
[ Opcodes.i32_add ],
|
2889
|
+
[ Opcodes.local_tee, counter ],
|
2890
|
+
|
2891
|
+
// loop if counter != length
|
2892
|
+
[ Opcodes.local_get, length ],
|
2893
|
+
[ Opcodes.i32_ne ],
|
2894
|
+
[ Opcodes.br_if, 1 ],
|
2895
|
+
|
2896
|
+
[ Opcodes.end ],
|
2897
|
+
[ Opcodes.end ]
|
2898
|
+
],
|
2225
2899
|
default: internalThrow(scope, 'TypeError', `Tried for..of on non-iterable type`)
|
2226
2900
|
}, Blocktype.void));
|
2227
2901
|
|
@@ -2232,28 +2906,65 @@ const generateForOf = (scope, decl) => {
|
|
2232
2906
|
return out;
|
2233
2907
|
};
|
2234
2908
|
|
2909
|
+
// find the nearest loop in depth map by type
|
2235
2910
|
const getNearestLoop = () => {
|
2236
2911
|
for (let i = depth.length - 1; i >= 0; i--) {
|
2237
|
-
if (
|
2912
|
+
if (['while', 'dowhile', 'for', 'forof'].includes(depth[i])) return i;
|
2238
2913
|
}
|
2239
2914
|
|
2240
2915
|
return -1;
|
2241
2916
|
};
|
2242
2917
|
|
2243
2918
|
const generateBreak = (scope, decl) => {
|
2244
|
-
const
|
2919
|
+
const target = decl.label ? scope.labels.get(decl.label.name) : getNearestLoop();
|
2920
|
+
const type = depth[target];
|
2921
|
+
|
2922
|
+
// different loop types have different branch offsets
|
2923
|
+
// as they have different wasm block/loop/if structures
|
2924
|
+
// we need to use the right offset by type to branch to the one we want
|
2925
|
+
// for a break: exit the loop without executing anything else inside it
|
2926
|
+
const offset = ({
|
2927
|
+
for: 2, // loop > if (wanted branch) > block (we are here)
|
2928
|
+
while: 2, // loop > if (wanted branch) (we are here)
|
2929
|
+
dowhile: 2, // loop > block (wanted branch) > block (we are here)
|
2930
|
+
forof: 2, // loop > block (wanted branch) > block (we are here)
|
2931
|
+
if: 1 // break inside if, branch 0 to skip the rest of the if
|
2932
|
+
})[type];
|
2933
|
+
|
2245
2934
|
return [
|
2246
|
-
[ Opcodes.br, ...signedLEB128(
|
2935
|
+
[ Opcodes.br, ...signedLEB128(depth.length - target - offset) ]
|
2247
2936
|
];
|
2248
2937
|
};
|
2249
2938
|
|
2250
2939
|
const generateContinue = (scope, decl) => {
|
2251
|
-
const
|
2940
|
+
const target = decl.label ? scope.labels.get(decl.label.name) : getNearestLoop();
|
2941
|
+
const type = depth[target];
|
2942
|
+
|
2943
|
+
// different loop types have different branch offsets
|
2944
|
+
// as they have different wasm block/loop/if structures
|
2945
|
+
// we need to use the right offset by type to branch to the one we want
|
2946
|
+
// for a continue: do test for the loop, and then loop depending on that success
|
2947
|
+
const offset = ({
|
2948
|
+
for: 3, // loop (wanted branch) > if > block (we are here)
|
2949
|
+
while: 1, // loop (wanted branch) > if (we are here)
|
2950
|
+
dowhile: 3, // loop > block > block (wanted branch) (we are here)
|
2951
|
+
forof: 3 // loop > block > block (wanted branch) (we are here)
|
2952
|
+
})[type];
|
2953
|
+
|
2252
2954
|
return [
|
2253
|
-
[ Opcodes.br, ...signedLEB128(
|
2955
|
+
[ Opcodes.br, ...signedLEB128(depth.length - target - offset) ]
|
2254
2956
|
];
|
2255
2957
|
};
|
2256
2958
|
|
2959
|
+
const generateLabel = (scope, decl) => {
|
2960
|
+
scope.labels ??= new Map();
|
2961
|
+
|
2962
|
+
const name = decl.label.name;
|
2963
|
+
scope.labels.set(name, depth.length);
|
2964
|
+
|
2965
|
+
return generate(scope, decl.body);
|
2966
|
+
};
|
2967
|
+
|
2257
2968
|
const generateThrow = (scope, decl) => {
|
2258
2969
|
scope.throws = true;
|
2259
2970
|
|
@@ -2262,7 +2973,7 @@ const generateThrow = (scope, decl) => {
|
|
2262
2973
|
// hack: throw new X("...") -> throw "..."
|
2263
2974
|
if (!message && (decl.argument.type === 'NewExpression' || decl.argument.type === 'CallExpression')) {
|
2264
2975
|
constructor = decl.argument.callee.name;
|
2265
|
-
message = decl.argument.arguments[0]
|
2976
|
+
message = decl.argument.arguments[0]?.value ?? '';
|
2266
2977
|
}
|
2267
2978
|
|
2268
2979
|
if (tags.length === 0) tags.push({
|
@@ -2274,6 +2985,9 @@ const generateThrow = (scope, decl) => {
|
|
2274
2985
|
let exceptId = exceptions.push({ constructor, message }) - 1;
|
2275
2986
|
let tagIdx = tags[0].idx;
|
2276
2987
|
|
2988
|
+
scope.exceptions ??= [];
|
2989
|
+
scope.exceptions.push(exceptId);
|
2990
|
+
|
2277
2991
|
// todo: write a description of how this works lol
|
2278
2992
|
|
2279
2993
|
return [
|
@@ -2283,7 +2997,7 @@ const generateThrow = (scope, decl) => {
|
|
2283
2997
|
};
|
2284
2998
|
|
2285
2999
|
const generateTry = (scope, decl) => {
|
2286
|
-
if (decl.finalizer) return todo('try finally not implemented yet');
|
3000
|
+
if (decl.finalizer) return todo(scope, 'try finally not implemented yet');
|
2287
3001
|
|
2288
3002
|
const out = [];
|
2289
3003
|
|
@@ -2314,29 +3028,35 @@ const generateAssignPat = (scope, decl) => {
|
|
2314
3028
|
// TODO
|
2315
3029
|
// if identifier declared, use that
|
2316
3030
|
// else, use default (right)
|
2317
|
-
return todo('assignment pattern (optional arg)');
|
3031
|
+
return todo(scope, 'assignment pattern (optional arg)');
|
2318
3032
|
};
|
2319
3033
|
|
2320
3034
|
let pages = new Map();
|
2321
|
-
const allocPage = (reason, type) => {
|
3035
|
+
const allocPage = (scope, reason, type) => {
|
2322
3036
|
if (pages.has(reason)) return pages.get(reason).ind;
|
2323
3037
|
|
2324
3038
|
if (reason.startsWith('array:')) pages.hasArray = true;
|
2325
3039
|
if (reason.startsWith('string:')) pages.hasString = true;
|
3040
|
+
if (reason.startsWith('bytestring:')) pages.hasByteString = true;
|
3041
|
+
if (reason.includes('string:')) pages.hasAnyString = true;
|
2326
3042
|
|
2327
3043
|
const ind = pages.size;
|
2328
3044
|
pages.set(reason, { ind, type });
|
2329
3045
|
|
2330
|
-
|
3046
|
+
scope.pages ??= new Map();
|
3047
|
+
scope.pages.set(reason, { ind, type });
|
3048
|
+
|
3049
|
+
if (Prefs.allocLog) log('alloc', `allocated new page of memory (${ind}) | ${reason} (type: ${type})`);
|
2331
3050
|
|
2332
3051
|
return ind;
|
2333
3052
|
};
|
2334
3053
|
|
3054
|
+
// todo: add scope.pages
|
2335
3055
|
const freePage = reason => {
|
2336
3056
|
const { ind } = pages.get(reason);
|
2337
3057
|
pages.delete(reason);
|
2338
3058
|
|
2339
|
-
if (allocLog) log('alloc', `freed page of memory (${ind}) | ${reason}`);
|
3059
|
+
if (Prefs.allocLog) log('alloc', `freed page of memory (${ind}) | ${reason}`);
|
2340
3060
|
|
2341
3061
|
return ind;
|
2342
3062
|
};
|
@@ -2356,38 +3076,53 @@ const StoreOps = {
|
|
2356
3076
|
f64: Opcodes.f64_store,
|
2357
3077
|
|
2358
3078
|
// expects i32 input!
|
2359
|
-
|
3079
|
+
i8: Opcodes.i32_store8,
|
3080
|
+
i16: Opcodes.i32_store16,
|
2360
3081
|
};
|
2361
3082
|
|
2362
3083
|
let data = [];
|
2363
3084
|
|
2364
|
-
const compileBytes = (val, itemType
|
3085
|
+
const compileBytes = (val, itemType) => {
|
2365
3086
|
// todo: this is a mess and needs confirming / ????
|
2366
3087
|
switch (itemType) {
|
2367
3088
|
case 'i8': return [ val % 256 ];
|
2368
|
-
case 'i16': return [ val % 256,
|
2369
|
-
|
2370
|
-
case 'i32':
|
2371
|
-
|
2372
|
-
return enforceFourBytes(signedLEB128(val));
|
3089
|
+
case 'i16': return [ val % 256, (val / 256 | 0) % 256 ];
|
3090
|
+
case 'i16': return [ val % 256, (val / 256 | 0) % 256 ];
|
3091
|
+
case 'i32': return [...new Uint8Array(new Int32Array([ val ]).buffer)];
|
3092
|
+
// todo: i64
|
2373
3093
|
|
2374
3094
|
case 'f64': return ieee754_binary64(val);
|
2375
3095
|
}
|
2376
3096
|
};
|
2377
3097
|
|
3098
|
+
const getAllocType = itemType => {
|
3099
|
+
switch (itemType) {
|
3100
|
+
case 'i8': return 'bytestring';
|
3101
|
+
case 'i16': return 'string';
|
3102
|
+
|
3103
|
+
default: return 'array';
|
3104
|
+
}
|
3105
|
+
};
|
3106
|
+
|
2378
3107
|
const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty = false, itemType = valtype) => {
|
2379
3108
|
const out = [];
|
2380
3109
|
|
3110
|
+
scope.arrays ??= new Map();
|
3111
|
+
|
2381
3112
|
let firstAssign = false;
|
2382
|
-
if (!arrays.has(name) || name === '$undeclared') {
|
3113
|
+
if (!scope.arrays.has(name) || name === '$undeclared') {
|
2383
3114
|
firstAssign = true;
|
2384
3115
|
|
2385
3116
|
// todo: can we just have 1 undeclared array? probably not? but this is not really memory efficient
|
2386
3117
|
const uniqueName = name === '$undeclared' ? name + Math.random().toString().slice(2) : name;
|
2387
|
-
|
3118
|
+
|
3119
|
+
if (Prefs.scopedPageNames) scope.arrays.set(name, allocPage(scope, `${getAllocType(itemType)}: ${scope.name}/${uniqueName}`, itemType) * pageSize);
|
3120
|
+
else scope.arrays.set(name, allocPage(scope, `${getAllocType(itemType)}: ${uniqueName}`, itemType) * pageSize);
|
2388
3121
|
}
|
2389
3122
|
|
2390
|
-
const pointer = arrays.get(name);
|
3123
|
+
const pointer = scope.arrays.get(name);
|
3124
|
+
|
3125
|
+
const local = global ? globals[name] : scope.locals[name];
|
2391
3126
|
|
2392
3127
|
const useRawElements = !!decl.rawElements;
|
2393
3128
|
const elements = useRawElements ? decl.rawElements : decl.elements;
|
@@ -2395,19 +3130,25 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
|
|
2395
3130
|
const valtype = itemTypeToValtype[itemType];
|
2396
3131
|
const length = elements.length;
|
2397
3132
|
|
2398
|
-
if (firstAssign && useRawElements) {
|
2399
|
-
|
3133
|
+
if (firstAssign && useRawElements && !Prefs.noData) {
|
3134
|
+
// if length is 0 memory/data will just be 0000... anyway
|
3135
|
+
if (length !== 0) {
|
3136
|
+
let bytes = compileBytes(length, 'i32');
|
2400
3137
|
|
2401
|
-
|
2402
|
-
|
3138
|
+
if (!initEmpty) for (let i = 0; i < length; i++) {
|
3139
|
+
if (elements[i] == null) continue;
|
2403
3140
|
|
2404
|
-
|
2405
|
-
|
3141
|
+
bytes.push(...compileBytes(elements[i], itemType));
|
3142
|
+
}
|
2406
3143
|
|
2407
|
-
|
2408
|
-
|
2409
|
-
|
2410
|
-
|
3144
|
+
const ind = data.push({
|
3145
|
+
offset: pointer,
|
3146
|
+
bytes
|
3147
|
+
}) - 1;
|
3148
|
+
|
3149
|
+
scope.data ??= [];
|
3150
|
+
scope.data.push(ind);
|
3151
|
+
}
|
2411
3152
|
|
2412
3153
|
// local value as pointer
|
2413
3154
|
out.push(...number(pointer));
|
@@ -2415,11 +3156,22 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
|
|
2415
3156
|
return [ out, pointer ];
|
2416
3157
|
}
|
2417
3158
|
|
3159
|
+
const pointerTmp = local != null ? localTmp(scope, '#makearray_pointer_tmp', Valtype.i32) : null;
|
3160
|
+
if (pointerTmp != null) {
|
3161
|
+
out.push(
|
3162
|
+
[ global ? Opcodes.global_get : Opcodes.local_get, local.idx ],
|
3163
|
+
Opcodes.i32_to_u,
|
3164
|
+
[ Opcodes.local_set, pointerTmp ]
|
3165
|
+
);
|
3166
|
+
}
|
3167
|
+
|
3168
|
+
const pointerWasm = pointerTmp != null ? [ [ Opcodes.local_get, pointerTmp ] ] : number(pointer, Valtype.i32);
|
3169
|
+
|
2418
3170
|
// store length as 0th array
|
2419
3171
|
out.push(
|
2420
|
-
...
|
3172
|
+
...pointerWasm,
|
2421
3173
|
...number(length, Valtype.i32),
|
2422
|
-
[ Opcodes.i32_store, Math.log2(ValtypeSize.i32) - 1,
|
3174
|
+
[ Opcodes.i32_store, Math.log2(ValtypeSize.i32) - 1, 0 ]
|
2423
3175
|
);
|
2424
3176
|
|
2425
3177
|
const storeOp = StoreOps[itemType];
|
@@ -2428,43 +3180,68 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
|
|
2428
3180
|
if (elements[i] == null) continue;
|
2429
3181
|
|
2430
3182
|
out.push(
|
2431
|
-
...
|
3183
|
+
...pointerWasm,
|
2432
3184
|
...(useRawElements ? number(elements[i], Valtype[valtype]) : generate(scope, elements[i])),
|
2433
|
-
[ storeOp, Math.log2(ValtypeSize[itemType]) - 1, ...unsignedLEB128(
|
3185
|
+
[ storeOp, (Math.log2(ValtypeSize[itemType]) || 1) - 1, ...unsignedLEB128(ValtypeSize.i32 + i * ValtypeSize[itemType]) ]
|
2434
3186
|
);
|
2435
3187
|
}
|
2436
3188
|
|
2437
3189
|
// local value as pointer
|
2438
|
-
out.push(...
|
3190
|
+
out.push(...pointerWasm, Opcodes.i32_from_u);
|
2439
3191
|
|
2440
3192
|
return [ out, pointer ];
|
2441
3193
|
};
|
2442
3194
|
|
2443
|
-
const
|
3195
|
+
const byteStringable = str => {
|
3196
|
+
if (!Prefs.bytestring) return false;
|
3197
|
+
|
3198
|
+
for (let i = 0; i < str.length; i++) {
|
3199
|
+
if (str.charCodeAt(i) > 0xFF) return false;
|
3200
|
+
}
|
3201
|
+
|
3202
|
+
return true;
|
3203
|
+
};
|
3204
|
+
|
3205
|
+
const makeString = (scope, str, global = false, name = '$undeclared', forceBytestring = undefined) => {
|
2444
3206
|
const rawElements = new Array(str.length);
|
3207
|
+
let byteStringable = Prefs.bytestring;
|
2445
3208
|
for (let i = 0; i < str.length; i++) {
|
2446
|
-
|
3209
|
+
const c = str.charCodeAt(i);
|
3210
|
+
rawElements[i] = c;
|
3211
|
+
|
3212
|
+
if (byteStringable && c > 0xFF) byteStringable = false;
|
2447
3213
|
}
|
2448
3214
|
|
3215
|
+
if (byteStringable && forceBytestring === false) byteStringable = false;
|
3216
|
+
|
2449
3217
|
return makeArray(scope, {
|
2450
3218
|
rawElements
|
2451
|
-
}, global, name, false, 'i16')[0];
|
3219
|
+
}, global, name, false, byteStringable ? 'i8' : 'i16')[0];
|
2452
3220
|
};
|
2453
3221
|
|
2454
|
-
let arrays = new Map();
|
2455
3222
|
const generateArray = (scope, decl, global = false, name = '$undeclared', initEmpty = false) => {
|
2456
3223
|
return makeArray(scope, decl, global, name, initEmpty, valtype)[0];
|
2457
3224
|
};
|
2458
3225
|
|
2459
3226
|
export const generateMember = (scope, decl, _global, _name) => {
|
2460
3227
|
const name = decl.object.name;
|
2461
|
-
const pointer = arrays
|
3228
|
+
const pointer = scope.arrays?.get(name);
|
2462
3229
|
|
2463
|
-
const aotPointer = pointer != null;
|
3230
|
+
const aotPointer = Prefs.aotPointerOpt && pointer != null;
|
2464
3231
|
|
2465
3232
|
// hack: .length
|
2466
3233
|
if (decl.property.name === 'length') {
|
2467
|
-
|
3234
|
+
const func = funcs.find(x => x.name === name);
|
3235
|
+
if (func) {
|
3236
|
+
const userFunc = funcIndex[name] && !importedFuncs[name] && !builtinFuncs[name] && !internalConstrs[name];
|
3237
|
+
const typedParams = userFunc || builtinFuncs[name]?.typedParams;
|
3238
|
+
return number(typedParams ? func.params.length / 2 : func.params.length);
|
3239
|
+
}
|
3240
|
+
|
3241
|
+
if (builtinFuncs[name]) return number(builtinFuncs[name].typedParams ? (builtinFuncs[name].params.length / 2) : builtinFuncs[name].params.length);
|
3242
|
+
if (importedFuncs[name]) return number(importedFuncs[name].params);
|
3243
|
+
if (internalConstrs[name]) return number(internalConstrs[name].length ?? 0);
|
3244
|
+
|
2468
3245
|
return [
|
2469
3246
|
...(aotPointer ? number(0, Valtype.i32) : [
|
2470
3247
|
...generate(scope, decl.object),
|
@@ -2476,10 +3253,13 @@ export const generateMember = (scope, decl, _global, _name) => {
|
|
2476
3253
|
];
|
2477
3254
|
}
|
2478
3255
|
|
3256
|
+
const object = generate(scope, decl.object);
|
3257
|
+
const property = generate(scope, decl.property);
|
3258
|
+
|
2479
3259
|
// // todo: we should only do this for strings but we don't know at compile-time :(
|
2480
3260
|
// hack: this is naughty and will break things!
|
2481
|
-
let newOut = number(0,
|
2482
|
-
if (pages.
|
3261
|
+
let newOut = number(0, valtypeBinary), newPointer = -1;
|
3262
|
+
if (pages.hasAnyString) {
|
2483
3263
|
0, [ newOut, newPointer ] = makeArray(scope, {
|
2484
3264
|
rawElements: new Array(1)
|
2485
3265
|
}, _global, _name, true, 'i16');
|
@@ -2488,7 +3268,7 @@ export const generateMember = (scope, decl, _global, _name) => {
|
|
2488
3268
|
return typeSwitch(scope, getNodeType(scope, decl.object), {
|
2489
3269
|
[TYPES._array]: [
|
2490
3270
|
// get index as valtype
|
2491
|
-
...
|
3271
|
+
...property,
|
2492
3272
|
|
2493
3273
|
// convert to i32 and turn into byte offset by * valtypeSize (4 for i32, 8 for i64/f64)
|
2494
3274
|
Opcodes.i32_to_u,
|
@@ -2496,7 +3276,7 @@ export const generateMember = (scope, decl, _global, _name) => {
|
|
2496
3276
|
[ Opcodes.i32_mul ],
|
2497
3277
|
|
2498
3278
|
...(aotPointer ? [] : [
|
2499
|
-
...
|
3279
|
+
...object,
|
2500
3280
|
Opcodes.i32_to_u,
|
2501
3281
|
[ Opcodes.i32_add ]
|
2502
3282
|
]),
|
@@ -2505,7 +3285,7 @@ export const generateMember = (scope, decl, _global, _name) => {
|
|
2505
3285
|
[ Opcodes.load, Math.log2(ValtypeSize[valtype]) - 1, ...unsignedLEB128((aotPointer ? pointer : 0) + ValtypeSize.i32) ],
|
2506
3286
|
|
2507
3287
|
...number(TYPES.number, Valtype.i32),
|
2508
|
-
|
3288
|
+
...setLastType(scope)
|
2509
3289
|
],
|
2510
3290
|
|
2511
3291
|
[TYPES.string]: [
|
@@ -2515,14 +3295,14 @@ export const generateMember = (scope, decl, _global, _name) => {
|
|
2515
3295
|
|
2516
3296
|
...number(0, Valtype.i32), // base 0 for store later
|
2517
3297
|
|
2518
|
-
...
|
2519
|
-
|
3298
|
+
...property,
|
2520
3299
|
Opcodes.i32_to_u,
|
3300
|
+
|
2521
3301
|
...number(ValtypeSize.i16, Valtype.i32),
|
2522
3302
|
[ Opcodes.i32_mul ],
|
2523
3303
|
|
2524
3304
|
...(aotPointer ? [] : [
|
2525
|
-
...
|
3305
|
+
...object,
|
2526
3306
|
Opcodes.i32_to_u,
|
2527
3307
|
[ Opcodes.i32_add ]
|
2528
3308
|
]),
|
@@ -2537,10 +3317,38 @@ export const generateMember = (scope, decl, _global, _name) => {
|
|
2537
3317
|
...number(newPointer),
|
2538
3318
|
|
2539
3319
|
...number(TYPES.string, Valtype.i32),
|
2540
|
-
|
3320
|
+
...setLastType(scope)
|
3321
|
+
],
|
3322
|
+
[TYPES._bytestring]: [
|
3323
|
+
// setup new/out array
|
3324
|
+
...newOut,
|
3325
|
+
[ Opcodes.drop ],
|
3326
|
+
|
3327
|
+
...number(0, Valtype.i32), // base 0 for store later
|
3328
|
+
|
3329
|
+
...property,
|
3330
|
+
Opcodes.i32_to_u,
|
3331
|
+
|
3332
|
+
...(aotPointer ? [] : [
|
3333
|
+
...object,
|
3334
|
+
Opcodes.i32_to_u,
|
3335
|
+
[ Opcodes.i32_add ]
|
3336
|
+
]),
|
3337
|
+
|
3338
|
+
// load current string ind {arg}
|
3339
|
+
[ Opcodes.i32_load8_u, 0, ...unsignedLEB128((aotPointer ? pointer : 0) + ValtypeSize.i32) ],
|
3340
|
+
|
3341
|
+
// store to new string ind 0
|
3342
|
+
[ Opcodes.i32_store8, 0, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
|
3343
|
+
|
3344
|
+
// return new string (page)
|
3345
|
+
...number(newPointer),
|
3346
|
+
|
3347
|
+
...number(TYPES._bytestring, Valtype.i32),
|
3348
|
+
...setLastType(scope)
|
2541
3349
|
],
|
2542
3350
|
|
2543
|
-
default:
|
3351
|
+
default: internalThrow(scope, 'TypeError', 'Member expression is not supported for non-string non-array yet', true)
|
2544
3352
|
});
|
2545
3353
|
};
|
2546
3354
|
|
@@ -2550,25 +3358,36 @@ const objectHack = node => {
|
|
2550
3358
|
if (!node) return node;
|
2551
3359
|
|
2552
3360
|
if (node.type === 'MemberExpression') {
|
2553
|
-
|
3361
|
+
const out = (() => {
|
3362
|
+
if (node.computed || node.optional) return;
|
3363
|
+
|
3364
|
+
let objectName = node.object.name;
|
2554
3365
|
|
2555
|
-
|
3366
|
+
// if object is not identifier or another member exp, give up
|
3367
|
+
if (node.object.type !== 'Identifier' && node.object.type !== 'MemberExpression') return;
|
3368
|
+
if (objectName && ['undefined', 'null', 'NaN', 'Infinity'].includes(objectName)) return;
|
2556
3369
|
|
2557
|
-
|
2558
|
-
if (node.object.type !== 'Identifier' && node.object.type !== 'MemberExpression') return node;
|
3370
|
+
if (!objectName) objectName = objectHack(node.object)?.name?.slice?.(2);
|
2559
3371
|
|
2560
|
-
|
3372
|
+
// if .length, give up (hack within a hack!)
|
3373
|
+
if (node.property.name === 'length') {
|
3374
|
+
node.object = objectHack(node.object);
|
3375
|
+
return;
|
3376
|
+
}
|
2561
3377
|
|
2562
|
-
|
2563
|
-
|
3378
|
+
// no object name, give up
|
3379
|
+
if (!objectName) return;
|
2564
3380
|
|
2565
|
-
|
2566
|
-
|
3381
|
+
const name = '__' + objectName + '_' + node.property.name;
|
3382
|
+
if (Prefs.codeLog) log('codegen', `object hack! ${node.object.name}.${node.property.name} -> ${name}`);
|
2567
3383
|
|
2568
|
-
|
2569
|
-
|
2570
|
-
|
2571
|
-
|
3384
|
+
return {
|
3385
|
+
type: 'Identifier',
|
3386
|
+
name
|
3387
|
+
};
|
3388
|
+
})();
|
3389
|
+
|
3390
|
+
if (out) return out;
|
2572
3391
|
}
|
2573
3392
|
|
2574
3393
|
for (const x in node) {
|
@@ -2582,11 +3401,11 @@ const objectHack = node => {
|
|
2582
3401
|
};
|
2583
3402
|
|
2584
3403
|
const generateFunc = (scope, decl) => {
|
2585
|
-
if (decl.async) return todo('async functions are not supported');
|
2586
|
-
if (decl.generator) return todo('generator functions are not supported');
|
3404
|
+
if (decl.async) return todo(scope, 'async functions are not supported');
|
3405
|
+
if (decl.generator) return todo(scope, 'generator functions are not supported');
|
2587
3406
|
|
2588
3407
|
const name = decl.id ? decl.id.name : `anonymous_${randId()}`;
|
2589
|
-
const params = decl.params
|
3408
|
+
const params = decl.params ?? [];
|
2590
3409
|
|
2591
3410
|
// const innerScope = { ...scope };
|
2592
3411
|
// TODO: share scope/locals between !!!
|
@@ -2599,8 +3418,17 @@ const generateFunc = (scope, decl) => {
|
|
2599
3418
|
name
|
2600
3419
|
};
|
2601
3420
|
|
3421
|
+
if (typedInput && decl.returnType) {
|
3422
|
+
innerScope.returnType = extractTypeAnnotation(decl.returnType).type;
|
3423
|
+
innerScope.returns = [ valtypeBinary ];
|
3424
|
+
}
|
3425
|
+
|
2602
3426
|
for (let i = 0; i < params.length; i++) {
|
2603
|
-
allocVar(innerScope, params[i], false);
|
3427
|
+
allocVar(innerScope, params[i].name, false);
|
3428
|
+
|
3429
|
+
if (typedInput && params[i].typeAnnotation) {
|
3430
|
+
addVarMetadata(innerScope, params[i].name, false, extractTypeAnnotation(params[i]));
|
3431
|
+
}
|
2604
3432
|
}
|
2605
3433
|
|
2606
3434
|
let body = objectHack(decl.body);
|
@@ -2616,13 +3444,13 @@ const generateFunc = (scope, decl) => {
|
|
2616
3444
|
const func = {
|
2617
3445
|
name,
|
2618
3446
|
params: Object.values(innerScope.locals).slice(0, params.length * 2).map(x => x.type),
|
2619
|
-
|
2620
|
-
|
2621
|
-
throws: innerScope.throws,
|
2622
|
-
index: currentFuncIndex++
|
3447
|
+
index: currentFuncIndex++,
|
3448
|
+
...innerScope
|
2623
3449
|
};
|
2624
3450
|
funcIndex[name] = func.index;
|
2625
3451
|
|
3452
|
+
if (name === 'main') func.gotLastType = true;
|
3453
|
+
|
2626
3454
|
// quick hack fixes
|
2627
3455
|
for (const inst of wasm) {
|
2628
3456
|
if (inst[0] === Opcodes.call && inst[1] === -1) {
|
@@ -2639,117 +3467,6 @@ const generateFunc = (scope, decl) => {
|
|
2639
3467
|
);
|
2640
3468
|
}
|
2641
3469
|
|
2642
|
-
// change v128 params into many <type> (i32x4 -> i32/etc) instead as unsupported param valtype
|
2643
|
-
let offset = 0, vecParams = 0;
|
2644
|
-
for (let i = 0; i < params.length; i++) {
|
2645
|
-
const name = params[i];
|
2646
|
-
const local = func.locals[name];
|
2647
|
-
if (local.type === Valtype.v128) {
|
2648
|
-
vecParams++;
|
2649
|
-
|
2650
|
-
/* wasm.unshift( // add v128 load for param
|
2651
|
-
[ Opcodes.i32_const, 0 ],
|
2652
|
-
[ ...Opcodes.v128_load, 0, i * 16 ],
|
2653
|
-
[ Opcodes.local_set, local.idx ]
|
2654
|
-
); */
|
2655
|
-
|
2656
|
-
// using params and replace_lane is noticably faster than just loading from memory (above) somehow
|
2657
|
-
|
2658
|
-
// extract valtype and lane count from vec type (i32x4 = i32 4, i8x16 = i8 16, etc)
|
2659
|
-
const { vecType } = local;
|
2660
|
-
let [ type, lanes ] = vecType.split('x');
|
2661
|
-
if (!type || !lanes) throw new Error('bad metadata from vec params'); // sanity check
|
2662
|
-
|
2663
|
-
lanes = parseInt(lanes);
|
2664
|
-
type = Valtype[type];
|
2665
|
-
|
2666
|
-
const name = params[i]; // get original param name
|
2667
|
-
|
2668
|
-
func.params.splice(offset, 1, ...new Array(lanes).fill(type)); // add new params of {type}, {lanes} times
|
2669
|
-
|
2670
|
-
// update index of original local
|
2671
|
-
// delete func.locals[name];
|
2672
|
-
|
2673
|
-
// add new locals for params
|
2674
|
-
for (let j = 0; j < lanes; j++) {
|
2675
|
-
func.locals[name + j] = { idx: offset + j, type, vecParamAutogen: true };
|
2676
|
-
}
|
2677
|
-
|
2678
|
-
// prepend wasm to generate expected v128 locals
|
2679
|
-
wasm.splice(i * 2 + offset * 2, 0,
|
2680
|
-
...i32x4(0, 0, 0, 0),
|
2681
|
-
...new Array(lanes).fill(0).flatMap((_, j) => [
|
2682
|
-
[ Opcodes.local_get, offset + j ],
|
2683
|
-
[ ...Opcodes[vecType + '_replace_lane'], j ]
|
2684
|
-
]),
|
2685
|
-
[ Opcodes.local_set, i ]
|
2686
|
-
);
|
2687
|
-
|
2688
|
-
offset += lanes;
|
2689
|
-
|
2690
|
-
// note: wrapping is disabled for now due to perf/dx concerns (so this will never run)
|
2691
|
-
/* if (!func.name.startsWith('#')) func.name = '##' + func.name;
|
2692
|
-
|
2693
|
-
// add vec type index to hash name prefix for wrapper to know how to wrap
|
2694
|
-
const vecTypeIdx = [ 'i8x16', 'i16x8', 'i32x4', 'i64x2', 'f32x4', 'f64x2' ].indexOf(local.vecType);
|
2695
|
-
const secondHash = func.name.slice(1).indexOf('#');
|
2696
|
-
func.name = '#' + func.name.slice(1, secondHash) + vecTypeIdx + func.name.slice(secondHash); */
|
2697
|
-
}
|
2698
|
-
}
|
2699
|
-
|
2700
|
-
if (offset !== 0) {
|
2701
|
-
// bump local indexes for all other locals after
|
2702
|
-
for (const x in func.locals) {
|
2703
|
-
const local = func.locals[x];
|
2704
|
-
if (!local.vecParamAutogen) local.idx += offset;
|
2705
|
-
}
|
2706
|
-
|
2707
|
-
// bump local indexes in wasm local.get/set
|
2708
|
-
for (let j = 0; j < wasm.length; j++) {
|
2709
|
-
const inst = wasm[j];
|
2710
|
-
if (j < offset * 2 + vecParams * 2) {
|
2711
|
-
if (inst[0] === Opcodes.local_set) inst[1] += offset;
|
2712
|
-
continue;
|
2713
|
-
}
|
2714
|
-
|
2715
|
-
if (inst[0] === Opcodes.local_get || inst[0] === Opcodes.local_set) inst[1] += offset;
|
2716
|
-
}
|
2717
|
-
}
|
2718
|
-
|
2719
|
-
// change v128 return into many <type> instead as unsupported return valtype
|
2720
|
-
const lastReturnLocal = wasm.length > 2 && wasm[wasm.length - 1][0] === Opcodes.return && Object.values(func.locals).find(x => x.idx === wasm[wasm.length - 2][1]);
|
2721
|
-
if (lastReturnLocal && lastReturnLocal.type === Valtype.v128) {
|
2722
|
-
const name = Object.keys(func.locals)[Object.values(func.locals).indexOf(lastReturnLocal)];
|
2723
|
-
// extract valtype and lane count from vec type (i32x4 = i32 4, i8x16 = i8 16, etc)
|
2724
|
-
const { vecType } = lastReturnLocal;
|
2725
|
-
let [ type, lanes ] = vecType.split('x');
|
2726
|
-
if (!type || !lanes) throw new Error('bad metadata from vec params'); // sanity check
|
2727
|
-
|
2728
|
-
lanes = parseInt(lanes);
|
2729
|
-
type = Valtype[type];
|
2730
|
-
|
2731
|
-
const vecIdx = lastReturnLocal.idx;
|
2732
|
-
|
2733
|
-
const lastIdx = Math.max(0, ...Object.values(func.locals).map(x => x.idx));
|
2734
|
-
const tmpIdx = [];
|
2735
|
-
for (let i = 0; i < lanes; i++) {
|
2736
|
-
const idx = lastIdx + i + 1;
|
2737
|
-
tmpIdx.push(idx);
|
2738
|
-
func.locals[name + i] = { idx, type, vecReturnAutogen: true };
|
2739
|
-
}
|
2740
|
-
|
2741
|
-
wasm.splice(wasm.length - 1, 1,
|
2742
|
-
...new Array(lanes).fill(0).flatMap((_, i) => [
|
2743
|
-
i === 0 ? null : [ Opcodes.local_get, vecIdx ],
|
2744
|
-
[ ...Opcodes[vecType + '_extract_lane'], i ],
|
2745
|
-
[ Opcodes.local_set, tmpIdx[i] ],
|
2746
|
-
].filter(x => x !== null)),
|
2747
|
-
...new Array(lanes).fill(0).map((_, i) => [ Opcodes.local_get, tmpIdx[i]])
|
2748
|
-
);
|
2749
|
-
|
2750
|
-
func.returns = new Array(lanes).fill(type);
|
2751
|
-
}
|
2752
|
-
|
2753
3470
|
func.wasm = wasm;
|
2754
3471
|
|
2755
3472
|
funcs.push(func);
|
@@ -2785,7 +3502,7 @@ const internalConstrs = {
|
|
2785
3502
|
|
2786
3503
|
// todo: check in wasm instead of here
|
2787
3504
|
const literalValue = arg.value ?? 0;
|
2788
|
-
if (literalValue < 0 || !Number.isFinite(literalValue) || literalValue > 4294967295) return internalThrow(scope, 'RangeThrow', 'Invalid array length');
|
3505
|
+
if (literalValue < 0 || !Number.isFinite(literalValue) || literalValue > 4294967295) return internalThrow(scope, 'RangeThrow', 'Invalid array length', true);
|
2789
3506
|
|
2790
3507
|
return [
|
2791
3508
|
...number(0, Valtype.i32),
|
@@ -2796,7 +3513,8 @@ const internalConstrs = {
|
|
2796
3513
|
...number(pointer)
|
2797
3514
|
];
|
2798
3515
|
},
|
2799
|
-
type: TYPES._array
|
3516
|
+
type: TYPES._array,
|
3517
|
+
length: 1
|
2800
3518
|
},
|
2801
3519
|
|
2802
3520
|
__Array_of: {
|
@@ -2808,7 +3526,131 @@ const internalConstrs = {
|
|
2808
3526
|
}, global, name);
|
2809
3527
|
},
|
2810
3528
|
type: TYPES._array,
|
3529
|
+
notConstr: true,
|
3530
|
+
length: 0
|
3531
|
+
},
|
3532
|
+
|
3533
|
+
__Porffor_fastOr: {
|
3534
|
+
generate: (scope, decl) => {
|
3535
|
+
const out = [];
|
3536
|
+
|
3537
|
+
for (let i = 0; i < decl.arguments.length; i++) {
|
3538
|
+
out.push(
|
3539
|
+
...generate(scope, decl.arguments[i]),
|
3540
|
+
Opcodes.i32_to_u,
|
3541
|
+
...(i > 0 ? [ [ Opcodes.i32_or ] ] : [])
|
3542
|
+
);
|
3543
|
+
}
|
3544
|
+
|
3545
|
+
out.push(Opcodes.i32_from_u);
|
3546
|
+
|
3547
|
+
return out;
|
3548
|
+
},
|
3549
|
+
type: TYPES.boolean,
|
2811
3550
|
notConstr: true
|
3551
|
+
},
|
3552
|
+
|
3553
|
+
__Porffor_fastAnd: {
|
3554
|
+
generate: (scope, decl) => {
|
3555
|
+
const out = [];
|
3556
|
+
|
3557
|
+
for (let i = 0; i < decl.arguments.length; i++) {
|
3558
|
+
out.push(
|
3559
|
+
...generate(scope, decl.arguments[i]),
|
3560
|
+
Opcodes.i32_to_u,
|
3561
|
+
...(i > 0 ? [ [ Opcodes.i32_and ] ] : [])
|
3562
|
+
);
|
3563
|
+
}
|
3564
|
+
|
3565
|
+
out.push(Opcodes.i32_from_u);
|
3566
|
+
|
3567
|
+
return out;
|
3568
|
+
},
|
3569
|
+
type: TYPES.boolean,
|
3570
|
+
notConstr: true
|
3571
|
+
},
|
3572
|
+
|
3573
|
+
Boolean: {
|
3574
|
+
generate: (scope, decl) => {
|
3575
|
+
// todo: boolean object when used as constructor
|
3576
|
+
const arg = decl.arguments[0] ?? DEFAULT_VALUE;
|
3577
|
+
return truthy(scope, generate(scope, arg), getNodeType(scope, arg));
|
3578
|
+
},
|
3579
|
+
type: TYPES.boolean,
|
3580
|
+
length: 1
|
3581
|
+
},
|
3582
|
+
|
3583
|
+
__Math_max: {
|
3584
|
+
generate: (scope, decl) => {
|
3585
|
+
const out = [
|
3586
|
+
...number(-Infinity)
|
3587
|
+
];
|
3588
|
+
|
3589
|
+
for (let i = 0; i < decl.arguments.length; i++) {
|
3590
|
+
out.push(
|
3591
|
+
...generate(scope, decl.arguments[i]),
|
3592
|
+
[ Opcodes.f64_max ]
|
3593
|
+
);
|
3594
|
+
}
|
3595
|
+
|
3596
|
+
return out;
|
3597
|
+
},
|
3598
|
+
type: TYPES.number,
|
3599
|
+
notConstr: true,
|
3600
|
+
length: 2
|
3601
|
+
},
|
3602
|
+
|
3603
|
+
__Math_min: {
|
3604
|
+
generate: (scope, decl) => {
|
3605
|
+
const out = [
|
3606
|
+
...number(Infinity)
|
3607
|
+
];
|
3608
|
+
|
3609
|
+
for (let i = 0; i < decl.arguments.length; i++) {
|
3610
|
+
out.push(
|
3611
|
+
...generate(scope, decl.arguments[i]),
|
3612
|
+
[ Opcodes.f64_min ]
|
3613
|
+
);
|
3614
|
+
}
|
3615
|
+
|
3616
|
+
return out;
|
3617
|
+
},
|
3618
|
+
type: TYPES.number,
|
3619
|
+
notConstr: true,
|
3620
|
+
length: 2
|
3621
|
+
},
|
3622
|
+
|
3623
|
+
__console_log: {
|
3624
|
+
generate: (scope, decl) => {
|
3625
|
+
const out = [];
|
3626
|
+
|
3627
|
+
for (let i = 0; i < decl.arguments.length; i++) {
|
3628
|
+
out.push(
|
3629
|
+
...generateCall(scope, {
|
3630
|
+
callee: {
|
3631
|
+
type: 'Identifier',
|
3632
|
+
name: '__Porffor_print'
|
3633
|
+
},
|
3634
|
+
arguments: [ decl.arguments[i] ]
|
3635
|
+
}),
|
3636
|
+
|
3637
|
+
// print space
|
3638
|
+
...number(32),
|
3639
|
+
[ Opcodes.call, importedFuncs.printChar ]
|
3640
|
+
);
|
3641
|
+
}
|
3642
|
+
|
3643
|
+
// print newline
|
3644
|
+
out.push(
|
3645
|
+
...number(10),
|
3646
|
+
[ Opcodes.call, importedFuncs.printChar ]
|
3647
|
+
);
|
3648
|
+
|
3649
|
+
return out;
|
3650
|
+
},
|
3651
|
+
type: TYPES.undefined,
|
3652
|
+
notConstr: true,
|
3653
|
+
length: 0
|
2812
3654
|
}
|
2813
3655
|
};
|
2814
3656
|
|
@@ -2837,20 +3679,23 @@ export default program => {
|
|
2837
3679
|
funcs = [];
|
2838
3680
|
funcIndex = {};
|
2839
3681
|
depth = [];
|
2840
|
-
arrays = new Map();
|
2841
3682
|
pages = new Map();
|
2842
3683
|
data = [];
|
2843
3684
|
currentFuncIndex = importedFuncs.length;
|
2844
3685
|
|
2845
3686
|
globalThis.valtype = 'f64';
|
2846
3687
|
|
2847
|
-
const valtypeOpt = process.argv.find(x => x.startsWith('
|
3688
|
+
const valtypeOpt = process.argv.find(x => x.startsWith('--valtype='));
|
2848
3689
|
if (valtypeOpt) valtype = valtypeOpt.split('=')[1];
|
2849
3690
|
|
2850
3691
|
globalThis.valtypeBinary = Valtype[valtype];
|
2851
3692
|
|
2852
3693
|
const valtypeInd = ['i32', 'i64', 'f64'].indexOf(valtype);
|
2853
3694
|
|
3695
|
+
globalThis.pageSize = PageSize;
|
3696
|
+
const pageSizeOpt = process.argv.find(x => x.startsWith('--page-size='));
|
3697
|
+
if (pageSizeOpt) pageSize = parseInt(pageSizeOpt.split('=')[1]) * 1024;
|
3698
|
+
|
2854
3699
|
// set generic opcodes for current valtype
|
2855
3700
|
Opcodes.const = [ Opcodes.i32_const, Opcodes.i64_const, Opcodes.f64_const ][valtypeInd];
|
2856
3701
|
Opcodes.eq = [ Opcodes.i32_eq, Opcodes.i64_eq, Opcodes.f64_eq ][valtypeInd];
|
@@ -2859,10 +3704,10 @@ export default program => {
|
|
2859
3704
|
Opcodes.add = [ Opcodes.i32_add, Opcodes.i64_add, Opcodes.f64_add ][valtypeInd];
|
2860
3705
|
Opcodes.sub = [ Opcodes.i32_sub, Opcodes.i64_sub, Opcodes.f64_sub ][valtypeInd];
|
2861
3706
|
|
2862
|
-
Opcodes.i32_to = [ [
|
2863
|
-
Opcodes.i32_to_u = [ [
|
2864
|
-
Opcodes.i32_from = [ [
|
2865
|
-
Opcodes.i32_from_u = [ [
|
3707
|
+
Opcodes.i32_to = [ [], [ Opcodes.i32_wrap_i64 ], Opcodes.i32_trunc_sat_f64_s ][valtypeInd];
|
3708
|
+
Opcodes.i32_to_u = [ [], [ Opcodes.i32_wrap_i64 ], Opcodes.i32_trunc_sat_f64_u ][valtypeInd];
|
3709
|
+
Opcodes.i32_from = [ [], [ Opcodes.i64_extend_i32_s ], [ Opcodes.f64_convert_i32_s ] ][valtypeInd];
|
3710
|
+
Opcodes.i32_from_u = [ [], [ Opcodes.i64_extend_i32_u ], [ Opcodes.f64_convert_i32_u ] ][valtypeInd];
|
2866
3711
|
|
2867
3712
|
Opcodes.load = [ Opcodes.i32_load, Opcodes.i64_load, Opcodes.f64_load ][valtypeInd];
|
2868
3713
|
Opcodes.store = [ Opcodes.i32_store, Opcodes.i64_store, Opcodes.f64_store ][valtypeInd];
|
@@ -2875,10 +3720,6 @@ export default program => {
|
|
2875
3720
|
|
2876
3721
|
program.id = { name: 'main' };
|
2877
3722
|
|
2878
|
-
globalThis.pageSize = PageSize;
|
2879
|
-
const pageSizeOpt = process.argv.find(x => x.startsWith('-page-size='));
|
2880
|
-
if (pageSizeOpt) pageSize = parseInt(pageSizeOpt.split('=')[1]) * 1024;
|
2881
|
-
|
2882
3723
|
const scope = {
|
2883
3724
|
locals: {},
|
2884
3725
|
localInd: 0
|
@@ -2889,7 +3730,7 @@ export default program => {
|
|
2889
3730
|
body: program.body
|
2890
3731
|
};
|
2891
3732
|
|
2892
|
-
if (
|
3733
|
+
if (Prefs.astLog) console.log(JSON.stringify(program.body.body, null, 2));
|
2893
3734
|
|
2894
3735
|
generateFunc(scope, program);
|
2895
3736
|
|
@@ -2906,7 +3747,11 @@ export default program => {
|
|
2906
3747
|
}
|
2907
3748
|
|
2908
3749
|
if (lastInst[0] === Opcodes.end || lastInst[0] === Opcodes.local_set || lastInst[0] === Opcodes.global_set) {
|
2909
|
-
|
3750
|
+
if (lastInst[0] === Opcodes.local_set && lastInst[1] === main.locals['#last_type'].idx) {
|
3751
|
+
main.wasm.splice(main.wasm.length - 1, 1);
|
3752
|
+
} else {
|
3753
|
+
main.returns = [];
|
3754
|
+
}
|
2910
3755
|
}
|
2911
3756
|
|
2912
3757
|
if (lastInst[0] === Opcodes.call) {
|