porffor 0.2.0-77e30e8 → 0.2.0-812b38c
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/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 +19 -0
- package/compiler/builtins/array.ts +145 -0
- package/compiler/builtins/base64.ts +151 -0
- package/compiler/builtins/crypto.ts +120 -0
- package/compiler/builtins/date.ts +1466 -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 +42 -0
- package/compiler/builtins/string.ts +1055 -0
- package/compiler/builtins/tostring.ts +45 -0
- package/compiler/builtins.js +601 -272
- package/compiler/{codeGen.js → codegen.js} +1321 -505
- package/compiler/decompile.js +11 -13
- package/compiler/embedding.js +22 -22
- package/compiler/encoding.js +98 -114
- package/compiler/generated_builtins.js +1262 -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/fib.js +7 -0
- 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,7 +195,7 @@ 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
|
}
|
@@ -183,38 +204,65 @@ const generate = (scope, decl, global = false, name = undefined) => {
|
|
183
204
|
if (!inst) 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
|
-
const aotWFA = process.argv.includes('-aot-well-formed-string-approximation');
|
403
|
-
if (aotWFA) addVarMeta(name, { wellFormed: undefined });
|
404
|
-
|
405
463
|
if (assign) {
|
406
|
-
const pointer = arrays
|
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,
|
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)];
|
1013
1193
|
|
1014
|
-
|
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',
|
1028
|
-
|
1029
|
-
[TYPES._array]: 'Array',
|
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}`;
|
1396
1651
|
|
1397
|
-
funcIndex[
|
1398
|
-
|
1652
|
+
if (!funcIndex[rhemynName]) {
|
1653
|
+
const func = Rhemyn[funcName](regex, currentFuncIndex++, rhemynName);
|
1399
1654
|
|
1655
|
+
funcIndex[func.name] = func.index;
|
1656
|
+
funcs.push(func);
|
1657
|
+
}
|
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]) {
|
@@ -1548,15 +1850,66 @@ 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
|
+
// a, b
|
1877
|
+
i32_or: { imms: 0, args: [ true, true ], returns: 1 },
|
1878
|
+
};
|
1879
|
+
|
1880
|
+
const opName = name.slice('__Porffor_wasm_'.length);
|
1881
|
+
|
1882
|
+
if (wasmOps[opName]) {
|
1883
|
+
const op = wasmOps[opName];
|
1884
|
+
|
1885
|
+
const argOut = [];
|
1886
|
+
for (let i = 0; i < op.args.length; i++) argOut.push(
|
1887
|
+
...generate(scope, decl.arguments[i]),
|
1888
|
+
...(op.args[i] ? [ Opcodes.i32_to ] : [])
|
1889
|
+
);
|
1890
|
+
|
1891
|
+
// literals only
|
1892
|
+
const imms = decl.arguments.slice(op.args.length).map(x => x.value);
|
1893
|
+
|
1894
|
+
return [
|
1895
|
+
...argOut,
|
1896
|
+
[ Opcodes[opName], ...imms ],
|
1897
|
+
...(new Array(op.returns).fill(Opcodes.i32_from))
|
1898
|
+
];
|
1899
|
+
}
|
1900
|
+
}
|
1901
|
+
|
1551
1902
|
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
|
1903
|
+
if (scope.locals[name] !== undefined || globals[name] !== undefined || builtinVars[name] !== undefined) return internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function`, true);
|
1904
|
+
return internalThrow(scope, 'ReferenceError', `${unhackName(name)} is not defined`, true);
|
1554
1905
|
}
|
1555
1906
|
|
1556
1907
|
const func = funcs.find(x => x.index === idx);
|
1557
1908
|
|
1558
1909
|
const userFunc = (funcIndex[name] && !importedFuncs[name] && !builtinFuncs[name] && !internalConstrs[name]) || idx === -1;
|
1559
|
-
const
|
1910
|
+
const typedParams = userFunc || builtinFuncs[name]?.typedParams;
|
1911
|
+
const typedReturns = (func ? func.returnType == null : userFunc) || builtinFuncs[name]?.typedReturns;
|
1912
|
+
const paramCount = func && (typedParams ? func.params.length / 2 : func.params.length);
|
1560
1913
|
|
1561
1914
|
let args = decl.arguments;
|
1562
1915
|
if (func && args.length < paramCount) {
|
@@ -1572,14 +1925,24 @@ const generateCall = (scope, decl, _global, _name) => {
|
|
1572
1925
|
if (func && func.throws) scope.throws = true;
|
1573
1926
|
|
1574
1927
|
let out = [];
|
1575
|
-
for (
|
1928
|
+
for (let i = 0; i < args.length; i++) {
|
1929
|
+
const arg = args[i];
|
1576
1930
|
out = out.concat(generate(scope, arg));
|
1577
|
-
|
1931
|
+
|
1932
|
+
if (builtinFuncs[name] && builtinFuncs[name].params[i * (typedParams ? 2 : 1)] === Valtype.i32 && valtypeBinary !== Valtype.i32) {
|
1933
|
+
out.push(Opcodes.i32_to);
|
1934
|
+
}
|
1935
|
+
|
1936
|
+
if (importedFuncs[name] && name.startsWith('profile')) {
|
1937
|
+
out.push(Opcodes.i32_to);
|
1938
|
+
}
|
1939
|
+
|
1940
|
+
if (typedParams) out = out.concat(getNodeType(scope, arg));
|
1578
1941
|
}
|
1579
1942
|
|
1580
1943
|
out.push([ Opcodes.call, idx ]);
|
1581
1944
|
|
1582
|
-
if (!
|
1945
|
+
if (!typedReturns) {
|
1583
1946
|
// let type;
|
1584
1947
|
// if (builtinFuncs[name]) type = TYPES[builtinFuncs[name].returnType ?? 'number'];
|
1585
1948
|
// if (internalConstrs[name]) type = internalConstrs[name].type;
|
@@ -1589,7 +1952,11 @@ const generateCall = (scope, decl, _global, _name) => {
|
|
1589
1952
|
// ...number(type, Valtype.i32),
|
1590
1953
|
// [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
|
1591
1954
|
// );
|
1592
|
-
} else out.push(
|
1955
|
+
} else out.push(...setLastType(scope));
|
1956
|
+
|
1957
|
+
if (builtinFuncs[name] && builtinFuncs[name].returns?.[0] === Valtype.i32 && valtypeBinary !== Valtype.i32) {
|
1958
|
+
out.push(Opcodes.i32_from);
|
1959
|
+
}
|
1593
1960
|
|
1594
1961
|
return out;
|
1595
1962
|
};
|
@@ -1597,8 +1964,21 @@ const generateCall = (scope, decl, _global, _name) => {
|
|
1597
1964
|
const generateNew = (scope, decl, _global, _name) => {
|
1598
1965
|
// hack: basically treat this as a normal call for builtins for now
|
1599
1966
|
const name = mapName(decl.callee.name);
|
1967
|
+
|
1600
1968
|
if (internalConstrs[name] && !internalConstrs[name].notConstr) return internalConstrs[name].generate(scope, decl, _global, _name);
|
1601
|
-
|
1969
|
+
|
1970
|
+
if (builtinFuncs[name + '$constructor']) {
|
1971
|
+
// custom ...$constructor override builtin func
|
1972
|
+
return generateCall(scope, {
|
1973
|
+
...decl,
|
1974
|
+
callee: {
|
1975
|
+
type: 'Identifier',
|
1976
|
+
name: name + '$constructor'
|
1977
|
+
}
|
1978
|
+
}, _global, _name);
|
1979
|
+
}
|
1980
|
+
|
1981
|
+
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
1982
|
|
1603
1983
|
return generateCall(scope, decl, _global, _name);
|
1604
1984
|
};
|
@@ -1614,60 +1994,217 @@ const unhackName = name => {
|
|
1614
1994
|
return name;
|
1615
1995
|
};
|
1616
1996
|
|
1617
|
-
const
|
1618
|
-
|
1997
|
+
const knownType = (scope, type) => {
|
1998
|
+
if (type.length === 1 && type[0][0] === Opcodes.i32_const) {
|
1999
|
+
return type[0][1];
|
2000
|
+
}
|
1619
2001
|
|
1620
|
-
|
1621
|
-
|
1622
|
-
[ Opcodes.local_set, tmp ],
|
1623
|
-
[ Opcodes.block, returns ]
|
1624
|
-
];
|
2002
|
+
if (typedInput && type.length === 1 && type[0][0] === Opcodes.local_get) {
|
2003
|
+
const idx = type[0][1];
|
1625
2004
|
|
1626
|
-
|
2005
|
+
// type idx = var idx + 1
|
2006
|
+
const v = Object.values(scope.locals).find(x => x.idx === idx - 1);
|
2007
|
+
if (v.metadata?.type != null) return v.metadata.type;
|
2008
|
+
}
|
1627
2009
|
|
1628
|
-
|
1629
|
-
|
2010
|
+
return null;
|
2011
|
+
};
|
1630
2012
|
|
1631
|
-
|
1632
|
-
|
1633
|
-
|
1634
|
-
|
2013
|
+
const brTable = (input, bc, returns) => {
|
2014
|
+
const out = [];
|
2015
|
+
const keys = Object.keys(bc);
|
2016
|
+
const count = keys.length;
|
1635
2017
|
|
1636
|
-
|
1637
|
-
|
1638
|
-
|
1639
|
-
|
2018
|
+
if (count === 1) {
|
2019
|
+
// return [
|
2020
|
+
// ...input,
|
2021
|
+
// ...bc[keys[0]]
|
2022
|
+
// ];
|
2023
|
+
return bc[keys[0]];
|
1640
2024
|
}
|
1641
2025
|
|
1642
|
-
|
1643
|
-
|
1644
|
-
|
2026
|
+
if (count === 2) {
|
2027
|
+
// just use if else
|
2028
|
+
const other = keys.find(x => x !== 'default');
|
2029
|
+
return [
|
2030
|
+
...input,
|
2031
|
+
...number(other, Valtype.i32),
|
2032
|
+
[ Opcodes.i32_eq ],
|
2033
|
+
[ Opcodes.if, returns ],
|
2034
|
+
...bc[other],
|
2035
|
+
[ Opcodes.else ],
|
2036
|
+
...bc.default,
|
2037
|
+
[ Opcodes.end ]
|
2038
|
+
];
|
2039
|
+
}
|
1645
2040
|
|
1646
|
-
|
2041
|
+
for (let i = 0; i < count; i++) {
|
2042
|
+
if (i === 0) out.push([ Opcodes.block, returns, 'br table start' ]);
|
2043
|
+
else out.push([ Opcodes.block, Blocktype.void ]);
|
2044
|
+
}
|
1647
2045
|
|
1648
|
-
|
1649
|
-
|
2046
|
+
const nums = keys.filter(x => +x);
|
2047
|
+
const offset = Math.min(...nums);
|
2048
|
+
const max = Math.max(...nums);
|
1650
2049
|
|
1651
|
-
const
|
1652
|
-
|
2050
|
+
const table = [];
|
2051
|
+
let br = 1;
|
1653
2052
|
|
1654
|
-
|
1655
|
-
|
1656
|
-
|
1657
|
-
|
2053
|
+
for (let i = offset; i <= max; i++) {
|
2054
|
+
// if branch for this num, go to that block
|
2055
|
+
if (bc[i]) {
|
2056
|
+
table.push(br);
|
2057
|
+
br++;
|
2058
|
+
continue;
|
2059
|
+
}
|
1658
2060
|
|
1659
|
-
|
2061
|
+
// else default
|
2062
|
+
table.push(0);
|
2063
|
+
}
|
2064
|
+
|
2065
|
+
out.push(
|
2066
|
+
[ Opcodes.block, Blocktype.void ],
|
2067
|
+
...input,
|
2068
|
+
...(offset > 0 ? [
|
2069
|
+
...number(offset, Valtype.i32),
|
2070
|
+
[ Opcodes.i32_sub ]
|
2071
|
+
] : []),
|
2072
|
+
[ Opcodes.br_table, ...encodeVector(table), 0 ]
|
2073
|
+
);
|
2074
|
+
|
2075
|
+
// if you can guess why we sort the wrong way and then reverse
|
2076
|
+
// (instead of just sorting the correct way)
|
2077
|
+
// dm me and if you are correct and the first person
|
2078
|
+
// I will somehow shout you out or something
|
2079
|
+
const orderedBc = keys.sort((a, b) => b - a).reverse();
|
2080
|
+
|
2081
|
+
br = count - 1;
|
2082
|
+
for (const x of orderedBc) {
|
2083
|
+
out.push(
|
2084
|
+
[ Opcodes.end ],
|
2085
|
+
...bc[x],
|
2086
|
+
...(br === 0 ? [] : [ [ Opcodes.br, br ] ])
|
2087
|
+
);
|
2088
|
+
br--;
|
2089
|
+
}
|
2090
|
+
|
2091
|
+
return [
|
2092
|
+
...out,
|
2093
|
+
[ Opcodes.end, 'br table end' ]
|
2094
|
+
];
|
2095
|
+
};
|
2096
|
+
|
2097
|
+
const typeSwitch = (scope, type, bc, returns = valtypeBinary) => {
|
2098
|
+
if (!Prefs.bytestring) delete bc[TYPES._bytestring];
|
2099
|
+
|
2100
|
+
const known = knownType(scope, type);
|
2101
|
+
if (known != null) {
|
2102
|
+
return bc[known] ?? bc.default;
|
2103
|
+
}
|
2104
|
+
|
2105
|
+
if (Prefs.typeswitchUseBrtable)
|
2106
|
+
return brTable(type, bc, returns);
|
2107
|
+
|
2108
|
+
const tmp = localTmp(scope, '#typeswitch_tmp', Valtype.i32);
|
2109
|
+
const out = [
|
2110
|
+
...type,
|
2111
|
+
[ Opcodes.local_set, tmp ],
|
2112
|
+
[ Opcodes.block, returns ]
|
2113
|
+
];
|
2114
|
+
|
2115
|
+
for (const x in bc) {
|
2116
|
+
if (x === 'default') continue;
|
2117
|
+
|
2118
|
+
// if type == x
|
2119
|
+
out.push([ Opcodes.local_get, tmp ]);
|
2120
|
+
out.push(...number(x, Valtype.i32));
|
2121
|
+
out.push([ Opcodes.i32_eq ]);
|
2122
|
+
|
2123
|
+
out.push([ Opcodes.if, Blocktype.void, `TYPESWITCH|${TYPE_NAMES[x]}` ]);
|
2124
|
+
out.push(...bc[x]);
|
2125
|
+
out.push([ Opcodes.br, 1 ]);
|
2126
|
+
out.push([ Opcodes.end ]);
|
2127
|
+
}
|
2128
|
+
|
2129
|
+
// default
|
2130
|
+
if (bc.default) out.push(...bc.default);
|
2131
|
+
else if (returns !== Blocktype.void) out.push(...number(0, returns));
|
2132
|
+
|
2133
|
+
out.push([ Opcodes.end, 'TYPESWITCH_end' ]);
|
2134
|
+
|
2135
|
+
return out;
|
2136
|
+
};
|
2137
|
+
|
2138
|
+
const allocVar = (scope, name, global = false, type = true) => {
|
2139
|
+
const target = global ? globals : scope.locals;
|
2140
|
+
|
2141
|
+
// already declared
|
2142
|
+
if (target[name]) {
|
2143
|
+
// parser should catch this but sanity check anyway
|
2144
|
+
// if (decl.kind !== 'var') return internalThrow(scope, 'SyntaxError', `Identifier '${unhackName(name)}' has already been declared`);
|
2145
|
+
|
2146
|
+
return target[name].idx;
|
1660
2147
|
}
|
1661
2148
|
|
1662
2149
|
let idx = global ? globalInd++ : scope.localInd++;
|
1663
2150
|
target[name] = { idx, type: valtypeBinary };
|
1664
2151
|
|
1665
|
-
|
1666
|
-
|
2152
|
+
if (type) {
|
2153
|
+
let typeIdx = global ? globalInd++ : scope.localInd++;
|
2154
|
+
target[name + '#type'] = { idx: typeIdx, type: Valtype.i32 };
|
2155
|
+
}
|
1667
2156
|
|
1668
2157
|
return idx;
|
1669
2158
|
};
|
1670
2159
|
|
2160
|
+
const addVarMetadata = (scope, name, global = false, metadata = {}) => {
|
2161
|
+
const target = global ? globals : scope.locals;
|
2162
|
+
|
2163
|
+
target[name].metadata ??= {};
|
2164
|
+
for (const x in metadata) {
|
2165
|
+
if (metadata[x] != null) target[name].metadata[x] = metadata[x];
|
2166
|
+
}
|
2167
|
+
};
|
2168
|
+
|
2169
|
+
const typeAnnoToPorfType = x => {
|
2170
|
+
if (!x) return null;
|
2171
|
+
if (TYPES[x.toLowerCase()] != null) return TYPES[x.toLowerCase()];
|
2172
|
+
if (TYPES['_' + x.toLowerCase()] != null) return TYPES['_' + x.toLowerCase()];
|
2173
|
+
|
2174
|
+
switch (x) {
|
2175
|
+
case 'i32':
|
2176
|
+
case 'i64':
|
2177
|
+
case 'f64':
|
2178
|
+
return TYPES.number;
|
2179
|
+
}
|
2180
|
+
|
2181
|
+
return null;
|
2182
|
+
};
|
2183
|
+
|
2184
|
+
const extractTypeAnnotation = decl => {
|
2185
|
+
let a = decl;
|
2186
|
+
while (a.typeAnnotation) a = a.typeAnnotation;
|
2187
|
+
|
2188
|
+
let type = null, elementType = null;
|
2189
|
+
if (a.typeName) {
|
2190
|
+
type = a.typeName.name;
|
2191
|
+
} else if (a.type.endsWith('Keyword')) {
|
2192
|
+
type = a.type.slice(2, -7).toLowerCase();
|
2193
|
+
} else if (a.type === 'TSArrayType') {
|
2194
|
+
type = 'array';
|
2195
|
+
elementType = extractTypeAnnotation(a.elementType).type;
|
2196
|
+
}
|
2197
|
+
|
2198
|
+
const typeName = type;
|
2199
|
+
type = typeAnnoToPorfType(type);
|
2200
|
+
|
2201
|
+
if (type === TYPES._bytestring && !Prefs.bytestring) type = TYPES.string;
|
2202
|
+
|
2203
|
+
// if (decl.name) console.log(decl.name, { type, elementType });
|
2204
|
+
|
2205
|
+
return { type, typeName, elementType };
|
2206
|
+
};
|
2207
|
+
|
1671
2208
|
const generateVar = (scope, decl) => {
|
1672
2209
|
let out = [];
|
1673
2210
|
|
@@ -1679,6 +2216,8 @@ const generateVar = (scope, decl) => {
|
|
1679
2216
|
for (const x of decl.declarations) {
|
1680
2217
|
const name = mapName(x.id.name);
|
1681
2218
|
|
2219
|
+
if (!name) return todo(scope, 'destructuring is not supported yet');
|
2220
|
+
|
1682
2221
|
if (x.init && isFuncType(x.init.type)) {
|
1683
2222
|
// hack for let a = function () { ... }
|
1684
2223
|
x.init.id = { name };
|
@@ -1694,7 +2233,13 @@ const generateVar = (scope, decl) => {
|
|
1694
2233
|
continue; // always ignore
|
1695
2234
|
}
|
1696
2235
|
|
1697
|
-
|
2236
|
+
const typed = typedInput && x.id.typeAnnotation;
|
2237
|
+
let idx = allocVar(scope, name, global, !(typed && extractTypeAnnotation(x.id).type != null));
|
2238
|
+
|
2239
|
+
if (typed) {
|
2240
|
+
addVarMetadata(scope, name, global, extractTypeAnnotation(x.id));
|
2241
|
+
}
|
2242
|
+
|
1698
2243
|
if (x.init) {
|
1699
2244
|
out = out.concat(generate(scope, x.init, global, name));
|
1700
2245
|
|
@@ -1709,7 +2254,8 @@ const generateVar = (scope, decl) => {
|
|
1709
2254
|
return out;
|
1710
2255
|
};
|
1711
2256
|
|
1712
|
-
|
2257
|
+
// todo: optimize this func for valueUnused
|
2258
|
+
const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
|
1713
2259
|
const { type, name } = decl.left;
|
1714
2260
|
|
1715
2261
|
if (type === 'ObjectPattern') {
|
@@ -1727,9 +2273,9 @@ const generateAssign = (scope, decl) => {
|
|
1727
2273
|
// hack: .length setter
|
1728
2274
|
if (decl.left.type === 'MemberExpression' && decl.left.property.name === 'length') {
|
1729
2275
|
const name = decl.left.object.name;
|
1730
|
-
const pointer = arrays
|
2276
|
+
const pointer = scope.arrays?.get(name);
|
1731
2277
|
|
1732
|
-
const aotPointer = pointer != null;
|
2278
|
+
const aotPointer = Prefs.aotPointerOpt && pointer != null;
|
1733
2279
|
|
1734
2280
|
const newValueTmp = localTmp(scope, '__length_setter_tmp');
|
1735
2281
|
|
@@ -1754,9 +2300,9 @@ const generateAssign = (scope, decl) => {
|
|
1754
2300
|
// arr[i]
|
1755
2301
|
if (decl.left.type === 'MemberExpression' && decl.left.computed) {
|
1756
2302
|
const name = decl.left.object.name;
|
1757
|
-
const pointer = arrays
|
2303
|
+
const pointer = scope.arrays?.get(name);
|
1758
2304
|
|
1759
|
-
const aotPointer = pointer != null;
|
2305
|
+
const aotPointer = Prefs.aotPointerOpt && pointer != null;
|
1760
2306
|
|
1761
2307
|
const newValueTmp = localTmp(scope, '__member_setter_val_tmp');
|
1762
2308
|
const pointerTmp = op === '=' ? -1 : localTmp(scope, '__member_setter_ptr_tmp', Valtype.i32);
|
@@ -1812,6 +2358,8 @@ const generateAssign = (scope, decl) => {
|
|
1812
2358
|
];
|
1813
2359
|
}
|
1814
2360
|
|
2361
|
+
if (!name) return todo(scope, 'destructuring is not supported yet', true);
|
2362
|
+
|
1815
2363
|
const [ local, isGlobal ] = lookupName(scope, name);
|
1816
2364
|
|
1817
2365
|
if (local === undefined) {
|
@@ -1858,9 +2406,7 @@ const generateAssign = (scope, decl) => {
|
|
1858
2406
|
], getType(scope, name), getNodeType(scope, decl.right), isGlobal, name, true),
|
1859
2407
|
[ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ],
|
1860
2408
|
|
1861
|
-
|
1862
|
-
// hack: type is idx+1
|
1863
|
-
[ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx + 1 ],
|
2409
|
+
...setType(scope, name, getLastType(scope))
|
1864
2410
|
];
|
1865
2411
|
}
|
1866
2412
|
|
@@ -1871,9 +2417,7 @@ const generateAssign = (scope, decl) => {
|
|
1871
2417
|
|
1872
2418
|
// todo: string concat types
|
1873
2419
|
|
1874
|
-
|
1875
|
-
...number(TYPES.number, Valtype.i32),
|
1876
|
-
[ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx + 1 ],
|
2420
|
+
...setType(scope, name, TYPES.number)
|
1877
2421
|
];
|
1878
2422
|
};
|
1879
2423
|
|
@@ -1919,7 +2463,7 @@ const generateUnary = (scope, decl) => {
|
|
1919
2463
|
return out;
|
1920
2464
|
}
|
1921
2465
|
|
1922
|
-
case 'delete':
|
2466
|
+
case 'delete': {
|
1923
2467
|
let toReturn = true, toGenerate = true;
|
1924
2468
|
|
1925
2469
|
if (decl.argument.type === 'Identifier') {
|
@@ -1941,38 +2485,60 @@ const generateUnary = (scope, decl) => {
|
|
1941
2485
|
|
1942
2486
|
out.push(...number(toReturn ? 1 : 0));
|
1943
2487
|
return out;
|
2488
|
+
}
|
2489
|
+
|
2490
|
+
case 'typeof': {
|
2491
|
+
let overrideType, toGenerate = true;
|
2492
|
+
|
2493
|
+
if (decl.argument.type === 'Identifier') {
|
2494
|
+
const out = generateIdent(scope, decl.argument);
|
2495
|
+
|
2496
|
+
// if ReferenceError (undeclared var), ignore and return undefined
|
2497
|
+
if (out[1]) {
|
2498
|
+
// does not exist (2 ops from throw)
|
2499
|
+
overrideType = number(TYPES.undefined, Valtype.i32);
|
2500
|
+
toGenerate = false;
|
2501
|
+
}
|
2502
|
+
}
|
1944
2503
|
|
1945
|
-
|
1946
|
-
|
2504
|
+
const out = toGenerate ? generate(scope, decl.argument) : [];
|
2505
|
+
disposeLeftover(out);
|
2506
|
+
|
2507
|
+
out.push(...typeSwitch(scope, overrideType ?? getNodeType(scope, decl.argument), {
|
1947
2508
|
[TYPES.number]: makeString(scope, 'number', false, '#typeof_result'),
|
1948
2509
|
[TYPES.boolean]: makeString(scope, 'boolean', false, '#typeof_result'),
|
1949
2510
|
[TYPES.string]: makeString(scope, 'string', false, '#typeof_result'),
|
1950
2511
|
[TYPES.undefined]: makeString(scope, 'undefined', false, '#typeof_result'),
|
1951
2512
|
[TYPES.function]: makeString(scope, 'function', false, '#typeof_result'),
|
1952
2513
|
|
2514
|
+
[TYPES._bytestring]: makeString(scope, 'string', false, '#typeof_result'),
|
2515
|
+
|
1953
2516
|
// object and internal types
|
1954
2517
|
default: makeString(scope, 'object', false, '#typeof_result'),
|
1955
|
-
});
|
2518
|
+
}));
|
2519
|
+
|
2520
|
+
return out;
|
2521
|
+
}
|
1956
2522
|
|
1957
2523
|
default:
|
1958
|
-
return todo(`unary operator ${decl.operator} not implemented yet
|
2524
|
+
return todo(scope, `unary operator ${decl.operator} not implemented yet`, true);
|
1959
2525
|
}
|
1960
2526
|
};
|
1961
2527
|
|
1962
|
-
const generateUpdate = (scope, decl) => {
|
2528
|
+
const generateUpdate = (scope, decl, _global, _name, valueUnused = false) => {
|
1963
2529
|
const { name } = decl.argument;
|
1964
2530
|
|
1965
2531
|
const [ local, isGlobal ] = lookupName(scope, name);
|
1966
2532
|
|
1967
2533
|
if (local === undefined) {
|
1968
|
-
return todo(`update expression with undefined variable
|
2534
|
+
return todo(scope, `update expression with undefined variable`, true);
|
1969
2535
|
}
|
1970
2536
|
|
1971
2537
|
const idx = local.idx;
|
1972
2538
|
const out = [];
|
1973
2539
|
|
1974
2540
|
out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
|
1975
|
-
if (!decl.prefix) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
|
2541
|
+
if (!decl.prefix && !valueUnused) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
|
1976
2542
|
|
1977
2543
|
switch (decl.operator) {
|
1978
2544
|
case '++':
|
@@ -1985,7 +2551,7 @@ const generateUpdate = (scope, decl) => {
|
|
1985
2551
|
}
|
1986
2552
|
|
1987
2553
|
out.push([ isGlobal ? Opcodes.global_set : Opcodes.local_set, idx ]);
|
1988
|
-
if (decl.prefix) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
|
2554
|
+
if (decl.prefix && !valueUnused) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
|
1989
2555
|
|
1990
2556
|
return out;
|
1991
2557
|
};
|
@@ -2025,7 +2591,7 @@ const generateConditional = (scope, decl) => {
|
|
2025
2591
|
// note type
|
2026
2592
|
out.push(
|
2027
2593
|
...getNodeType(scope, decl.consequent),
|
2028
|
-
|
2594
|
+
...setLastType(scope)
|
2029
2595
|
);
|
2030
2596
|
|
2031
2597
|
out.push([ Opcodes.else ]);
|
@@ -2034,7 +2600,7 @@ const generateConditional = (scope, decl) => {
|
|
2034
2600
|
// note type
|
2035
2601
|
out.push(
|
2036
2602
|
...getNodeType(scope, decl.alternate),
|
2037
|
-
|
2603
|
+
...setLastType(scope)
|
2038
2604
|
);
|
2039
2605
|
|
2040
2606
|
out.push([ Opcodes.end ]);
|
@@ -2048,15 +2614,17 @@ const generateFor = (scope, decl) => {
|
|
2048
2614
|
const out = [];
|
2049
2615
|
|
2050
2616
|
if (decl.init) {
|
2051
|
-
out.push(...generate(scope, decl.init));
|
2617
|
+
out.push(...generate(scope, decl.init, false, undefined, true));
|
2052
2618
|
disposeLeftover(out);
|
2053
2619
|
}
|
2054
2620
|
|
2055
2621
|
out.push([ Opcodes.loop, Blocktype.void ]);
|
2056
2622
|
depth.push('for');
|
2057
2623
|
|
2058
|
-
out.push(...generate(scope, decl.test));
|
2059
|
-
|
2624
|
+
if (decl.test) out.push(...generate(scope, decl.test), Opcodes.i32_to);
|
2625
|
+
else out.push(...number(1, Valtype.i32));
|
2626
|
+
|
2627
|
+
out.push([ Opcodes.if, Blocktype.void ]);
|
2060
2628
|
depth.push('if');
|
2061
2629
|
|
2062
2630
|
out.push([ Opcodes.block, Blocktype.void ]);
|
@@ -2064,8 +2632,7 @@ const generateFor = (scope, decl) => {
|
|
2064
2632
|
out.push(...generate(scope, decl.body));
|
2065
2633
|
out.push([ Opcodes.end ]);
|
2066
2634
|
|
2067
|
-
out.push(...generate(scope, decl.update));
|
2068
|
-
depth.pop();
|
2635
|
+
if (decl.update) out.push(...generate(scope, decl.update, false, undefined, true));
|
2069
2636
|
|
2070
2637
|
out.push([ Opcodes.br, 1 ]);
|
2071
2638
|
out.push([ Opcodes.end ], [ Opcodes.end ]);
|
@@ -2093,6 +2660,36 @@ const generateWhile = (scope, decl) => {
|
|
2093
2660
|
return out;
|
2094
2661
|
};
|
2095
2662
|
|
2663
|
+
const generateDoWhile = (scope, decl) => {
|
2664
|
+
const out = [];
|
2665
|
+
|
2666
|
+
out.push([ Opcodes.loop, Blocktype.void ]);
|
2667
|
+
depth.push('dowhile');
|
2668
|
+
|
2669
|
+
// block for break (includes all)
|
2670
|
+
out.push([ Opcodes.block, Blocktype.void ]);
|
2671
|
+
depth.push('block');
|
2672
|
+
|
2673
|
+
// block for continue
|
2674
|
+
// includes body but not test+loop so we can exit body at anytime
|
2675
|
+
// and still test+loop after
|
2676
|
+
out.push([ Opcodes.block, Blocktype.void ]);
|
2677
|
+
depth.push('block');
|
2678
|
+
|
2679
|
+
out.push(...generate(scope, decl.body));
|
2680
|
+
|
2681
|
+
out.push([ Opcodes.end ]);
|
2682
|
+
depth.pop();
|
2683
|
+
|
2684
|
+
out.push(...generate(scope, decl.test), Opcodes.i32_to);
|
2685
|
+
out.push([ Opcodes.br_if, 1 ]);
|
2686
|
+
|
2687
|
+
out.push([ Opcodes.end ], [ Opcodes.end ]);
|
2688
|
+
depth.pop(); depth.pop();
|
2689
|
+
|
2690
|
+
return out;
|
2691
|
+
};
|
2692
|
+
|
2096
2693
|
const generateForOf = (scope, decl) => {
|
2097
2694
|
const out = [];
|
2098
2695
|
|
@@ -2122,8 +2719,17 @@ const generateForOf = (scope, decl) => {
|
|
2122
2719
|
// setup local for left
|
2123
2720
|
generate(scope, decl.left);
|
2124
2721
|
|
2125
|
-
|
2722
|
+
let leftName = decl.left.declarations?.[0]?.id?.name;
|
2723
|
+
if (!leftName && decl.left.name) {
|
2724
|
+
leftName = decl.left.name;
|
2725
|
+
|
2726
|
+
generateVar(scope, { kind: 'var', _bare: true, declarations: [ { id: { name: leftName } } ] })
|
2727
|
+
}
|
2728
|
+
|
2729
|
+
// if (!leftName) console.log(decl.left?.declarations?.[0]?.id ?? decl.left);
|
2730
|
+
|
2126
2731
|
const [ local, isGlobal ] = lookupName(scope, leftName);
|
2732
|
+
if (!local) return todo(scope, 'for of failed to get left local (probably destructure)');
|
2127
2733
|
|
2128
2734
|
depth.push('block');
|
2129
2735
|
depth.push('block');
|
@@ -2131,13 +2737,15 @@ const generateForOf = (scope, decl) => {
|
|
2131
2737
|
// // todo: we should only do this for strings but we don't know at compile-time :(
|
2132
2738
|
// hack: this is naughty and will break things!
|
2133
2739
|
let newOut = number(0, Valtype.f64), newPointer = -1;
|
2134
|
-
if (pages.
|
2740
|
+
if (pages.hasAnyString) {
|
2741
|
+
// todo: we use i16 even for bytestrings which should not make a bad thing happen, just be confusing for debugging?
|
2135
2742
|
0, [ newOut, newPointer ] = makeArray(scope, {
|
2136
2743
|
rawElements: new Array(1)
|
2137
2744
|
}, isGlobal, leftName, true, 'i16');
|
2138
2745
|
}
|
2139
2746
|
|
2140
2747
|
// set type for local
|
2748
|
+
// todo: optimize away counter and use end pointer
|
2141
2749
|
out.push(...typeSwitch(scope, getNodeType(scope, decl.right), {
|
2142
2750
|
[TYPES._array]: [
|
2143
2751
|
...setType(scope, leftName, TYPES.number),
|
@@ -2222,6 +2830,56 @@ const generateForOf = (scope, decl) => {
|
|
2222
2830
|
[ Opcodes.end ],
|
2223
2831
|
[ Opcodes.end ]
|
2224
2832
|
],
|
2833
|
+
[TYPES._bytestring]: [
|
2834
|
+
...setType(scope, leftName, TYPES._bytestring),
|
2835
|
+
|
2836
|
+
[ Opcodes.loop, Blocktype.void ],
|
2837
|
+
|
2838
|
+
// setup new/out array
|
2839
|
+
...newOut,
|
2840
|
+
[ Opcodes.drop ],
|
2841
|
+
|
2842
|
+
...number(0, Valtype.i32), // base 0 for store after
|
2843
|
+
|
2844
|
+
// load current string ind {arg}
|
2845
|
+
[ Opcodes.local_get, pointer ],
|
2846
|
+
[ Opcodes.local_get, counter ],
|
2847
|
+
[ Opcodes.i32_add ],
|
2848
|
+
[ Opcodes.i32_load8_u, 0, ...unsignedLEB128(ValtypeSize.i32) ],
|
2849
|
+
|
2850
|
+
// store to new string ind 0
|
2851
|
+
[ Opcodes.i32_store8, 0, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
|
2852
|
+
|
2853
|
+
// return new string (page)
|
2854
|
+
...number(newPointer),
|
2855
|
+
|
2856
|
+
[ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx ],
|
2857
|
+
|
2858
|
+
[ Opcodes.block, Blocktype.void ],
|
2859
|
+
[ Opcodes.block, Blocktype.void ],
|
2860
|
+
...generate(scope, decl.body),
|
2861
|
+
[ Opcodes.end ],
|
2862
|
+
|
2863
|
+
// increment iter pointer
|
2864
|
+
// [ Opcodes.local_get, pointer ],
|
2865
|
+
// ...number(1, Valtype.i32),
|
2866
|
+
// [ Opcodes.i32_add ],
|
2867
|
+
// [ Opcodes.local_set, pointer ],
|
2868
|
+
|
2869
|
+
// increment counter by 1
|
2870
|
+
[ Opcodes.local_get, counter ],
|
2871
|
+
...number(1, Valtype.i32),
|
2872
|
+
[ Opcodes.i32_add ],
|
2873
|
+
[ Opcodes.local_tee, counter ],
|
2874
|
+
|
2875
|
+
// loop if counter != length
|
2876
|
+
[ Opcodes.local_get, length ],
|
2877
|
+
[ Opcodes.i32_ne ],
|
2878
|
+
[ Opcodes.br_if, 1 ],
|
2879
|
+
|
2880
|
+
[ Opcodes.end ],
|
2881
|
+
[ Opcodes.end ]
|
2882
|
+
],
|
2225
2883
|
default: internalThrow(scope, 'TypeError', `Tried for..of on non-iterable type`)
|
2226
2884
|
}, Blocktype.void));
|
2227
2885
|
|
@@ -2232,28 +2890,65 @@ const generateForOf = (scope, decl) => {
|
|
2232
2890
|
return out;
|
2233
2891
|
};
|
2234
2892
|
|
2893
|
+
// find the nearest loop in depth map by type
|
2235
2894
|
const getNearestLoop = () => {
|
2236
2895
|
for (let i = depth.length - 1; i >= 0; i--) {
|
2237
|
-
if (
|
2896
|
+
if (['while', 'dowhile', 'for', 'forof'].includes(depth[i])) return i;
|
2238
2897
|
}
|
2239
2898
|
|
2240
2899
|
return -1;
|
2241
2900
|
};
|
2242
2901
|
|
2243
2902
|
const generateBreak = (scope, decl) => {
|
2244
|
-
const
|
2903
|
+
const target = decl.label ? scope.labels.get(decl.label.name) : getNearestLoop();
|
2904
|
+
const type = depth[target];
|
2905
|
+
|
2906
|
+
// different loop types have different branch offsets
|
2907
|
+
// as they have different wasm block/loop/if structures
|
2908
|
+
// we need to use the right offset by type to branch to the one we want
|
2909
|
+
// for a break: exit the loop without executing anything else inside it
|
2910
|
+
const offset = ({
|
2911
|
+
for: 2, // loop > if (wanted branch) > block (we are here)
|
2912
|
+
while: 2, // loop > if (wanted branch) (we are here)
|
2913
|
+
dowhile: 2, // loop > block (wanted branch) > block (we are here)
|
2914
|
+
forof: 2, // loop > block (wanted branch) > block (we are here)
|
2915
|
+
if: 1 // break inside if, branch 0 to skip the rest of the if
|
2916
|
+
})[type];
|
2917
|
+
|
2245
2918
|
return [
|
2246
|
-
[ Opcodes.br, ...signedLEB128(
|
2919
|
+
[ Opcodes.br, ...signedLEB128(depth.length - target - offset) ]
|
2247
2920
|
];
|
2248
2921
|
};
|
2249
2922
|
|
2250
2923
|
const generateContinue = (scope, decl) => {
|
2251
|
-
const
|
2924
|
+
const target = decl.label ? scope.labels.get(decl.label.name) : getNearestLoop();
|
2925
|
+
const type = depth[target];
|
2926
|
+
|
2927
|
+
// different loop types have different branch offsets
|
2928
|
+
// as they have different wasm block/loop/if structures
|
2929
|
+
// we need to use the right offset by type to branch to the one we want
|
2930
|
+
// for a continue: do test for the loop, and then loop depending on that success
|
2931
|
+
const offset = ({
|
2932
|
+
for: 3, // loop (wanted branch) > if > block (we are here)
|
2933
|
+
while: 1, // loop (wanted branch) > if (we are here)
|
2934
|
+
dowhile: 3, // loop > block > block (wanted branch) (we are here)
|
2935
|
+
forof: 3 // loop > block > block (wanted branch) (we are here)
|
2936
|
+
})[type];
|
2937
|
+
|
2252
2938
|
return [
|
2253
|
-
[ Opcodes.br, ...signedLEB128(
|
2939
|
+
[ Opcodes.br, ...signedLEB128(depth.length - target - offset) ]
|
2254
2940
|
];
|
2255
2941
|
};
|
2256
2942
|
|
2943
|
+
const generateLabel = (scope, decl) => {
|
2944
|
+
scope.labels ??= new Map();
|
2945
|
+
|
2946
|
+
const name = decl.label.name;
|
2947
|
+
scope.labels.set(name, depth.length);
|
2948
|
+
|
2949
|
+
return generate(scope, decl.body);
|
2950
|
+
};
|
2951
|
+
|
2257
2952
|
const generateThrow = (scope, decl) => {
|
2258
2953
|
scope.throws = true;
|
2259
2954
|
|
@@ -2262,7 +2957,7 @@ const generateThrow = (scope, decl) => {
|
|
2262
2957
|
// hack: throw new X("...") -> throw "..."
|
2263
2958
|
if (!message && (decl.argument.type === 'NewExpression' || decl.argument.type === 'CallExpression')) {
|
2264
2959
|
constructor = decl.argument.callee.name;
|
2265
|
-
message = decl.argument.arguments[0]
|
2960
|
+
message = decl.argument.arguments[0]?.value ?? '';
|
2266
2961
|
}
|
2267
2962
|
|
2268
2963
|
if (tags.length === 0) tags.push({
|
@@ -2274,6 +2969,9 @@ const generateThrow = (scope, decl) => {
|
|
2274
2969
|
let exceptId = exceptions.push({ constructor, message }) - 1;
|
2275
2970
|
let tagIdx = tags[0].idx;
|
2276
2971
|
|
2972
|
+
scope.exceptions ??= [];
|
2973
|
+
scope.exceptions.push(exceptId);
|
2974
|
+
|
2277
2975
|
// todo: write a description of how this works lol
|
2278
2976
|
|
2279
2977
|
return [
|
@@ -2283,7 +2981,7 @@ const generateThrow = (scope, decl) => {
|
|
2283
2981
|
};
|
2284
2982
|
|
2285
2983
|
const generateTry = (scope, decl) => {
|
2286
|
-
if (decl.finalizer) return todo('try finally not implemented yet');
|
2984
|
+
if (decl.finalizer) return todo(scope, 'try finally not implemented yet');
|
2287
2985
|
|
2288
2986
|
const out = [];
|
2289
2987
|
|
@@ -2314,29 +3012,35 @@ const generateAssignPat = (scope, decl) => {
|
|
2314
3012
|
// TODO
|
2315
3013
|
// if identifier declared, use that
|
2316
3014
|
// else, use default (right)
|
2317
|
-
return todo('assignment pattern (optional arg)');
|
3015
|
+
return todo(scope, 'assignment pattern (optional arg)');
|
2318
3016
|
};
|
2319
3017
|
|
2320
3018
|
let pages = new Map();
|
2321
|
-
const allocPage = (reason, type) => {
|
3019
|
+
const allocPage = (scope, reason, type) => {
|
2322
3020
|
if (pages.has(reason)) return pages.get(reason).ind;
|
2323
3021
|
|
2324
3022
|
if (reason.startsWith('array:')) pages.hasArray = true;
|
2325
3023
|
if (reason.startsWith('string:')) pages.hasString = true;
|
3024
|
+
if (reason.startsWith('bytestring:')) pages.hasByteString = true;
|
3025
|
+
if (reason.includes('string:')) pages.hasAnyString = true;
|
2326
3026
|
|
2327
3027
|
const ind = pages.size;
|
2328
3028
|
pages.set(reason, { ind, type });
|
2329
3029
|
|
2330
|
-
|
3030
|
+
scope.pages ??= new Map();
|
3031
|
+
scope.pages.set(reason, { ind, type });
|
3032
|
+
|
3033
|
+
if (Prefs.allocLog) log('alloc', `allocated new page of memory (${ind}) | ${reason} (type: ${type})`);
|
2331
3034
|
|
2332
3035
|
return ind;
|
2333
3036
|
};
|
2334
3037
|
|
3038
|
+
// todo: add scope.pages
|
2335
3039
|
const freePage = reason => {
|
2336
3040
|
const { ind } = pages.get(reason);
|
2337
3041
|
pages.delete(reason);
|
2338
3042
|
|
2339
|
-
if (allocLog) log('alloc', `freed page of memory (${ind}) | ${reason}`);
|
3043
|
+
if (Prefs.allocLog) log('alloc', `freed page of memory (${ind}) | ${reason}`);
|
2340
3044
|
|
2341
3045
|
return ind;
|
2342
3046
|
};
|
@@ -2356,38 +3060,51 @@ const StoreOps = {
|
|
2356
3060
|
f64: Opcodes.f64_store,
|
2357
3061
|
|
2358
3062
|
// expects i32 input!
|
2359
|
-
|
3063
|
+
i8: Opcodes.i32_store8,
|
3064
|
+
i16: Opcodes.i32_store16,
|
2360
3065
|
};
|
2361
3066
|
|
2362
3067
|
let data = [];
|
2363
3068
|
|
2364
|
-
const compileBytes = (val, itemType
|
3069
|
+
const compileBytes = (val, itemType) => {
|
2365
3070
|
// todo: this is a mess and needs confirming / ????
|
2366
3071
|
switch (itemType) {
|
2367
3072
|
case 'i8': return [ val % 256 ];
|
2368
|
-
case 'i16': return [ val % 256,
|
2369
|
-
|
2370
|
-
case 'i32':
|
2371
|
-
|
2372
|
-
return enforceFourBytes(signedLEB128(val));
|
3073
|
+
case 'i16': return [ val % 256, (val / 256 | 0) % 256 ];
|
3074
|
+
case 'i16': return [ val % 256, (val / 256 | 0) % 256 ];
|
3075
|
+
case 'i32': return [...new Uint8Array(new Int32Array([ val ]).buffer)];
|
3076
|
+
// todo: i64
|
2373
3077
|
|
2374
3078
|
case 'f64': return ieee754_binary64(val);
|
2375
3079
|
}
|
2376
3080
|
};
|
2377
3081
|
|
3082
|
+
const getAllocType = itemType => {
|
3083
|
+
switch (itemType) {
|
3084
|
+
case 'i8': return 'bytestring';
|
3085
|
+
case 'i16': return 'string';
|
3086
|
+
|
3087
|
+
default: return 'array';
|
3088
|
+
}
|
3089
|
+
};
|
3090
|
+
|
2378
3091
|
const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty = false, itemType = valtype) => {
|
2379
3092
|
const out = [];
|
2380
3093
|
|
3094
|
+
scope.arrays ??= new Map();
|
3095
|
+
|
2381
3096
|
let firstAssign = false;
|
2382
|
-
if (!arrays.has(name) || name === '$undeclared') {
|
3097
|
+
if (!scope.arrays.has(name) || name === '$undeclared') {
|
2383
3098
|
firstAssign = true;
|
2384
3099
|
|
2385
3100
|
// todo: can we just have 1 undeclared array? probably not? but this is not really memory efficient
|
2386
3101
|
const uniqueName = name === '$undeclared' ? name + Math.random().toString().slice(2) : name;
|
2387
|
-
|
3102
|
+
|
3103
|
+
if (Prefs.scopedPageNames) scope.arrays.set(name, allocPage(scope, `${scope.name} | ${getAllocType(itemType)}: ${uniqueName}`, itemType) * pageSize);
|
3104
|
+
else scope.arrays.set(name, allocPage(scope, `${getAllocType(itemType)}: ${uniqueName}`, itemType) * pageSize);
|
2388
3105
|
}
|
2389
3106
|
|
2390
|
-
const pointer = arrays.get(name);
|
3107
|
+
const pointer = scope.arrays.get(name);
|
2391
3108
|
|
2392
3109
|
const useRawElements = !!decl.rawElements;
|
2393
3110
|
const elements = useRawElements ? decl.rawElements : decl.elements;
|
@@ -2395,19 +3112,25 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
|
|
2395
3112
|
const valtype = itemTypeToValtype[itemType];
|
2396
3113
|
const length = elements.length;
|
2397
3114
|
|
2398
|
-
if (firstAssign && useRawElements) {
|
2399
|
-
|
3115
|
+
if (firstAssign && useRawElements && !Prefs.noData) {
|
3116
|
+
// if length is 0 memory/data will just be 0000... anyway
|
3117
|
+
if (length !== 0) {
|
3118
|
+
let bytes = compileBytes(length, 'i32');
|
2400
3119
|
|
2401
|
-
|
2402
|
-
|
3120
|
+
if (!initEmpty) for (let i = 0; i < length; i++) {
|
3121
|
+
if (elements[i] == null) continue;
|
2403
3122
|
|
2404
|
-
|
2405
|
-
|
3123
|
+
bytes.push(...compileBytes(elements[i], itemType));
|
3124
|
+
}
|
2406
3125
|
|
2407
|
-
|
2408
|
-
|
2409
|
-
|
2410
|
-
|
3126
|
+
const ind = data.push({
|
3127
|
+
offset: pointer,
|
3128
|
+
bytes
|
3129
|
+
}) - 1;
|
3130
|
+
|
3131
|
+
scope.data ??= [];
|
3132
|
+
scope.data.push(ind);
|
3133
|
+
}
|
2411
3134
|
|
2412
3135
|
// local value as pointer
|
2413
3136
|
out.push(...number(pointer));
|
@@ -2430,7 +3153,7 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
|
|
2430
3153
|
out.push(
|
2431
3154
|
...number(0, Valtype.i32),
|
2432
3155
|
...(useRawElements ? number(elements[i], Valtype[valtype]) : generate(scope, elements[i])),
|
2433
|
-
[ storeOp, Math.log2(ValtypeSize[itemType]) - 1, ...unsignedLEB128(pointer + ValtypeSize.i32 + i * ValtypeSize[itemType]) ]
|
3156
|
+
[ storeOp, (Math.log2(ValtypeSize[itemType]) || 1) - 1, ...unsignedLEB128(pointer + ValtypeSize.i32 + i * ValtypeSize[itemType]) ]
|
2434
3157
|
);
|
2435
3158
|
}
|
2436
3159
|
|
@@ -2440,31 +3163,56 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
|
|
2440
3163
|
return [ out, pointer ];
|
2441
3164
|
};
|
2442
3165
|
|
2443
|
-
const
|
3166
|
+
const byteStringable = str => {
|
3167
|
+
if (!Prefs.bytestring) return false;
|
3168
|
+
|
3169
|
+
for (let i = 0; i < str.length; i++) {
|
3170
|
+
if (str.charCodeAt(i) > 0xFF) return false;
|
3171
|
+
}
|
3172
|
+
|
3173
|
+
return true;
|
3174
|
+
};
|
3175
|
+
|
3176
|
+
const makeString = (scope, str, global = false, name = '$undeclared', forceBytestring = undefined) => {
|
2444
3177
|
const rawElements = new Array(str.length);
|
3178
|
+
let byteStringable = Prefs.bytestring;
|
2445
3179
|
for (let i = 0; i < str.length; i++) {
|
2446
|
-
|
3180
|
+
const c = str.charCodeAt(i);
|
3181
|
+
rawElements[i] = c;
|
3182
|
+
|
3183
|
+
if (byteStringable && c > 0xFF) byteStringable = false;
|
2447
3184
|
}
|
2448
3185
|
|
3186
|
+
if (byteStringable && forceBytestring === false) byteStringable = false;
|
3187
|
+
|
2449
3188
|
return makeArray(scope, {
|
2450
3189
|
rawElements
|
2451
|
-
}, global, name, false, 'i16')[0];
|
3190
|
+
}, global, name, false, byteStringable ? 'i8' : 'i16')[0];
|
2452
3191
|
};
|
2453
3192
|
|
2454
|
-
let arrays = new Map();
|
2455
3193
|
const generateArray = (scope, decl, global = false, name = '$undeclared', initEmpty = false) => {
|
2456
3194
|
return makeArray(scope, decl, global, name, initEmpty, valtype)[0];
|
2457
3195
|
};
|
2458
3196
|
|
2459
3197
|
export const generateMember = (scope, decl, _global, _name) => {
|
2460
3198
|
const name = decl.object.name;
|
2461
|
-
const pointer = arrays
|
3199
|
+
const pointer = scope.arrays?.get(name);
|
2462
3200
|
|
2463
|
-
const aotPointer = pointer != null;
|
3201
|
+
const aotPointer = Prefs.aotPointerOpt && pointer != null;
|
2464
3202
|
|
2465
3203
|
// hack: .length
|
2466
3204
|
if (decl.property.name === 'length') {
|
2467
|
-
|
3205
|
+
const func = funcs.find(x => x.name === name);
|
3206
|
+
if (func) {
|
3207
|
+
const userFunc = funcIndex[name] && !importedFuncs[name] && !builtinFuncs[name] && !internalConstrs[name];
|
3208
|
+
const typedParams = userFunc || builtinFuncs[name]?.typedParams;
|
3209
|
+
return number(typedParams ? func.params.length / 2 : func.params.length);
|
3210
|
+
}
|
3211
|
+
|
3212
|
+
if (builtinFuncs[name]) return number(builtinFuncs[name].typedParams ? (builtinFuncs[name].params.length / 2) : builtinFuncs[name].params.length);
|
3213
|
+
if (importedFuncs[name]) return number(importedFuncs[name].params);
|
3214
|
+
if (internalConstrs[name]) return number(internalConstrs[name].length ?? 0);
|
3215
|
+
|
2468
3216
|
return [
|
2469
3217
|
...(aotPointer ? number(0, Valtype.i32) : [
|
2470
3218
|
...generate(scope, decl.object),
|
@@ -2476,10 +3224,13 @@ export const generateMember = (scope, decl, _global, _name) => {
|
|
2476
3224
|
];
|
2477
3225
|
}
|
2478
3226
|
|
3227
|
+
const object = generate(scope, decl.object);
|
3228
|
+
const property = generate(scope, decl.property);
|
3229
|
+
|
2479
3230
|
// // todo: we should only do this for strings but we don't know at compile-time :(
|
2480
3231
|
// hack: this is naughty and will break things!
|
2481
|
-
let newOut = number(0,
|
2482
|
-
if (pages.
|
3232
|
+
let newOut = number(0, valtypeBinary), newPointer = -1;
|
3233
|
+
if (pages.hasAnyString) {
|
2483
3234
|
0, [ newOut, newPointer ] = makeArray(scope, {
|
2484
3235
|
rawElements: new Array(1)
|
2485
3236
|
}, _global, _name, true, 'i16');
|
@@ -2488,7 +3239,7 @@ export const generateMember = (scope, decl, _global, _name) => {
|
|
2488
3239
|
return typeSwitch(scope, getNodeType(scope, decl.object), {
|
2489
3240
|
[TYPES._array]: [
|
2490
3241
|
// get index as valtype
|
2491
|
-
...
|
3242
|
+
...property,
|
2492
3243
|
|
2493
3244
|
// convert to i32 and turn into byte offset by * valtypeSize (4 for i32, 8 for i64/f64)
|
2494
3245
|
Opcodes.i32_to_u,
|
@@ -2496,7 +3247,7 @@ export const generateMember = (scope, decl, _global, _name) => {
|
|
2496
3247
|
[ Opcodes.i32_mul ],
|
2497
3248
|
|
2498
3249
|
...(aotPointer ? [] : [
|
2499
|
-
...
|
3250
|
+
...object,
|
2500
3251
|
Opcodes.i32_to_u,
|
2501
3252
|
[ Opcodes.i32_add ]
|
2502
3253
|
]),
|
@@ -2505,7 +3256,7 @@ export const generateMember = (scope, decl, _global, _name) => {
|
|
2505
3256
|
[ Opcodes.load, Math.log2(ValtypeSize[valtype]) - 1, ...unsignedLEB128((aotPointer ? pointer : 0) + ValtypeSize.i32) ],
|
2506
3257
|
|
2507
3258
|
...number(TYPES.number, Valtype.i32),
|
2508
|
-
|
3259
|
+
...setLastType(scope)
|
2509
3260
|
],
|
2510
3261
|
|
2511
3262
|
[TYPES.string]: [
|
@@ -2515,14 +3266,14 @@ export const generateMember = (scope, decl, _global, _name) => {
|
|
2515
3266
|
|
2516
3267
|
...number(0, Valtype.i32), // base 0 for store later
|
2517
3268
|
|
2518
|
-
...
|
2519
|
-
|
3269
|
+
...property,
|
2520
3270
|
Opcodes.i32_to_u,
|
3271
|
+
|
2521
3272
|
...number(ValtypeSize.i16, Valtype.i32),
|
2522
3273
|
[ Opcodes.i32_mul ],
|
2523
3274
|
|
2524
3275
|
...(aotPointer ? [] : [
|
2525
|
-
...
|
3276
|
+
...object,
|
2526
3277
|
Opcodes.i32_to_u,
|
2527
3278
|
[ Opcodes.i32_add ]
|
2528
3279
|
]),
|
@@ -2537,10 +3288,38 @@ export const generateMember = (scope, decl, _global, _name) => {
|
|
2537
3288
|
...number(newPointer),
|
2538
3289
|
|
2539
3290
|
...number(TYPES.string, Valtype.i32),
|
2540
|
-
|
3291
|
+
...setLastType(scope)
|
3292
|
+
],
|
3293
|
+
[TYPES._bytestring]: [
|
3294
|
+
// setup new/out array
|
3295
|
+
...newOut,
|
3296
|
+
[ Opcodes.drop ],
|
3297
|
+
|
3298
|
+
...number(0, Valtype.i32), // base 0 for store later
|
3299
|
+
|
3300
|
+
...property,
|
3301
|
+
Opcodes.i32_to_u,
|
3302
|
+
|
3303
|
+
...(aotPointer ? [] : [
|
3304
|
+
...object,
|
3305
|
+
Opcodes.i32_to_u,
|
3306
|
+
[ Opcodes.i32_add ]
|
3307
|
+
]),
|
3308
|
+
|
3309
|
+
// load current string ind {arg}
|
3310
|
+
[ Opcodes.i32_load8_u, 0, ...unsignedLEB128((aotPointer ? pointer : 0) + ValtypeSize.i32) ],
|
3311
|
+
|
3312
|
+
// store to new string ind 0
|
3313
|
+
[ Opcodes.i32_store8, 0, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
|
3314
|
+
|
3315
|
+
// return new string (page)
|
3316
|
+
...number(newPointer),
|
3317
|
+
|
3318
|
+
...number(TYPES._bytestring, Valtype.i32),
|
3319
|
+
...setLastType(scope)
|
2541
3320
|
],
|
2542
3321
|
|
2543
|
-
default:
|
3322
|
+
default: internalThrow(scope, 'TypeError', 'Member expression is not supported for non-string non-array yet', true)
|
2544
3323
|
});
|
2545
3324
|
};
|
2546
3325
|
|
@@ -2550,25 +3329,36 @@ const objectHack = node => {
|
|
2550
3329
|
if (!node) return node;
|
2551
3330
|
|
2552
3331
|
if (node.type === 'MemberExpression') {
|
2553
|
-
|
3332
|
+
const out = (() => {
|
3333
|
+
if (node.computed || node.optional) return;
|
2554
3334
|
|
2555
|
-
|
3335
|
+
let objectName = node.object.name;
|
2556
3336
|
|
2557
|
-
|
2558
|
-
|
3337
|
+
// if object is not identifier or another member exp, give up
|
3338
|
+
if (node.object.type !== 'Identifier' && node.object.type !== 'MemberExpression') return;
|
3339
|
+
if (objectName && ['undefined', 'null', 'NaN', 'Infinity'].includes(objectName)) return;
|
2559
3340
|
|
2560
|
-
|
3341
|
+
if (!objectName) objectName = objectHack(node.object)?.name?.slice?.(2);
|
2561
3342
|
|
2562
|
-
|
2563
|
-
|
3343
|
+
// if .length, give up (hack within a hack!)
|
3344
|
+
if (node.property.name === 'length') {
|
3345
|
+
node.object = objectHack(node.object);
|
3346
|
+
return;
|
3347
|
+
}
|
2564
3348
|
|
2565
|
-
|
2566
|
-
|
3349
|
+
// no object name, give up
|
3350
|
+
if (!objectName) return;
|
2567
3351
|
|
2568
|
-
|
2569
|
-
|
2570
|
-
|
2571
|
-
|
3352
|
+
const name = '__' + objectName + '_' + node.property.name;
|
3353
|
+
if (Prefs.codeLog) log('codegen', `object hack! ${node.object.name}.${node.property.name} -> ${name}`);
|
3354
|
+
|
3355
|
+
return {
|
3356
|
+
type: 'Identifier',
|
3357
|
+
name
|
3358
|
+
};
|
3359
|
+
})();
|
3360
|
+
|
3361
|
+
if (out) return out;
|
2572
3362
|
}
|
2573
3363
|
|
2574
3364
|
for (const x in node) {
|
@@ -2582,11 +3372,11 @@ const objectHack = node => {
|
|
2582
3372
|
};
|
2583
3373
|
|
2584
3374
|
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');
|
3375
|
+
if (decl.async) return todo(scope, 'async functions are not supported');
|
3376
|
+
if (decl.generator) return todo(scope, 'generator functions are not supported');
|
2587
3377
|
|
2588
3378
|
const name = decl.id ? decl.id.name : `anonymous_${randId()}`;
|
2589
|
-
const params = decl.params
|
3379
|
+
const params = decl.params ?? [];
|
2590
3380
|
|
2591
3381
|
// const innerScope = { ...scope };
|
2592
3382
|
// TODO: share scope/locals between !!!
|
@@ -2599,8 +3389,17 @@ const generateFunc = (scope, decl) => {
|
|
2599
3389
|
name
|
2600
3390
|
};
|
2601
3391
|
|
3392
|
+
if (typedInput && decl.returnType) {
|
3393
|
+
innerScope.returnType = extractTypeAnnotation(decl.returnType).type;
|
3394
|
+
innerScope.returns = [ valtypeBinary ];
|
3395
|
+
}
|
3396
|
+
|
2602
3397
|
for (let i = 0; i < params.length; i++) {
|
2603
|
-
allocVar(innerScope, params[i], false);
|
3398
|
+
allocVar(innerScope, params[i].name, false);
|
3399
|
+
|
3400
|
+
if (typedInput && params[i].typeAnnotation) {
|
3401
|
+
addVarMetadata(innerScope, params[i].name, false, extractTypeAnnotation(params[i]));
|
3402
|
+
}
|
2604
3403
|
}
|
2605
3404
|
|
2606
3405
|
let body = objectHack(decl.body);
|
@@ -2616,13 +3415,13 @@ const generateFunc = (scope, decl) => {
|
|
2616
3415
|
const func = {
|
2617
3416
|
name,
|
2618
3417
|
params: Object.values(innerScope.locals).slice(0, params.length * 2).map(x => x.type),
|
2619
|
-
|
2620
|
-
|
2621
|
-
throws: innerScope.throws,
|
2622
|
-
index: currentFuncIndex++
|
3418
|
+
index: currentFuncIndex++,
|
3419
|
+
...innerScope
|
2623
3420
|
};
|
2624
3421
|
funcIndex[name] = func.index;
|
2625
3422
|
|
3423
|
+
if (name === 'main') func.gotLastType = true;
|
3424
|
+
|
2626
3425
|
// quick hack fixes
|
2627
3426
|
for (const inst of wasm) {
|
2628
3427
|
if (inst[0] === Opcodes.call && inst[1] === -1) {
|
@@ -2639,117 +3438,6 @@ const generateFunc = (scope, decl) => {
|
|
2639
3438
|
);
|
2640
3439
|
}
|
2641
3440
|
|
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
3441
|
func.wasm = wasm;
|
2754
3442
|
|
2755
3443
|
funcs.push(func);
|
@@ -2785,7 +3473,7 @@ const internalConstrs = {
|
|
2785
3473
|
|
2786
3474
|
// todo: check in wasm instead of here
|
2787
3475
|
const literalValue = arg.value ?? 0;
|
2788
|
-
if (literalValue < 0 || !Number.isFinite(literalValue) || literalValue > 4294967295) return internalThrow(scope, 'RangeThrow', 'Invalid array length');
|
3476
|
+
if (literalValue < 0 || !Number.isFinite(literalValue) || literalValue > 4294967295) return internalThrow(scope, 'RangeThrow', 'Invalid array length', true);
|
2789
3477
|
|
2790
3478
|
return [
|
2791
3479
|
...number(0, Valtype.i32),
|
@@ -2796,7 +3484,8 @@ const internalConstrs = {
|
|
2796
3484
|
...number(pointer)
|
2797
3485
|
];
|
2798
3486
|
},
|
2799
|
-
type: TYPES._array
|
3487
|
+
type: TYPES._array,
|
3488
|
+
length: 1
|
2800
3489
|
},
|
2801
3490
|
|
2802
3491
|
__Array_of: {
|
@@ -2808,7 +3497,131 @@ const internalConstrs = {
|
|
2808
3497
|
}, global, name);
|
2809
3498
|
},
|
2810
3499
|
type: TYPES._array,
|
3500
|
+
notConstr: true,
|
3501
|
+
length: 0
|
3502
|
+
},
|
3503
|
+
|
3504
|
+
__Porffor_fastOr: {
|
3505
|
+
generate: (scope, decl) => {
|
3506
|
+
const out = [];
|
3507
|
+
|
3508
|
+
for (let i = 0; i < decl.arguments.length; i++) {
|
3509
|
+
out.push(
|
3510
|
+
...generate(scope, decl.arguments[i]),
|
3511
|
+
Opcodes.i32_to_u,
|
3512
|
+
...(i > 0 ? [ [ Opcodes.i32_or ] ] : [])
|
3513
|
+
);
|
3514
|
+
}
|
3515
|
+
|
3516
|
+
out.push(Opcodes.i32_from_u);
|
3517
|
+
|
3518
|
+
return out;
|
3519
|
+
},
|
3520
|
+
type: TYPES.boolean,
|
3521
|
+
notConstr: true
|
3522
|
+
},
|
3523
|
+
|
3524
|
+
__Porffor_fastAnd: {
|
3525
|
+
generate: (scope, decl) => {
|
3526
|
+
const out = [];
|
3527
|
+
|
3528
|
+
for (let i = 0; i < decl.arguments.length; i++) {
|
3529
|
+
out.push(
|
3530
|
+
...generate(scope, decl.arguments[i]),
|
3531
|
+
Opcodes.i32_to_u,
|
3532
|
+
...(i > 0 ? [ [ Opcodes.i32_and ] ] : [])
|
3533
|
+
);
|
3534
|
+
}
|
3535
|
+
|
3536
|
+
out.push(Opcodes.i32_from_u);
|
3537
|
+
|
3538
|
+
return out;
|
3539
|
+
},
|
3540
|
+
type: TYPES.boolean,
|
2811
3541
|
notConstr: true
|
3542
|
+
},
|
3543
|
+
|
3544
|
+
Boolean: {
|
3545
|
+
generate: (scope, decl) => {
|
3546
|
+
// todo: boolean object when used as constructor
|
3547
|
+
const arg = decl.arguments[0] ?? DEFAULT_VALUE;
|
3548
|
+
return truthy(scope, generate(scope, arg), getNodeType(scope, arg));
|
3549
|
+
},
|
3550
|
+
type: TYPES.boolean,
|
3551
|
+
length: 1
|
3552
|
+
},
|
3553
|
+
|
3554
|
+
__Math_max: {
|
3555
|
+
generate: (scope, decl) => {
|
3556
|
+
const out = [
|
3557
|
+
...number(-Infinity)
|
3558
|
+
];
|
3559
|
+
|
3560
|
+
for (let i = 0; i < decl.arguments.length; i++) {
|
3561
|
+
out.push(
|
3562
|
+
...generate(scope, decl.arguments[i]),
|
3563
|
+
[ Opcodes.f64_max ]
|
3564
|
+
);
|
3565
|
+
}
|
3566
|
+
|
3567
|
+
return out;
|
3568
|
+
},
|
3569
|
+
type: TYPES.number,
|
3570
|
+
notConstr: true,
|
3571
|
+
length: 2
|
3572
|
+
},
|
3573
|
+
|
3574
|
+
__Math_min: {
|
3575
|
+
generate: (scope, decl) => {
|
3576
|
+
const out = [
|
3577
|
+
...number(Infinity)
|
3578
|
+
];
|
3579
|
+
|
3580
|
+
for (let i = 0; i < decl.arguments.length; i++) {
|
3581
|
+
out.push(
|
3582
|
+
...generate(scope, decl.arguments[i]),
|
3583
|
+
[ Opcodes.f64_min ]
|
3584
|
+
);
|
3585
|
+
}
|
3586
|
+
|
3587
|
+
return out;
|
3588
|
+
},
|
3589
|
+
type: TYPES.number,
|
3590
|
+
notConstr: true,
|
3591
|
+
length: 2
|
3592
|
+
},
|
3593
|
+
|
3594
|
+
__console_log: {
|
3595
|
+
generate: (scope, decl) => {
|
3596
|
+
const out = [];
|
3597
|
+
|
3598
|
+
for (let i = 0; i < decl.arguments.length; i++) {
|
3599
|
+
out.push(
|
3600
|
+
...generateCall(scope, {
|
3601
|
+
callee: {
|
3602
|
+
type: 'Identifier',
|
3603
|
+
name: '__Porffor_print'
|
3604
|
+
},
|
3605
|
+
arguments: [ decl.arguments[i] ]
|
3606
|
+
}),
|
3607
|
+
|
3608
|
+
// print space
|
3609
|
+
...number(32),
|
3610
|
+
[ Opcodes.call, importedFuncs.printChar ]
|
3611
|
+
);
|
3612
|
+
}
|
3613
|
+
|
3614
|
+
// print newline
|
3615
|
+
out.push(
|
3616
|
+
...number(10),
|
3617
|
+
[ Opcodes.call, importedFuncs.printChar ]
|
3618
|
+
);
|
3619
|
+
|
3620
|
+
return out;
|
3621
|
+
},
|
3622
|
+
type: TYPES.undefined,
|
3623
|
+
notConstr: true,
|
3624
|
+
length: 0
|
2812
3625
|
}
|
2813
3626
|
};
|
2814
3627
|
|
@@ -2837,20 +3650,23 @@ export default program => {
|
|
2837
3650
|
funcs = [];
|
2838
3651
|
funcIndex = {};
|
2839
3652
|
depth = [];
|
2840
|
-
arrays = new Map();
|
2841
3653
|
pages = new Map();
|
2842
3654
|
data = [];
|
2843
3655
|
currentFuncIndex = importedFuncs.length;
|
2844
3656
|
|
2845
3657
|
globalThis.valtype = 'f64';
|
2846
3658
|
|
2847
|
-
const valtypeOpt = process.argv.find(x => x.startsWith('
|
3659
|
+
const valtypeOpt = process.argv.find(x => x.startsWith('--valtype='));
|
2848
3660
|
if (valtypeOpt) valtype = valtypeOpt.split('=')[1];
|
2849
3661
|
|
2850
3662
|
globalThis.valtypeBinary = Valtype[valtype];
|
2851
3663
|
|
2852
3664
|
const valtypeInd = ['i32', 'i64', 'f64'].indexOf(valtype);
|
2853
3665
|
|
3666
|
+
globalThis.pageSize = PageSize;
|
3667
|
+
const pageSizeOpt = process.argv.find(x => x.startsWith('--page-size='));
|
3668
|
+
if (pageSizeOpt) pageSize = parseInt(pageSizeOpt.split('=')[1]) * 1024;
|
3669
|
+
|
2854
3670
|
// set generic opcodes for current valtype
|
2855
3671
|
Opcodes.const = [ Opcodes.i32_const, Opcodes.i64_const, Opcodes.f64_const ][valtypeInd];
|
2856
3672
|
Opcodes.eq = [ Opcodes.i32_eq, Opcodes.i64_eq, Opcodes.f64_eq ][valtypeInd];
|
@@ -2859,10 +3675,10 @@ export default program => {
|
|
2859
3675
|
Opcodes.add = [ Opcodes.i32_add, Opcodes.i64_add, Opcodes.f64_add ][valtypeInd];
|
2860
3676
|
Opcodes.sub = [ Opcodes.i32_sub, Opcodes.i64_sub, Opcodes.f64_sub ][valtypeInd];
|
2861
3677
|
|
2862
|
-
Opcodes.i32_to = [ [
|
2863
|
-
Opcodes.i32_to_u = [ [
|
2864
|
-
Opcodes.i32_from = [ [
|
2865
|
-
Opcodes.i32_from_u = [ [
|
3678
|
+
Opcodes.i32_to = [ [], [ Opcodes.i32_wrap_i64 ], Opcodes.i32_trunc_sat_f64_s ][valtypeInd];
|
3679
|
+
Opcodes.i32_to_u = [ [], [ Opcodes.i32_wrap_i64 ], Opcodes.i32_trunc_sat_f64_u ][valtypeInd];
|
3680
|
+
Opcodes.i32_from = [ [], [ Opcodes.i64_extend_i32_s ], [ Opcodes.f64_convert_i32_s ] ][valtypeInd];
|
3681
|
+
Opcodes.i32_from_u = [ [], [ Opcodes.i64_extend_i32_u ], [ Opcodes.f64_convert_i32_u ] ][valtypeInd];
|
2866
3682
|
|
2867
3683
|
Opcodes.load = [ Opcodes.i32_load, Opcodes.i64_load, Opcodes.f64_load ][valtypeInd];
|
2868
3684
|
Opcodes.store = [ Opcodes.i32_store, Opcodes.i64_store, Opcodes.f64_store ][valtypeInd];
|
@@ -2875,10 +3691,6 @@ export default program => {
|
|
2875
3691
|
|
2876
3692
|
program.id = { name: 'main' };
|
2877
3693
|
|
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
3694
|
const scope = {
|
2883
3695
|
locals: {},
|
2884
3696
|
localInd: 0
|
@@ -2889,7 +3701,7 @@ export default program => {
|
|
2889
3701
|
body: program.body
|
2890
3702
|
};
|
2891
3703
|
|
2892
|
-
if (
|
3704
|
+
if (Prefs.astLog) console.log(JSON.stringify(program.body.body, null, 2));
|
2893
3705
|
|
2894
3706
|
generateFunc(scope, program);
|
2895
3707
|
|
@@ -2906,7 +3718,11 @@ export default program => {
|
|
2906
3718
|
}
|
2907
3719
|
|
2908
3720
|
if (lastInst[0] === Opcodes.end || lastInst[0] === Opcodes.local_set || lastInst[0] === Opcodes.global_set) {
|
2909
|
-
|
3721
|
+
if (lastInst[0] === Opcodes.local_set && lastInst[1] === main.locals['#last_type'].idx) {
|
3722
|
+
main.wasm.splice(main.wasm.length - 1, 1);
|
3723
|
+
} else {
|
3724
|
+
main.returns = [];
|
3725
|
+
}
|
2910
3726
|
}
|
2911
3727
|
|
2912
3728
|
if (lastInst[0] === Opcodes.call) {
|