porffor 0.2.0-77e30e8 → 0.2.0-9088235

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.
Files changed (52) hide show
  1. package/LICENSE +20 -20
  2. package/README.md +133 -72
  3. package/asur/README.md +2 -0
  4. package/asur/index.js +1262 -0
  5. package/byg/index.js +237 -0
  6. package/compiler/2c.js +325 -72
  7. package/compiler/{sections.js → assemble.js} +64 -16
  8. package/compiler/builtins/annexb_string.js +72 -0
  9. package/compiler/builtins/annexb_string.ts +19 -0
  10. package/compiler/builtins/array.ts +145 -0
  11. package/compiler/builtins/base64.ts +151 -0
  12. package/compiler/builtins/crypto.ts +120 -0
  13. package/compiler/builtins/date.ts +534 -0
  14. package/compiler/builtins/escape.ts +141 -0
  15. package/compiler/builtins/int.ts +147 -0
  16. package/compiler/builtins/number.ts +527 -0
  17. package/compiler/builtins/porffor.d.ts +42 -0
  18. package/compiler/builtins/string.ts +1055 -0
  19. package/compiler/builtins/tostring.ts +45 -0
  20. package/compiler/builtins.js +601 -269
  21. package/compiler/{codeGen.js → codegen.js} +1276 -501
  22. package/compiler/decompile.js +11 -12
  23. package/compiler/embedding.js +22 -22
  24. package/compiler/encoding.js +98 -114
  25. package/compiler/generated_builtins.js +965 -0
  26. package/compiler/index.js +42 -38
  27. package/compiler/log.js +6 -3
  28. package/compiler/opt.js +65 -29
  29. package/compiler/parse.js +42 -11
  30. package/compiler/precompile.js +123 -0
  31. package/compiler/prefs.js +26 -0
  32. package/compiler/prototype.js +177 -37
  33. package/compiler/types.js +37 -0
  34. package/compiler/wasmSpec.js +31 -7
  35. package/compiler/wrap.js +144 -46
  36. package/package.json +9 -5
  37. package/porf +4 -0
  38. package/rhemyn/compile.js +5 -3
  39. package/rhemyn/parse.js +323 -320
  40. package/rhemyn/test/parse.js +58 -58
  41. package/runner/compare.js +34 -34
  42. package/runner/debug.js +122 -0
  43. package/runner/index.js +49 -10
  44. package/runner/profiler.js +102 -0
  45. package/runner/repl.js +42 -9
  46. package/runner/sizes.js +37 -37
  47. package/compiler/builtins/base64.js +0 -92
  48. package/runner/info.js +0 -89
  49. package/runner/profile.js +0 -46
  50. package/runner/results.json +0 -1
  51. package/runner/transform.js +0 -15
  52. 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('\n'.charCodeAt(0));
35
+ logChar(10); // new line
35
36
 
36
37
  return code;
37
38
  };
38
39
 
39
- const todo = msg => {
40
- class TodoError extends Error {
41
- constructor(message) {
42
- super(message);
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
- throw new TodoError(`todo: ${msg}`);
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
- return code;
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: add fancy terminal debugger?
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 === funcs.length) throw new Error('no new func added in export');
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
- asm: str => {
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, idx, type ] = asm.slice(1);
167
- scope.locals[name] = { idx: parseInt(idx), type: Valtype[type] };
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 => parseInt(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
- __internal_print_type: str => {
195
- const type = getType(scope, str) - TYPES.number;
219
+ __Porffor_bs: str => [
220
+ ...makeString(scope, str, global, name, true),
196
221
 
197
- return [
198
- ...number(type),
199
- [ Opcodes.call, importedFuncs.print ],
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
- // newline
202
- ...number(10),
203
- [ Opcodes.call, importedFuncs.printChar ]
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 name = decl.tag.name;
237
+ const func = decl.tag.name;
209
238
  // hack for inline asm
210
- if (!funcs[name]) return todo('tagged template expressions not implemented');
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
- const str = decl.quasi.quasis[0].value.raw;
213
- return funcs[name](str);
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
- return todo(`no generation for ${decl.type}!`);
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 = false) => [
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[name]) {
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
- return builtinVars[name];
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 (builtinFuncs[name] || internalConstrs[name]) {
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 (importedFuncs.hasOwnProperty(name)) return number(importedFuncs[name]);
280
- if (funcIndex[name] !== undefined) return number(funcIndex[name]);
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[name] !== undefined) return [ [ Opcodes.global_get, globals[name].idx ] ];
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
- ...number(TYPES.undefined, Valtype.i32), // type undefined
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
- ...getNodeType(scope, decl.argument),
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] >= 0xb7 && op[0] <= 0xba);
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 = isIntOp(left[left.length - 1]);
346
- const rightIsInt = isIntOp(right[right.length - 1]);
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
- [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
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
- [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
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
- [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
443
+ ...setLastType(scope),
383
444
  [ Opcodes.else ],
384
445
  [ Opcodes.local_get, localTmp(scope, 'logictmp') ],
385
446
  // note type
386
447
  ...leftType,
387
- [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
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.get(name ?? '$undeclared');
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 * i16 size
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 * i16 size
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 * i16 size
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 * i16 size
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 i16 (2)
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
- ...number(ValtypeSize.i16, Valtype.i32),
585
- [ Opcodes.i32_mul ],
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
- [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(ValtypeSize.i32) ],
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
- [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(ValtypeSize.i32) ],
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 i16 (2)
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 16), loop
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 (isIntOp(wasm[wasm.length - 1])) return [
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 tmp = localTmp(scope, `$logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
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 tmp = localTmp(scope, `$logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
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 tmp = localTmp(scope, `$logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
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 finalise = out => startOut.concat(out, endOut);
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
- // if (leftType === TYPES.string || rightType === TYPES.string) {
808
- // if (op === '+') {
809
- // // string concat (a + b)
810
- // return finalise(concatStrings(scope, left, right, _global, _name, assign));
811
- // }
812
-
813
- // // not an equality op, NaN
814
- // if (!eqOp) return finalise(number(NaN));
815
-
816
- // // else leave bool ops
817
- // // todo: convert string to number if string and number/bool
818
- // // todo: string (>|>=|<|<=) string
819
-
820
- // // string comparison
821
- // if (op === '===' || op === '==') {
822
- // return finalise(compareStrings(scope, left, right));
823
- // }
824
-
825
- // if (op === '!==' || op === '!=') {
826
- // return finalise([
827
- // ...compareStrings(scope, left, right),
828
- // [ Opcodes.i32_eqz ]
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 finalise([
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`); // throw new Error(`unknown operator ${op}`);
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
- if (op === '===' || op === '==' || op === '!==' || op === '!=') {
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 either are true
871
- [ Opcodes.i32_or ],
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
- // todo: convert non-strings to strings, for now fail immediately if one is not
875
- // if left is not string
1042
+ // if left is bytestring
876
1043
  ...leftType,
877
- ...number(TYPES.string, Valtype.i32),
878
- [ Opcodes.i32_ne ],
1044
+ ...number(TYPES._bytestring, Valtype.i32),
1045
+ [ Opcodes.i32_eq ],
879
1046
 
880
- // if right is not string
1047
+ // if right is bytestring
881
1048
  ...rightType,
882
- ...number(TYPES.string, Valtype.i32),
883
- [ Opcodes.i32_ne ],
1049
+ ...number(TYPES._bytestring, Valtype.i32),
1050
+ [ Opcodes.i32_eq ],
884
1051
 
885
- // if either are true
886
- [ Opcodes.i32_or ],
1052
+ // if both are true
1053
+ [ Opcodes.i32_and ],
887
1054
  [ Opcodes.if, Blocktype.void ],
888
- ...number(0, Valtype.i32),
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 finalise([
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 asmFunc = (name, { wasm, params, locals: localTypes, globals: globalTypes = [], globalInits, returns, returnType, localNames = [], globalNames = [] }) => {
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: TYPES[returnType ?? 'number'],
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 TYPES = {
1005
- number: 0x00,
1006
- boolean: 0x01,
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
- // these are not "typeof" types but tracked internally
1015
- _array: 0x10,
1016
- _regexp: 0x11
1017
- };
1018
-
1019
- const TYPE_NAMES = {
1020
- [TYPES.number]: 'Number',
1021
- [TYPES.boolean]: 'Boolean',
1022
- [TYPES.string]: 'String',
1023
- [TYPES.undefined]: 'undefined',
1024
- [TYPES.object]: 'Object',
1025
- [TYPES.function]: 'Function',
1026
- [TYPES.symbol]: 'Symbol',
1027
- [TYPES.bigint]: 'BigInt',
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 = TYPES[builtinVars[name].type ?? 'number'];
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.startsWith('__Array_prototype_') && prototypeFuncs[TYPES._array][name.slice(18)] ||
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 TYPES[builtinFuncs[name].returnType ?? 'number'];
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
- if (scope.locals['#last_type']) return [ [ Opcodes.local_get, localTmp(scope, '#last_type', Valtype.i32) ] ];
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
- // we cannot guess
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 (scope.locals['#last_type']) return [ [ Opcodes.local_get, localTmp(scope, '#last_type', Valtype.i32) ] ];
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
- const str = decl.value;
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 (func) {
1248
- count -= func.params.length;
1249
- } else count--;
1250
- if (func) count += func.returns.length;
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].type === 'Literal') {
1583
+ if (name === 'eval' && decl.arguments[0]?.type === 'Literal') {
1343
1584
  // literal eval hack
1344
- const code = decl.arguments[0].value;
1345
- const parsed = parse(code, []);
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
- [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
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
- [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
1617
+ ...setLastType(scope)
1366
1618
  );
1367
1619
  }
1368
1620
 
@@ -1380,18 +1632,20 @@ const generateCall = (scope, decl, _global, _name) => {
1380
1632
  if (name && name.startsWith('__')) {
1381
1633
  const spl = name.slice(2).split('_');
1382
1634
 
1383
- const func = spl[spl.length - 1];
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
- if (decl.callee.object.regex) {
1394
- const funcName = decl.callee.property.name;
1647
+ const funcName = decl.callee.property.name;
1648
+ if (decl.callee.object.regex && Object.hasOwn(Rhemyn, funcName)) {
1395
1649
  const func = Rhemyn[funcName](decl.callee.object.regex.pattern, currentFuncIndex++);
1396
1650
 
1397
1651
  funcIndex[func.name] = func.index;
@@ -1407,12 +1661,11 @@ const generateCall = (scope, decl, _global, _name) => {
1407
1661
  Opcodes.i32_from_u,
1408
1662
 
1409
1663
  ...number(TYPES.boolean, Valtype.i32),
1410
- [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
1664
+ ...setLastType(scope)
1411
1665
  ];
1412
1666
  }
1413
1667
 
1414
- const func = decl.callee.property.name;
1415
- protoName = func;
1668
+ protoName = decl.callee.property.name;
1416
1669
 
1417
1670
  target = decl.callee.object;
1418
1671
  }
@@ -1433,23 +1686,47 @@ const generateCall = (scope, decl, _global, _name) => {
1433
1686
  // }
1434
1687
 
1435
1688
  if (protoName) {
1689
+ const protoBC = {};
1690
+
1691
+ const builtinProtoCands = Object.keys(builtinFuncs).filter(x => x.startsWith('__') && x.endsWith('_prototype_' + protoName));
1692
+
1693
+ if (!decl._protoInternalCall && builtinProtoCands.length > 0) {
1694
+ for (const x of builtinProtoCands) {
1695
+ const type = TYPES[x.split('_prototype_')[0].slice(2).toLowerCase()];
1696
+ if (type == null) continue;
1697
+
1698
+ protoBC[type] = generateCall(scope, {
1699
+ callee: {
1700
+ name: x
1701
+ },
1702
+ arguments: [ target, ...decl.arguments ],
1703
+ _protoInternalCall: true
1704
+ });
1705
+ }
1706
+ }
1707
+
1436
1708
  const protoCands = Object.keys(prototypeFuncs).reduce((acc, x) => {
1437
- const f = prototypeFuncs[x][protoName];
1438
- if (f) acc[x] = f;
1709
+ if (Object.hasOwn(prototypeFuncs[x], protoName)) acc[x] = prototypeFuncs[x][protoName];
1439
1710
  return acc;
1440
1711
  }, {});
1441
1712
 
1442
- // no prototype function candidates, ignore
1443
1713
  if (Object.keys(protoCands).length > 0) {
1444
1714
  // use local for cached i32 length as commonly used
1445
1715
  const lengthLocal = localTmp(scope, '__proto_length_cache', Valtype.i32);
1446
1716
  const pointerLocal = localTmp(scope, '__proto_pointer_cache', Valtype.i32);
1447
- const getPointer = [ [ Opcodes.local_get, pointerLocal ] ];
1448
1717
 
1449
1718
  // TODO: long-term, prototypes should be their individual separate funcs
1450
1719
 
1720
+ const rawPointer = [
1721
+ ...generate(scope, target),
1722
+ Opcodes.i32_to_u
1723
+ ];
1724
+
1725
+ const usePointerCache = !Object.values(protoCands).every(x => x.noPointerCache === true);
1726
+ const getPointer = usePointerCache ? [ [ Opcodes.local_get, pointerLocal ] ] : rawPointer;
1727
+
1728
+ let allOptUnused = true;
1451
1729
  let lengthI32CacheUsed = false;
1452
- const protoBC = {};
1453
1730
  for (const x in protoCands) {
1454
1731
  const protoFunc = protoCands[x];
1455
1732
  if (protoFunc.noArgRetLength && decl.arguments.length === 0) {
@@ -1457,7 +1734,7 @@ const generateCall = (scope, decl, _global, _name) => {
1457
1734
  ...RTArrayUtil.getLength(getPointer),
1458
1735
 
1459
1736
  ...number(TYPES.number, Valtype.i32),
1460
- [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
1737
+ ...setLastType(scope)
1461
1738
  ];
1462
1739
  continue;
1463
1740
  }
@@ -1467,6 +1744,7 @@ const generateCall = (scope, decl, _global, _name) => {
1467
1744
  const protoLocal = protoFunc.local ? localTmp(scope, `__${protoName}_tmp`, protoFunc.local) : -1;
1468
1745
  const protoLocal2 = protoFunc.local2 ? localTmp(scope, `__${protoName}_tmp2`, protoFunc.local2) : -1;
1469
1746
 
1747
+ let optUnused = false;
1470
1748
  const protoOut = protoFunc(getPointer, {
1471
1749
  getCachedI32: () => {
1472
1750
  lengthI32CacheUsed = true;
@@ -1481,23 +1759,30 @@ const generateCall = (scope, decl, _global, _name) => {
1481
1759
  return makeArray(scope, {
1482
1760
  rawElements: new Array(length)
1483
1761
  }, _global, _name, true, itemType);
1762
+ }, () => {
1763
+ optUnused = true;
1764
+ return unusedValue;
1484
1765
  });
1485
1766
 
1767
+ if (!optUnused) allOptUnused = false;
1768
+
1486
1769
  protoBC[x] = [
1487
- [ Opcodes.block, valtypeBinary ],
1770
+ [ Opcodes.block, unusedValue && optUnused ? Blocktype.void : valtypeBinary ],
1488
1771
  ...protoOut,
1489
1772
 
1490
1773
  ...number(protoFunc.returnType ?? TYPES.number, Valtype.i32),
1491
- [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
1774
+ ...setLastType(scope),
1492
1775
  [ Opcodes.end ]
1493
1776
  ];
1494
1777
  }
1495
1778
 
1496
- return [
1497
- ...generate(scope, target),
1779
+ // todo: if some cands use optUnused and some don't, we will probably crash
1498
1780
 
1499
- Opcodes.i32_to_u,
1500
- [ Opcodes.local_set, pointerLocal ],
1781
+ return [
1782
+ ...(usePointerCache ? [
1783
+ ...rawPointer,
1784
+ [ Opcodes.local_set, pointerLocal ],
1785
+ ] : []),
1501
1786
 
1502
1787
  ...(!lengthI32CacheUsed ? [] : [
1503
1788
  ...RTArrayUtil.getLengthI32(getPointer),
@@ -1509,13 +1794,22 @@ const generateCall = (scope, decl, _global, _name) => {
1509
1794
 
1510
1795
  // TODO: error better
1511
1796
  default: internalThrow(scope, 'TypeError', `'${protoName}' proto func tried to be called on a type without an impl`)
1512
- }, valtypeBinary),
1797
+ }, allOptUnused && unusedValue ? Blocktype.void : valtypeBinary),
1513
1798
  ];
1514
1799
  }
1800
+
1801
+ if (Object.keys(protoBC).length > 0) {
1802
+ return typeSwitch(scope, getNodeType(scope, target), {
1803
+ ...protoBC,
1804
+
1805
+ // TODO: error better
1806
+ default: internalThrow(scope, 'TypeError', `'${protoName}' proto func tried to be called on a type without an impl`)
1807
+ }, valtypeBinary);
1808
+ }
1515
1809
  }
1516
1810
 
1517
1811
  // TODO: only allows callee as literal
1518
- if (!name) return todo(`only literal callees (got ${decl.callee.type})`);
1812
+ if (!name) return todo(scope, `only literal callees (got ${decl.callee.type})`);
1519
1813
 
1520
1814
  let idx = funcIndex[name] ?? importedFuncs[name];
1521
1815
  if (idx === undefined && builtinFuncs[name]) {
@@ -1548,15 +1842,66 @@ const generateCall = (scope, decl, _global, _name) => {
1548
1842
  idx = -1;
1549
1843
  }
1550
1844
 
1845
+ if (idx === undefined && name.startsWith('__Porffor_wasm_')) {
1846
+ const wasmOps = {
1847
+ // pointer, align, offset
1848
+ i32_load: { imms: 2, args: [ true ], returns: 1 },
1849
+ // pointer, value, align, offset
1850
+ i32_store: { imms: 2, args: [ true, true ], returns: 0 },
1851
+ // pointer, align, offset
1852
+ i32_load8_u: { imms: 2, args: [ true ], returns: 1 },
1853
+ // pointer, value, align, offset
1854
+ i32_store8: { imms: 2, args: [ true, true ], returns: 0 },
1855
+ // pointer, align, offset
1856
+ i32_load16_u: { imms: 2, args: [ true ], returns: 1 },
1857
+ // pointer, value, align, offset
1858
+ i32_store16: { imms: 2, args: [ true, true ], returns: 0 },
1859
+
1860
+ // pointer, align, offset
1861
+ f64_load: { imms: 2, args: [ true ], returns: 0 }, // 0 due to not i32
1862
+ // pointer, value, align, offset
1863
+ f64_store: { imms: 2, args: [ true, false ], returns: 0 },
1864
+
1865
+ // value
1866
+ i32_const: { imms: 1, args: [], returns: 1 },
1867
+
1868
+ // a, b
1869
+ i32_or: { imms: 0, args: [ true, true ], returns: 1 },
1870
+ };
1871
+
1872
+ const opName = name.slice('__Porffor_wasm_'.length);
1873
+
1874
+ if (wasmOps[opName]) {
1875
+ const op = wasmOps[opName];
1876
+
1877
+ const argOut = [];
1878
+ for (let i = 0; i < op.args.length; i++) argOut.push(
1879
+ ...generate(scope, decl.arguments[i]),
1880
+ ...(op.args[i] ? [ Opcodes.i32_to ] : [])
1881
+ );
1882
+
1883
+ // literals only
1884
+ const imms = decl.arguments.slice(op.args.length).map(x => x.value);
1885
+
1886
+ return [
1887
+ ...argOut,
1888
+ [ Opcodes[opName], ...imms ],
1889
+ ...(new Array(op.returns).fill(Opcodes.i32_from))
1890
+ ];
1891
+ }
1892
+ }
1893
+
1551
1894
  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`);
1895
+ if (scope.locals[name] !== undefined || globals[name] !== undefined || builtinVars[name] !== undefined) return internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function`, true);
1896
+ return internalThrow(scope, 'ReferenceError', `${unhackName(name)} is not defined`, true);
1554
1897
  }
1555
1898
 
1556
1899
  const func = funcs.find(x => x.index === idx);
1557
1900
 
1558
1901
  const userFunc = (funcIndex[name] && !importedFuncs[name] && !builtinFuncs[name] && !internalConstrs[name]) || idx === -1;
1559
- const paramCount = func && (userFunc ? func.params.length / 2 : func.params.length);
1902
+ const typedParams = userFunc || builtinFuncs[name]?.typedParams;
1903
+ const typedReturns = (func ? func.returnType == null : userFunc) || builtinFuncs[name]?.typedReturns;
1904
+ const paramCount = func && (typedParams ? func.params.length / 2 : func.params.length);
1560
1905
 
1561
1906
  let args = decl.arguments;
1562
1907
  if (func && args.length < paramCount) {
@@ -1572,14 +1917,24 @@ const generateCall = (scope, decl, _global, _name) => {
1572
1917
  if (func && func.throws) scope.throws = true;
1573
1918
 
1574
1919
  let out = [];
1575
- for (const arg of args) {
1920
+ for (let i = 0; i < args.length; i++) {
1921
+ const arg = args[i];
1576
1922
  out = out.concat(generate(scope, arg));
1577
- if (userFunc) out = out.concat(getNodeType(scope, arg));
1923
+
1924
+ if (builtinFuncs[name] && builtinFuncs[name].params[i * (typedParams ? 2 : 1)] === Valtype.i32 && valtypeBinary !== Valtype.i32) {
1925
+ out.push(Opcodes.i32_to);
1926
+ }
1927
+
1928
+ if (importedFuncs[name] && name.startsWith('profile')) {
1929
+ out.push(Opcodes.i32_to);
1930
+ }
1931
+
1932
+ if (typedParams) out = out.concat(getNodeType(scope, arg));
1578
1933
  }
1579
1934
 
1580
1935
  out.push([ Opcodes.call, idx ]);
1581
1936
 
1582
- if (!userFunc) {
1937
+ if (!typedReturns) {
1583
1938
  // let type;
1584
1939
  // if (builtinFuncs[name]) type = TYPES[builtinFuncs[name].returnType ?? 'number'];
1585
1940
  // if (internalConstrs[name]) type = internalConstrs[name].type;
@@ -1589,7 +1944,11 @@ const generateCall = (scope, decl, _global, _name) => {
1589
1944
  // ...number(type, Valtype.i32),
1590
1945
  // [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
1591
1946
  // );
1592
- } else out.push([ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]);
1947
+ } else out.push(...setLastType(scope));
1948
+
1949
+ if (builtinFuncs[name] && builtinFuncs[name].returns?.[0] === Valtype.i32 && valtypeBinary !== Valtype.i32) {
1950
+ out.push(Opcodes.i32_from);
1951
+ }
1593
1952
 
1594
1953
  return out;
1595
1954
  };
@@ -1597,8 +1956,21 @@ const generateCall = (scope, decl, _global, _name) => {
1597
1956
  const generateNew = (scope, decl, _global, _name) => {
1598
1957
  // hack: basically treat this as a normal call for builtins for now
1599
1958
  const name = mapName(decl.callee.name);
1959
+
1600
1960
  if (internalConstrs[name] && !internalConstrs[name].notConstr) return internalConstrs[name].generate(scope, decl, _global, _name);
1601
- if (!builtinFuncs[name]) return todo(`new statement is not supported yet`); // return todo(`new statement is not supported yet (new ${unhackName(name)})`);
1961
+
1962
+ if (builtinFuncs[name + '$constructor']) {
1963
+ // custom ...$constructor override builtin func
1964
+ return generateCall(scope, {
1965
+ ...decl,
1966
+ callee: {
1967
+ type: 'Identifier',
1968
+ name: name + '$constructor'
1969
+ }
1970
+ }, _global, _name);
1971
+ }
1972
+
1973
+ 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
1974
 
1603
1975
  return generateCall(scope, decl, _global, _name);
1604
1976
  };
@@ -1614,60 +1986,217 @@ const unhackName = name => {
1614
1986
  return name;
1615
1987
  };
1616
1988
 
1617
- const typeSwitch = (scope, type, bc, returns = valtypeBinary) => {
1618
- const tmp = localTmp(scope, '#typeswitch_tmp', Valtype.i32);
1989
+ const knownType = (scope, type) => {
1990
+ if (type.length === 1 && type[0][0] === Opcodes.i32_const) {
1991
+ return type[0][1];
1992
+ }
1619
1993
 
1620
- const out = [
1621
- ...type,
1622
- [ Opcodes.local_set, tmp ],
1623
- [ Opcodes.block, returns ]
1624
- ];
1994
+ if (typedInput && type.length === 1 && type[0][0] === Opcodes.local_get) {
1995
+ const idx = type[0][1];
1625
1996
 
1626
- // todo: use br_table?
1997
+ // type idx = var idx + 1
1998
+ const v = Object.values(scope.locals).find(x => x.idx === idx - 1);
1999
+ if (v.metadata?.type != null) return v.metadata.type;
2000
+ }
1627
2001
 
1628
- for (const x in bc) {
1629
- if (x === 'default') continue;
2002
+ return null;
2003
+ };
1630
2004
 
1631
- // if type == x
1632
- out.push([ Opcodes.local_get, tmp ]);
1633
- out.push(...number(x, Valtype.i32));
1634
- out.push([ Opcodes.i32_eq ]);
2005
+ const brTable = (input, bc, returns) => {
2006
+ const out = [];
2007
+ const keys = Object.keys(bc);
2008
+ const count = keys.length;
1635
2009
 
1636
- out.push([ Opcodes.if, Blocktype.void, `TYPESWITCH|${TYPE_NAMES[x]}` ]);
1637
- out.push(...bc[x]);
1638
- out.push([ Opcodes.br, 1 ]);
1639
- out.push([ Opcodes.end ]);
2010
+ if (count === 1) {
2011
+ // return [
2012
+ // ...input,
2013
+ // ...bc[keys[0]]
2014
+ // ];
2015
+ return bc[keys[0]];
1640
2016
  }
1641
2017
 
1642
- // default
1643
- if (bc.default) out.push(...bc.default);
1644
- else if (returns !== Blocktype.void) out.push(...number(0, returns));
2018
+ if (count === 2) {
2019
+ // just use if else
2020
+ const other = keys.find(x => x !== 'default');
2021
+ return [
2022
+ ...input,
2023
+ ...number(other, Valtype.i32),
2024
+ [ Opcodes.i32_eq ],
2025
+ [ Opcodes.if, returns ],
2026
+ ...bc[other],
2027
+ [ Opcodes.else ],
2028
+ ...bc.default,
2029
+ [ Opcodes.end ]
2030
+ ];
2031
+ }
1645
2032
 
1646
- out.push([ Opcodes.end, 'TYPESWITCH_end' ]);
2033
+ for (let i = 0; i < count; i++) {
2034
+ if (i === 0) out.push([ Opcodes.block, returns, 'br table start' ]);
2035
+ else out.push([ Opcodes.block, Blocktype.void ]);
2036
+ }
1647
2037
 
1648
- return out;
1649
- };
2038
+ const nums = keys.filter(x => +x);
2039
+ const offset = Math.min(...nums);
2040
+ const max = Math.max(...nums);
1650
2041
 
1651
- const allocVar = (scope, name, global = false) => {
1652
- const target = global ? globals : scope.locals;
2042
+ const table = [];
2043
+ let br = 1;
1653
2044
 
1654
- // already declared
1655
- if (target[name]) {
1656
- // parser should catch this but sanity check anyway
1657
- // if (decl.kind !== 'var') return internalThrow(scope, 'SyntaxError', `Identifier '${unhackName(name)}' has already been declared`);
2045
+ for (let i = offset; i <= max; i++) {
2046
+ // if branch for this num, go to that block
2047
+ if (bc[i]) {
2048
+ table.push(br);
2049
+ br++;
2050
+ continue;
2051
+ }
1658
2052
 
1659
- return target[name].idx;
2053
+ // else default
2054
+ table.push(0);
1660
2055
  }
1661
2056
 
1662
- let idx = global ? globalInd++ : scope.localInd++;
1663
- target[name] = { idx, type: valtypeBinary };
2057
+ out.push(
2058
+ [ Opcodes.block, Blocktype.void ],
2059
+ ...input,
2060
+ ...(offset > 0 ? [
2061
+ ...number(offset, Valtype.i32),
2062
+ [ Opcodes.i32_sub ]
2063
+ ] : []),
2064
+ [ Opcodes.br_table, ...encodeVector(table), 0 ]
2065
+ );
1664
2066
 
1665
- let typeIdx = global ? globalInd++ : scope.localInd++;
1666
- target[name + '#type'] = { idx: typeIdx, type: Valtype.i32 };
2067
+ // if you can guess why we sort the wrong way and then reverse
2068
+ // (instead of just sorting the correct way)
2069
+ // dm me and if you are correct and the first person
2070
+ // I will somehow shout you out or something
2071
+ const orderedBc = keys.sort((a, b) => b - a).reverse();
2072
+
2073
+ br = count - 1;
2074
+ for (const x of orderedBc) {
2075
+ out.push(
2076
+ [ Opcodes.end ],
2077
+ ...bc[x],
2078
+ ...(br === 0 ? [] : [ [ Opcodes.br, br ] ])
2079
+ );
2080
+ br--;
2081
+ }
2082
+
2083
+ return [
2084
+ ...out,
2085
+ [ Opcodes.end, 'br table end' ]
2086
+ ];
2087
+ };
2088
+
2089
+ const typeSwitch = (scope, type, bc, returns = valtypeBinary) => {
2090
+ if (!Prefs.bytestring) delete bc[TYPES._bytestring];
2091
+
2092
+ const known = knownType(scope, type);
2093
+ if (known != null) {
2094
+ return bc[known] ?? bc.default;
2095
+ }
2096
+
2097
+ if (Prefs.typeswitchUseBrtable)
2098
+ return brTable(type, bc, returns);
2099
+
2100
+ const tmp = localTmp(scope, '#typeswitch_tmp', Valtype.i32);
2101
+ const out = [
2102
+ ...type,
2103
+ [ Opcodes.local_set, tmp ],
2104
+ [ Opcodes.block, returns ]
2105
+ ];
2106
+
2107
+ for (const x in bc) {
2108
+ if (x === 'default') continue;
2109
+
2110
+ // if type == x
2111
+ out.push([ Opcodes.local_get, tmp ]);
2112
+ out.push(...number(x, Valtype.i32));
2113
+ out.push([ Opcodes.i32_eq ]);
2114
+
2115
+ out.push([ Opcodes.if, Blocktype.void, `TYPESWITCH|${TYPE_NAMES[x]}` ]);
2116
+ out.push(...bc[x]);
2117
+ out.push([ Opcodes.br, 1 ]);
2118
+ out.push([ Opcodes.end ]);
2119
+ }
2120
+
2121
+ // default
2122
+ if (bc.default) out.push(...bc.default);
2123
+ else if (returns !== Blocktype.void) out.push(...number(0, returns));
2124
+
2125
+ out.push([ Opcodes.end, 'TYPESWITCH_end' ]);
2126
+
2127
+ return out;
2128
+ };
2129
+
2130
+ const allocVar = (scope, name, global = false, type = true) => {
2131
+ const target = global ? globals : scope.locals;
2132
+
2133
+ // already declared
2134
+ if (target[name]) {
2135
+ // parser should catch this but sanity check anyway
2136
+ // if (decl.kind !== 'var') return internalThrow(scope, 'SyntaxError', `Identifier '${unhackName(name)}' has already been declared`);
2137
+
2138
+ return target[name].idx;
2139
+ }
2140
+
2141
+ let idx = global ? globalInd++ : scope.localInd++;
2142
+ target[name] = { idx, type: valtypeBinary };
2143
+
2144
+ if (type) {
2145
+ let typeIdx = global ? globalInd++ : scope.localInd++;
2146
+ target[name + '#type'] = { idx: typeIdx, type: Valtype.i32 };
2147
+ }
1667
2148
 
1668
2149
  return idx;
1669
2150
  };
1670
2151
 
2152
+ const addVarMetadata = (scope, name, global = false, metadata = {}) => {
2153
+ const target = global ? globals : scope.locals;
2154
+
2155
+ target[name].metadata ??= {};
2156
+ for (const x in metadata) {
2157
+ if (metadata[x] != null) target[name].metadata[x] = metadata[x];
2158
+ }
2159
+ };
2160
+
2161
+ const typeAnnoToPorfType = x => {
2162
+ if (!x) return null;
2163
+ if (TYPES[x.toLowerCase()] != null) return TYPES[x.toLowerCase()];
2164
+ if (TYPES['_' + x.toLowerCase()] != null) return TYPES['_' + x.toLowerCase()];
2165
+
2166
+ switch (x) {
2167
+ case 'i32':
2168
+ case 'i64':
2169
+ case 'f64':
2170
+ return TYPES.number;
2171
+ }
2172
+
2173
+ return null;
2174
+ };
2175
+
2176
+ const extractTypeAnnotation = decl => {
2177
+ let a = decl;
2178
+ while (a.typeAnnotation) a = a.typeAnnotation;
2179
+
2180
+ let type = null, elementType = null;
2181
+ if (a.typeName) {
2182
+ type = a.typeName.name;
2183
+ } else if (a.type.endsWith('Keyword')) {
2184
+ type = a.type.slice(2, -7).toLowerCase();
2185
+ } else if (a.type === 'TSArrayType') {
2186
+ type = 'array';
2187
+ elementType = extractTypeAnnotation(a.elementType).type;
2188
+ }
2189
+
2190
+ const typeName = type;
2191
+ type = typeAnnoToPorfType(type);
2192
+
2193
+ if (type === TYPES._bytestring && !Prefs.bytestring) type = TYPES.string;
2194
+
2195
+ // if (decl.name) console.log(decl.name, { type, elementType });
2196
+
2197
+ return { type, typeName, elementType };
2198
+ };
2199
+
1671
2200
  const generateVar = (scope, decl) => {
1672
2201
  let out = [];
1673
2202
 
@@ -1679,6 +2208,8 @@ const generateVar = (scope, decl) => {
1679
2208
  for (const x of decl.declarations) {
1680
2209
  const name = mapName(x.id.name);
1681
2210
 
2211
+ if (!name) return todo(scope, 'destructuring is not supported yet');
2212
+
1682
2213
  if (x.init && isFuncType(x.init.type)) {
1683
2214
  // hack for let a = function () { ... }
1684
2215
  x.init.id = { name };
@@ -1694,7 +2225,13 @@ const generateVar = (scope, decl) => {
1694
2225
  continue; // always ignore
1695
2226
  }
1696
2227
 
1697
- let idx = allocVar(scope, name, global);
2228
+ const typed = typedInput && x.id.typeAnnotation;
2229
+ let idx = allocVar(scope, name, global, !(typed && extractTypeAnnotation(x.id).type != null));
2230
+
2231
+ if (typed) {
2232
+ addVarMetadata(scope, name, global, extractTypeAnnotation(x.id));
2233
+ }
2234
+
1698
2235
  if (x.init) {
1699
2236
  out = out.concat(generate(scope, x.init, global, name));
1700
2237
 
@@ -1709,7 +2246,8 @@ const generateVar = (scope, decl) => {
1709
2246
  return out;
1710
2247
  };
1711
2248
 
1712
- const generateAssign = (scope, decl) => {
2249
+ // todo: optimize this func for valueUnused
2250
+ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
1713
2251
  const { type, name } = decl.left;
1714
2252
 
1715
2253
  if (type === 'ObjectPattern') {
@@ -1727,9 +2265,9 @@ const generateAssign = (scope, decl) => {
1727
2265
  // hack: .length setter
1728
2266
  if (decl.left.type === 'MemberExpression' && decl.left.property.name === 'length') {
1729
2267
  const name = decl.left.object.name;
1730
- const pointer = arrays.get(name);
2268
+ const pointer = scope.arrays?.get(name);
1731
2269
 
1732
- const aotPointer = pointer != null;
2270
+ const aotPointer = Prefs.aotPointerOpt && pointer != null;
1733
2271
 
1734
2272
  const newValueTmp = localTmp(scope, '__length_setter_tmp');
1735
2273
 
@@ -1754,9 +2292,9 @@ const generateAssign = (scope, decl) => {
1754
2292
  // arr[i]
1755
2293
  if (decl.left.type === 'MemberExpression' && decl.left.computed) {
1756
2294
  const name = decl.left.object.name;
1757
- const pointer = arrays.get(name);
2295
+ const pointer = scope.arrays?.get(name);
1758
2296
 
1759
- const aotPointer = pointer != null;
2297
+ const aotPointer = Prefs.aotPointerOpt && pointer != null;
1760
2298
 
1761
2299
  const newValueTmp = localTmp(scope, '__member_setter_val_tmp');
1762
2300
  const pointerTmp = op === '=' ? -1 : localTmp(scope, '__member_setter_ptr_tmp', Valtype.i32);
@@ -1812,6 +2350,8 @@ const generateAssign = (scope, decl) => {
1812
2350
  ];
1813
2351
  }
1814
2352
 
2353
+ if (!name) return todo(scope, 'destructuring is not supported yet', true);
2354
+
1815
2355
  const [ local, isGlobal ] = lookupName(scope, name);
1816
2356
 
1817
2357
  if (local === undefined) {
@@ -1858,9 +2398,7 @@ const generateAssign = (scope, decl) => {
1858
2398
  ], getType(scope, name), getNodeType(scope, decl.right), isGlobal, name, true),
1859
2399
  [ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ],
1860
2400
 
1861
- [ Opcodes.local_get, localTmp(scope, '#last_type', Valtype.i32) ],
1862
- // hack: type is idx+1
1863
- [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx + 1 ],
2401
+ ...setType(scope, name, getLastType(scope))
1864
2402
  ];
1865
2403
  }
1866
2404
 
@@ -1871,9 +2409,7 @@ const generateAssign = (scope, decl) => {
1871
2409
 
1872
2410
  // todo: string concat types
1873
2411
 
1874
- // hack: type is idx+1
1875
- ...number(TYPES.number, Valtype.i32),
1876
- [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx + 1 ],
2412
+ ...setType(scope, name, TYPES.number)
1877
2413
  ];
1878
2414
  };
1879
2415
 
@@ -1919,7 +2455,7 @@ const generateUnary = (scope, decl) => {
1919
2455
  return out;
1920
2456
  }
1921
2457
 
1922
- case 'delete':
2458
+ case 'delete': {
1923
2459
  let toReturn = true, toGenerate = true;
1924
2460
 
1925
2461
  if (decl.argument.type === 'Identifier') {
@@ -1941,38 +2477,60 @@ const generateUnary = (scope, decl) => {
1941
2477
 
1942
2478
  out.push(...number(toReturn ? 1 : 0));
1943
2479
  return out;
2480
+ }
2481
+
2482
+ case 'typeof': {
2483
+ let overrideType, toGenerate = true;
1944
2484
 
1945
- case 'typeof':
1946
- return typeSwitch(scope, getNodeType(scope, decl.argument), {
2485
+ if (decl.argument.type === 'Identifier') {
2486
+ const out = generateIdent(scope, decl.argument);
2487
+
2488
+ // if ReferenceError (undeclared var), ignore and return undefined
2489
+ if (out[1]) {
2490
+ // does not exist (2 ops from throw)
2491
+ overrideType = number(TYPES.undefined, Valtype.i32);
2492
+ toGenerate = false;
2493
+ }
2494
+ }
2495
+
2496
+ const out = toGenerate ? generate(scope, decl.argument) : [];
2497
+ disposeLeftover(out);
2498
+
2499
+ out.push(...typeSwitch(scope, overrideType ?? getNodeType(scope, decl.argument), {
1947
2500
  [TYPES.number]: makeString(scope, 'number', false, '#typeof_result'),
1948
2501
  [TYPES.boolean]: makeString(scope, 'boolean', false, '#typeof_result'),
1949
2502
  [TYPES.string]: makeString(scope, 'string', false, '#typeof_result'),
1950
2503
  [TYPES.undefined]: makeString(scope, 'undefined', false, '#typeof_result'),
1951
2504
  [TYPES.function]: makeString(scope, 'function', false, '#typeof_result'),
1952
2505
 
2506
+ [TYPES._bytestring]: makeString(scope, 'string', false, '#typeof_result'),
2507
+
1953
2508
  // object and internal types
1954
2509
  default: makeString(scope, 'object', false, '#typeof_result'),
1955
- });
2510
+ }));
2511
+
2512
+ return out;
2513
+ }
1956
2514
 
1957
2515
  default:
1958
- return todo(`unary operator ${decl.operator} not implemented yet`);
2516
+ return todo(scope, `unary operator ${decl.operator} not implemented yet`, true);
1959
2517
  }
1960
2518
  };
1961
2519
 
1962
- const generateUpdate = (scope, decl) => {
2520
+ const generateUpdate = (scope, decl, _global, _name, valueUnused = false) => {
1963
2521
  const { name } = decl.argument;
1964
2522
 
1965
2523
  const [ local, isGlobal ] = lookupName(scope, name);
1966
2524
 
1967
2525
  if (local === undefined) {
1968
- return todo(`update expression with undefined variable`);
2526
+ return todo(scope, `update expression with undefined variable`, true);
1969
2527
  }
1970
2528
 
1971
2529
  const idx = local.idx;
1972
2530
  const out = [];
1973
2531
 
1974
2532
  out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
1975
- if (!decl.prefix) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
2533
+ if (!decl.prefix && !valueUnused) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
1976
2534
 
1977
2535
  switch (decl.operator) {
1978
2536
  case '++':
@@ -1985,7 +2543,7 @@ const generateUpdate = (scope, decl) => {
1985
2543
  }
1986
2544
 
1987
2545
  out.push([ isGlobal ? Opcodes.global_set : Opcodes.local_set, idx ]);
1988
- if (decl.prefix) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
2546
+ if (decl.prefix && !valueUnused) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
1989
2547
 
1990
2548
  return out;
1991
2549
  };
@@ -2025,7 +2583,7 @@ const generateConditional = (scope, decl) => {
2025
2583
  // note type
2026
2584
  out.push(
2027
2585
  ...getNodeType(scope, decl.consequent),
2028
- [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
2586
+ ...setLastType(scope)
2029
2587
  );
2030
2588
 
2031
2589
  out.push([ Opcodes.else ]);
@@ -2034,7 +2592,7 @@ const generateConditional = (scope, decl) => {
2034
2592
  // note type
2035
2593
  out.push(
2036
2594
  ...getNodeType(scope, decl.alternate),
2037
- [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
2595
+ ...setLastType(scope)
2038
2596
  );
2039
2597
 
2040
2598
  out.push([ Opcodes.end ]);
@@ -2048,15 +2606,17 @@ const generateFor = (scope, decl) => {
2048
2606
  const out = [];
2049
2607
 
2050
2608
  if (decl.init) {
2051
- out.push(...generate(scope, decl.init));
2609
+ out.push(...generate(scope, decl.init, false, undefined, true));
2052
2610
  disposeLeftover(out);
2053
2611
  }
2054
2612
 
2055
2613
  out.push([ Opcodes.loop, Blocktype.void ]);
2056
2614
  depth.push('for');
2057
2615
 
2058
- out.push(...generate(scope, decl.test));
2059
- out.push(Opcodes.i32_to, [ Opcodes.if, Blocktype.void ]);
2616
+ if (decl.test) out.push(...generate(scope, decl.test), Opcodes.i32_to);
2617
+ else out.push(...number(1, Valtype.i32));
2618
+
2619
+ out.push([ Opcodes.if, Blocktype.void ]);
2060
2620
  depth.push('if');
2061
2621
 
2062
2622
  out.push([ Opcodes.block, Blocktype.void ]);
@@ -2064,8 +2624,7 @@ const generateFor = (scope, decl) => {
2064
2624
  out.push(...generate(scope, decl.body));
2065
2625
  out.push([ Opcodes.end ]);
2066
2626
 
2067
- out.push(...generate(scope, decl.update));
2068
- depth.pop();
2627
+ if (decl.update) out.push(...generate(scope, decl.update, false, undefined, true));
2069
2628
 
2070
2629
  out.push([ Opcodes.br, 1 ]);
2071
2630
  out.push([ Opcodes.end ], [ Opcodes.end ]);
@@ -2093,6 +2652,36 @@ const generateWhile = (scope, decl) => {
2093
2652
  return out;
2094
2653
  };
2095
2654
 
2655
+ const generateDoWhile = (scope, decl) => {
2656
+ const out = [];
2657
+
2658
+ out.push([ Opcodes.loop, Blocktype.void ]);
2659
+ depth.push('dowhile');
2660
+
2661
+ // block for break (includes all)
2662
+ out.push([ Opcodes.block, Blocktype.void ]);
2663
+ depth.push('block');
2664
+
2665
+ // block for continue
2666
+ // includes body but not test+loop so we can exit body at anytime
2667
+ // and still test+loop after
2668
+ out.push([ Opcodes.block, Blocktype.void ]);
2669
+ depth.push('block');
2670
+
2671
+ out.push(...generate(scope, decl.body));
2672
+
2673
+ out.push([ Opcodes.end ]);
2674
+ depth.pop();
2675
+
2676
+ out.push(...generate(scope, decl.test), Opcodes.i32_to);
2677
+ out.push([ Opcodes.br_if, 1 ]);
2678
+
2679
+ out.push([ Opcodes.end ], [ Opcodes.end ]);
2680
+ depth.pop(); depth.pop();
2681
+
2682
+ return out;
2683
+ };
2684
+
2096
2685
  const generateForOf = (scope, decl) => {
2097
2686
  const out = [];
2098
2687
 
@@ -2122,8 +2711,17 @@ const generateForOf = (scope, decl) => {
2122
2711
  // setup local for left
2123
2712
  generate(scope, decl.left);
2124
2713
 
2125
- const leftName = decl.left.declarations[0].id.name;
2714
+ let leftName = decl.left.declarations?.[0]?.id?.name;
2715
+ if (!leftName && decl.left.name) {
2716
+ leftName = decl.left.name;
2717
+
2718
+ generateVar(scope, { kind: 'var', _bare: true, declarations: [ { id: { name: leftName } } ] })
2719
+ }
2720
+
2721
+ // if (!leftName) console.log(decl.left?.declarations?.[0]?.id ?? decl.left);
2722
+
2126
2723
  const [ local, isGlobal ] = lookupName(scope, leftName);
2724
+ if (!local) return todo(scope, 'for of failed to get left local (probably destructure)');
2127
2725
 
2128
2726
  depth.push('block');
2129
2727
  depth.push('block');
@@ -2131,13 +2729,15 @@ const generateForOf = (scope, decl) => {
2131
2729
  // // todo: we should only do this for strings but we don't know at compile-time :(
2132
2730
  // hack: this is naughty and will break things!
2133
2731
  let newOut = number(0, Valtype.f64), newPointer = -1;
2134
- if (pages.hasString) {
2732
+ if (pages.hasAnyString) {
2733
+ // todo: we use i16 even for bytestrings which should not make a bad thing happen, just be confusing for debugging?
2135
2734
  0, [ newOut, newPointer ] = makeArray(scope, {
2136
2735
  rawElements: new Array(1)
2137
2736
  }, isGlobal, leftName, true, 'i16');
2138
2737
  }
2139
2738
 
2140
2739
  // set type for local
2740
+ // todo: optimize away counter and use end pointer
2141
2741
  out.push(...typeSwitch(scope, getNodeType(scope, decl.right), {
2142
2742
  [TYPES._array]: [
2143
2743
  ...setType(scope, leftName, TYPES.number),
@@ -2222,6 +2822,56 @@ const generateForOf = (scope, decl) => {
2222
2822
  [ Opcodes.end ],
2223
2823
  [ Opcodes.end ]
2224
2824
  ],
2825
+ [TYPES._bytestring]: [
2826
+ ...setType(scope, leftName, TYPES._bytestring),
2827
+
2828
+ [ Opcodes.loop, Blocktype.void ],
2829
+
2830
+ // setup new/out array
2831
+ ...newOut,
2832
+ [ Opcodes.drop ],
2833
+
2834
+ ...number(0, Valtype.i32), // base 0 for store after
2835
+
2836
+ // load current string ind {arg}
2837
+ [ Opcodes.local_get, pointer ],
2838
+ [ Opcodes.local_get, counter ],
2839
+ [ Opcodes.i32_add ],
2840
+ [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(ValtypeSize.i32) ],
2841
+
2842
+ // store to new string ind 0
2843
+ [ Opcodes.i32_store8, 0, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
2844
+
2845
+ // return new string (page)
2846
+ ...number(newPointer),
2847
+
2848
+ [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx ],
2849
+
2850
+ [ Opcodes.block, Blocktype.void ],
2851
+ [ Opcodes.block, Blocktype.void ],
2852
+ ...generate(scope, decl.body),
2853
+ [ Opcodes.end ],
2854
+
2855
+ // increment iter pointer
2856
+ // [ Opcodes.local_get, pointer ],
2857
+ // ...number(1, Valtype.i32),
2858
+ // [ Opcodes.i32_add ],
2859
+ // [ Opcodes.local_set, pointer ],
2860
+
2861
+ // increment counter by 1
2862
+ [ Opcodes.local_get, counter ],
2863
+ ...number(1, Valtype.i32),
2864
+ [ Opcodes.i32_add ],
2865
+ [ Opcodes.local_tee, counter ],
2866
+
2867
+ // loop if counter != length
2868
+ [ Opcodes.local_get, length ],
2869
+ [ Opcodes.i32_ne ],
2870
+ [ Opcodes.br_if, 1 ],
2871
+
2872
+ [ Opcodes.end ],
2873
+ [ Opcodes.end ]
2874
+ ],
2225
2875
  default: internalThrow(scope, 'TypeError', `Tried for..of on non-iterable type`)
2226
2876
  }, Blocktype.void));
2227
2877
 
@@ -2232,28 +2882,65 @@ const generateForOf = (scope, decl) => {
2232
2882
  return out;
2233
2883
  };
2234
2884
 
2885
+ // find the nearest loop in depth map by type
2235
2886
  const getNearestLoop = () => {
2236
2887
  for (let i = depth.length - 1; i >= 0; i--) {
2237
- if (depth[i] === 'while' || depth[i] === 'for' || depth[i] === 'forof') return i;
2888
+ if (['while', 'dowhile', 'for', 'forof'].includes(depth[i])) return i;
2238
2889
  }
2239
2890
 
2240
2891
  return -1;
2241
2892
  };
2242
2893
 
2243
2894
  const generateBreak = (scope, decl) => {
2244
- const nearestLoop = depth.length - getNearestLoop();
2895
+ const target = decl.label ? scope.labels.get(decl.label.name) : getNearestLoop();
2896
+ const type = depth[target];
2897
+
2898
+ // different loop types have different branch offsets
2899
+ // as they have different wasm block/loop/if structures
2900
+ // we need to use the right offset by type to branch to the one we want
2901
+ // for a break: exit the loop without executing anything else inside it
2902
+ const offset = ({
2903
+ for: 2, // loop > if (wanted branch) > block (we are here)
2904
+ while: 2, // loop > if (wanted branch) (we are here)
2905
+ dowhile: 2, // loop > block (wanted branch) > block (we are here)
2906
+ forof: 2, // loop > block (wanted branch) > block (we are here)
2907
+ if: 1 // break inside if, branch 0 to skip the rest of the if
2908
+ })[type];
2909
+
2245
2910
  return [
2246
- [ Opcodes.br, ...signedLEB128(nearestLoop - 2) ]
2911
+ [ Opcodes.br, ...signedLEB128(depth.length - target - offset) ]
2247
2912
  ];
2248
2913
  };
2249
2914
 
2250
2915
  const generateContinue = (scope, decl) => {
2251
- const nearestLoop = depth.length - getNearestLoop();
2916
+ const target = decl.label ? scope.labels.get(decl.label.name) : getNearestLoop();
2917
+ const type = depth[target];
2918
+
2919
+ // different loop types have different branch offsets
2920
+ // as they have different wasm block/loop/if structures
2921
+ // we need to use the right offset by type to branch to the one we want
2922
+ // for a continue: do test for the loop, and then loop depending on that success
2923
+ const offset = ({
2924
+ for: 3, // loop (wanted branch) > if > block (we are here)
2925
+ while: 1, // loop (wanted branch) > if (we are here)
2926
+ dowhile: 3, // loop > block > block (wanted branch) (we are here)
2927
+ forof: 3 // loop > block > block (wanted branch) (we are here)
2928
+ })[type];
2929
+
2252
2930
  return [
2253
- [ Opcodes.br, ...signedLEB128(nearestLoop - 3) ]
2931
+ [ Opcodes.br, ...signedLEB128(depth.length - target - offset) ]
2254
2932
  ];
2255
2933
  };
2256
2934
 
2935
+ const generateLabel = (scope, decl) => {
2936
+ scope.labels ??= new Map();
2937
+
2938
+ const name = decl.label.name;
2939
+ scope.labels.set(name, depth.length);
2940
+
2941
+ return generate(scope, decl.body);
2942
+ };
2943
+
2257
2944
  const generateThrow = (scope, decl) => {
2258
2945
  scope.throws = true;
2259
2946
 
@@ -2262,7 +2949,7 @@ const generateThrow = (scope, decl) => {
2262
2949
  // hack: throw new X("...") -> throw "..."
2263
2950
  if (!message && (decl.argument.type === 'NewExpression' || decl.argument.type === 'CallExpression')) {
2264
2951
  constructor = decl.argument.callee.name;
2265
- message = decl.argument.arguments[0].value;
2952
+ message = decl.argument.arguments[0]?.value ?? '';
2266
2953
  }
2267
2954
 
2268
2955
  if (tags.length === 0) tags.push({
@@ -2274,6 +2961,9 @@ const generateThrow = (scope, decl) => {
2274
2961
  let exceptId = exceptions.push({ constructor, message }) - 1;
2275
2962
  let tagIdx = tags[0].idx;
2276
2963
 
2964
+ scope.exceptions ??= [];
2965
+ scope.exceptions.push(exceptId);
2966
+
2277
2967
  // todo: write a description of how this works lol
2278
2968
 
2279
2969
  return [
@@ -2283,7 +2973,7 @@ const generateThrow = (scope, decl) => {
2283
2973
  };
2284
2974
 
2285
2975
  const generateTry = (scope, decl) => {
2286
- if (decl.finalizer) return todo('try finally not implemented yet');
2976
+ if (decl.finalizer) return todo(scope, 'try finally not implemented yet');
2287
2977
 
2288
2978
  const out = [];
2289
2979
 
@@ -2314,29 +3004,35 @@ const generateAssignPat = (scope, decl) => {
2314
3004
  // TODO
2315
3005
  // if identifier declared, use that
2316
3006
  // else, use default (right)
2317
- return todo('assignment pattern (optional arg)');
3007
+ return todo(scope, 'assignment pattern (optional arg)');
2318
3008
  };
2319
3009
 
2320
3010
  let pages = new Map();
2321
- const allocPage = (reason, type) => {
3011
+ const allocPage = (scope, reason, type) => {
2322
3012
  if (pages.has(reason)) return pages.get(reason).ind;
2323
3013
 
2324
3014
  if (reason.startsWith('array:')) pages.hasArray = true;
2325
3015
  if (reason.startsWith('string:')) pages.hasString = true;
3016
+ if (reason.startsWith('bytestring:')) pages.hasByteString = true;
3017
+ if (reason.includes('string:')) pages.hasAnyString = true;
2326
3018
 
2327
3019
  const ind = pages.size;
2328
3020
  pages.set(reason, { ind, type });
2329
3021
 
2330
- if (allocLog) log('alloc', `allocated new page of memory (${ind}) | ${reason} (type: ${type})`);
3022
+ scope.pages ??= new Map();
3023
+ scope.pages.set(reason, { ind, type });
3024
+
3025
+ if (Prefs.allocLog) log('alloc', `allocated new page of memory (${ind}) | ${reason} (type: ${type})`);
2331
3026
 
2332
3027
  return ind;
2333
3028
  };
2334
3029
 
3030
+ // todo: add scope.pages
2335
3031
  const freePage = reason => {
2336
3032
  const { ind } = pages.get(reason);
2337
3033
  pages.delete(reason);
2338
3034
 
2339
- if (allocLog) log('alloc', `freed page of memory (${ind}) | ${reason}`);
3035
+ if (Prefs.allocLog) log('alloc', `freed page of memory (${ind}) | ${reason}`);
2340
3036
 
2341
3037
  return ind;
2342
3038
  };
@@ -2356,38 +3052,51 @@ const StoreOps = {
2356
3052
  f64: Opcodes.f64_store,
2357
3053
 
2358
3054
  // expects i32 input!
2359
- i16: Opcodes.i32_store16
3055
+ i8: Opcodes.i32_store8,
3056
+ i16: Opcodes.i32_store16,
2360
3057
  };
2361
3058
 
2362
3059
  let data = [];
2363
3060
 
2364
- const compileBytes = (val, itemType, signed = true) => {
3061
+ const compileBytes = (val, itemType) => {
2365
3062
  // todo: this is a mess and needs confirming / ????
2366
3063
  switch (itemType) {
2367
3064
  case 'i8': return [ val % 256 ];
2368
- case 'i16': return [ val % 256, Math.floor(val / 256) ];
2369
-
2370
- case 'i32':
2371
- case 'i64':
2372
- return enforceFourBytes(signedLEB128(val));
3065
+ case 'i16': return [ val % 256, (val / 256 | 0) % 256 ];
3066
+ case 'i16': return [ val % 256, (val / 256 | 0) % 256 ];
3067
+ case 'i32': return [...new Uint8Array(new Int32Array([ val ]).buffer)];
3068
+ // todo: i64
2373
3069
 
2374
3070
  case 'f64': return ieee754_binary64(val);
2375
3071
  }
2376
3072
  };
2377
3073
 
3074
+ const getAllocType = itemType => {
3075
+ switch (itemType) {
3076
+ case 'i8': return 'bytestring';
3077
+ case 'i16': return 'string';
3078
+
3079
+ default: return 'array';
3080
+ }
3081
+ };
3082
+
2378
3083
  const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty = false, itemType = valtype) => {
2379
3084
  const out = [];
2380
3085
 
3086
+ scope.arrays ??= new Map();
3087
+
2381
3088
  let firstAssign = false;
2382
- if (!arrays.has(name) || name === '$undeclared') {
3089
+ if (!scope.arrays.has(name) || name === '$undeclared') {
2383
3090
  firstAssign = true;
2384
3091
 
2385
3092
  // todo: can we just have 1 undeclared array? probably not? but this is not really memory efficient
2386
3093
  const uniqueName = name === '$undeclared' ? name + Math.random().toString().slice(2) : name;
2387
- arrays.set(name, allocPage(`${itemType === 'i16' ? 'string' : 'array'}: ${uniqueName}`, itemType) * pageSize);
3094
+
3095
+ if (Prefs.scopedPageNames) scope.arrays.set(name, allocPage(scope, `${scope.name} | ${getAllocType(itemType)}: ${uniqueName}`, itemType) * pageSize);
3096
+ else scope.arrays.set(name, allocPage(scope, `${getAllocType(itemType)}: ${uniqueName}`, itemType) * pageSize);
2388
3097
  }
2389
3098
 
2390
- const pointer = arrays.get(name);
3099
+ const pointer = scope.arrays.get(name);
2391
3100
 
2392
3101
  const useRawElements = !!decl.rawElements;
2393
3102
  const elements = useRawElements ? decl.rawElements : decl.elements;
@@ -2395,19 +3104,25 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
2395
3104
  const valtype = itemTypeToValtype[itemType];
2396
3105
  const length = elements.length;
2397
3106
 
2398
- if (firstAssign && useRawElements) {
2399
- let bytes = compileBytes(length, 'i32');
3107
+ if (firstAssign && useRawElements && !Prefs.noData) {
3108
+ // if length is 0 memory/data will just be 0000... anyway
3109
+ if (length !== 0) {
3110
+ let bytes = compileBytes(length, 'i32');
2400
3111
 
2401
- if (!initEmpty) for (let i = 0; i < length; i++) {
2402
- if (elements[i] == null) continue;
3112
+ if (!initEmpty) for (let i = 0; i < length; i++) {
3113
+ if (elements[i] == null) continue;
2403
3114
 
2404
- bytes.push(...compileBytes(elements[i], itemType));
2405
- }
3115
+ bytes.push(...compileBytes(elements[i], itemType));
3116
+ }
2406
3117
 
2407
- data.push({
2408
- offset: pointer,
2409
- bytes
2410
- });
3118
+ const ind = data.push({
3119
+ offset: pointer,
3120
+ bytes
3121
+ }) - 1;
3122
+
3123
+ scope.data ??= [];
3124
+ scope.data.push(ind);
3125
+ }
2411
3126
 
2412
3127
  // local value as pointer
2413
3128
  out.push(...number(pointer));
@@ -2430,7 +3145,7 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
2430
3145
  out.push(
2431
3146
  ...number(0, Valtype.i32),
2432
3147
  ...(useRawElements ? number(elements[i], Valtype[valtype]) : generate(scope, elements[i])),
2433
- [ storeOp, Math.log2(ValtypeSize[itemType]) - 1, ...unsignedLEB128(pointer + ValtypeSize.i32 + i * ValtypeSize[itemType]) ]
3148
+ [ storeOp, (Math.log2(ValtypeSize[itemType]) || 1) - 1, ...unsignedLEB128(pointer + ValtypeSize.i32 + i * ValtypeSize[itemType]) ]
2434
3149
  );
2435
3150
  }
2436
3151
 
@@ -2440,31 +3155,56 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
2440
3155
  return [ out, pointer ];
2441
3156
  };
2442
3157
 
2443
- const makeString = (scope, str, global = false, name = '$undeclared') => {
3158
+ const byteStringable = str => {
3159
+ if (!Prefs.bytestring) return false;
3160
+
3161
+ for (let i = 0; i < str.length; i++) {
3162
+ if (str.charCodeAt(i) > 0xFF) return false;
3163
+ }
3164
+
3165
+ return true;
3166
+ };
3167
+
3168
+ const makeString = (scope, str, global = false, name = '$undeclared', forceBytestring = undefined) => {
2444
3169
  const rawElements = new Array(str.length);
3170
+ let byteStringable = Prefs.bytestring;
2445
3171
  for (let i = 0; i < str.length; i++) {
2446
- rawElements[i] = str.charCodeAt(i);
3172
+ const c = str.charCodeAt(i);
3173
+ rawElements[i] = c;
3174
+
3175
+ if (byteStringable && c > 0xFF) byteStringable = false;
2447
3176
  }
2448
3177
 
3178
+ if (byteStringable && forceBytestring === false) byteStringable = false;
3179
+
2449
3180
  return makeArray(scope, {
2450
3181
  rawElements
2451
- }, global, name, false, 'i16')[0];
3182
+ }, global, name, false, byteStringable ? 'i8' : 'i16')[0];
2452
3183
  };
2453
3184
 
2454
- let arrays = new Map();
2455
3185
  const generateArray = (scope, decl, global = false, name = '$undeclared', initEmpty = false) => {
2456
3186
  return makeArray(scope, decl, global, name, initEmpty, valtype)[0];
2457
3187
  };
2458
3188
 
2459
3189
  export const generateMember = (scope, decl, _global, _name) => {
2460
3190
  const name = decl.object.name;
2461
- const pointer = arrays.get(name);
3191
+ const pointer = scope.arrays?.get(name);
2462
3192
 
2463
- const aotPointer = pointer != null;
3193
+ const aotPointer = Prefs.aotPointerOpt && pointer != null;
2464
3194
 
2465
3195
  // hack: .length
2466
3196
  if (decl.property.name === 'length') {
2467
- // if (![TYPES._array, TYPES.string].includes(type)) return number(UNDEFINED);
3197
+ const func = funcs.find(x => x.name === name);
3198
+ if (func) {
3199
+ const userFunc = funcIndex[name] && !importedFuncs[name] && !builtinFuncs[name] && !internalConstrs[name];
3200
+ const typedParams = userFunc || builtinFuncs[name]?.typedParams;
3201
+ return number(typedParams ? func.params.length / 2 : func.params.length);
3202
+ }
3203
+
3204
+ if (builtinFuncs[name]) return number(builtinFuncs[name].typedParams ? (builtinFuncs[name].params.length / 2) : builtinFuncs[name].params.length);
3205
+ if (importedFuncs[name]) return number(importedFuncs[name].params);
3206
+ if (internalConstrs[name]) return number(internalConstrs[name].length ?? 0);
3207
+
2468
3208
  return [
2469
3209
  ...(aotPointer ? number(0, Valtype.i32) : [
2470
3210
  ...generate(scope, decl.object),
@@ -2476,10 +3216,13 @@ export const generateMember = (scope, decl, _global, _name) => {
2476
3216
  ];
2477
3217
  }
2478
3218
 
3219
+ const object = generate(scope, decl.object);
3220
+ const property = generate(scope, decl.property);
3221
+
2479
3222
  // // todo: we should only do this for strings but we don't know at compile-time :(
2480
3223
  // hack: this is naughty and will break things!
2481
- let newOut = number(0, Valtype.f64), newPointer = -1;
2482
- if (pages.hasString) {
3224
+ let newOut = number(0, valtypeBinary), newPointer = -1;
3225
+ if (pages.hasAnyString) {
2483
3226
  0, [ newOut, newPointer ] = makeArray(scope, {
2484
3227
  rawElements: new Array(1)
2485
3228
  }, _global, _name, true, 'i16');
@@ -2488,7 +3231,7 @@ export const generateMember = (scope, decl, _global, _name) => {
2488
3231
  return typeSwitch(scope, getNodeType(scope, decl.object), {
2489
3232
  [TYPES._array]: [
2490
3233
  // get index as valtype
2491
- ...generate(scope, decl.property),
3234
+ ...property,
2492
3235
 
2493
3236
  // convert to i32 and turn into byte offset by * valtypeSize (4 for i32, 8 for i64/f64)
2494
3237
  Opcodes.i32_to_u,
@@ -2496,7 +3239,7 @@ export const generateMember = (scope, decl, _global, _name) => {
2496
3239
  [ Opcodes.i32_mul ],
2497
3240
 
2498
3241
  ...(aotPointer ? [] : [
2499
- ...generate(scope, decl.object),
3242
+ ...object,
2500
3243
  Opcodes.i32_to_u,
2501
3244
  [ Opcodes.i32_add ]
2502
3245
  ]),
@@ -2505,7 +3248,7 @@ export const generateMember = (scope, decl, _global, _name) => {
2505
3248
  [ Opcodes.load, Math.log2(ValtypeSize[valtype]) - 1, ...unsignedLEB128((aotPointer ? pointer : 0) + ValtypeSize.i32) ],
2506
3249
 
2507
3250
  ...number(TYPES.number, Valtype.i32),
2508
- [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
3251
+ ...setLastType(scope)
2509
3252
  ],
2510
3253
 
2511
3254
  [TYPES.string]: [
@@ -2515,14 +3258,14 @@ export const generateMember = (scope, decl, _global, _name) => {
2515
3258
 
2516
3259
  ...number(0, Valtype.i32), // base 0 for store later
2517
3260
 
2518
- ...generate(scope, decl.property),
2519
-
3261
+ ...property,
2520
3262
  Opcodes.i32_to_u,
3263
+
2521
3264
  ...number(ValtypeSize.i16, Valtype.i32),
2522
3265
  [ Opcodes.i32_mul ],
2523
3266
 
2524
3267
  ...(aotPointer ? [] : [
2525
- ...generate(scope, decl.object),
3268
+ ...object,
2526
3269
  Opcodes.i32_to_u,
2527
3270
  [ Opcodes.i32_add ]
2528
3271
  ]),
@@ -2537,10 +3280,38 @@ export const generateMember = (scope, decl, _global, _name) => {
2537
3280
  ...number(newPointer),
2538
3281
 
2539
3282
  ...number(TYPES.string, Valtype.i32),
2540
- [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
3283
+ ...setLastType(scope)
2541
3284
  ],
3285
+ [TYPES._bytestring]: [
3286
+ // setup new/out array
3287
+ ...newOut,
3288
+ [ Opcodes.drop ],
2542
3289
 
2543
- default: [ [ Opcodes.unreachable ] ]
3290
+ ...number(0, Valtype.i32), // base 0 for store later
3291
+
3292
+ ...property,
3293
+ Opcodes.i32_to_u,
3294
+
3295
+ ...(aotPointer ? [] : [
3296
+ ...object,
3297
+ Opcodes.i32_to_u,
3298
+ [ Opcodes.i32_add ]
3299
+ ]),
3300
+
3301
+ // load current string ind {arg}
3302
+ [ Opcodes.i32_load8_u, 0, ...unsignedLEB128((aotPointer ? pointer : 0) + ValtypeSize.i32) ],
3303
+
3304
+ // store to new string ind 0
3305
+ [ Opcodes.i32_store8, 0, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
3306
+
3307
+ // return new string (page)
3308
+ ...number(newPointer),
3309
+
3310
+ ...number(TYPES._bytestring, Valtype.i32),
3311
+ ...setLastType(scope)
3312
+ ],
3313
+
3314
+ default: internalThrow(scope, 'TypeError', 'Member expression is not supported for non-string non-array yet', true)
2544
3315
  });
2545
3316
  };
2546
3317
 
@@ -2550,25 +3321,36 @@ const objectHack = node => {
2550
3321
  if (!node) return node;
2551
3322
 
2552
3323
  if (node.type === 'MemberExpression') {
2553
- if (node.computed || node.optional) return node;
3324
+ const out = (() => {
3325
+ if (node.computed || node.optional) return;
2554
3326
 
2555
- let objectName = node.object.name;
3327
+ let objectName = node.object.name;
2556
3328
 
2557
- // if object is not identifier or another member exp, give up
2558
- if (node.object.type !== 'Identifier' && node.object.type !== 'MemberExpression') return node;
3329
+ // if object is not identifier or another member exp, give up
3330
+ if (node.object.type !== 'Identifier' && node.object.type !== 'MemberExpression') return;
3331
+ if (objectName && ['undefined', 'null', 'NaN', 'Infinity'].includes(objectName)) return;
2559
3332
 
2560
- if (!objectName) objectName = objectHack(node.object).name.slice(2);
3333
+ if (!objectName) objectName = objectHack(node.object)?.name?.slice?.(2);
2561
3334
 
2562
- // if .length, give up (hack within a hack!)
2563
- if (node.property.name === 'length') return node;
3335
+ // if .length, give up (hack within a hack!)
3336
+ if (node.property.name === 'length') {
3337
+ node.object = objectHack(node.object);
3338
+ return;
3339
+ }
2564
3340
 
2565
- const name = '__' + objectName + '_' + node.property.name;
2566
- if (codeLog) log('codegen', `object hack! ${node.object.name}.${node.property.name} -> ${name}`);
3341
+ // no object name, give up
3342
+ if (!objectName) return;
2567
3343
 
2568
- return {
2569
- type: 'Identifier',
2570
- name
2571
- };
3344
+ const name = '__' + objectName + '_' + node.property.name;
3345
+ if (Prefs.codeLog) log('codegen', `object hack! ${node.object.name}.${node.property.name} -> ${name}`);
3346
+
3347
+ return {
3348
+ type: 'Identifier',
3349
+ name
3350
+ };
3351
+ })();
3352
+
3353
+ if (out) return out;
2572
3354
  }
2573
3355
 
2574
3356
  for (const x in node) {
@@ -2582,11 +3364,11 @@ const objectHack = node => {
2582
3364
  };
2583
3365
 
2584
3366
  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');
3367
+ if (decl.async) return todo(scope, 'async functions are not supported');
3368
+ if (decl.generator) return todo(scope, 'generator functions are not supported');
2587
3369
 
2588
3370
  const name = decl.id ? decl.id.name : `anonymous_${randId()}`;
2589
- const params = decl.params?.map(x => x.name) ?? [];
3371
+ const params = decl.params ?? [];
2590
3372
 
2591
3373
  // const innerScope = { ...scope };
2592
3374
  // TODO: share scope/locals between !!!
@@ -2599,8 +3381,17 @@ const generateFunc = (scope, decl) => {
2599
3381
  name
2600
3382
  };
2601
3383
 
3384
+ if (typedInput && decl.returnType) {
3385
+ innerScope.returnType = extractTypeAnnotation(decl.returnType).type;
3386
+ innerScope.returns = [ valtypeBinary ];
3387
+ }
3388
+
2602
3389
  for (let i = 0; i < params.length; i++) {
2603
- allocVar(innerScope, params[i], false);
3390
+ allocVar(innerScope, params[i].name, false);
3391
+
3392
+ if (typedInput && params[i].typeAnnotation) {
3393
+ addVarMetadata(innerScope, params[i].name, false, extractTypeAnnotation(params[i]));
3394
+ }
2604
3395
  }
2605
3396
 
2606
3397
  let body = objectHack(decl.body);
@@ -2616,13 +3407,13 @@ const generateFunc = (scope, decl) => {
2616
3407
  const func = {
2617
3408
  name,
2618
3409
  params: Object.values(innerScope.locals).slice(0, params.length * 2).map(x => x.type),
2619
- returns: innerScope.returns,
2620
- locals: innerScope.locals,
2621
- throws: innerScope.throws,
2622
- index: currentFuncIndex++
3410
+ index: currentFuncIndex++,
3411
+ ...innerScope
2623
3412
  };
2624
3413
  funcIndex[name] = func.index;
2625
3414
 
3415
+ if (name === 'main') func.gotLastType = true;
3416
+
2626
3417
  // quick hack fixes
2627
3418
  for (const inst of wasm) {
2628
3419
  if (inst[0] === Opcodes.call && inst[1] === -1) {
@@ -2639,117 +3430,6 @@ const generateFunc = (scope, decl) => {
2639
3430
  );
2640
3431
  }
2641
3432
 
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
3433
  func.wasm = wasm;
2754
3434
 
2755
3435
  funcs.push(func);
@@ -2785,7 +3465,7 @@ const internalConstrs = {
2785
3465
 
2786
3466
  // todo: check in wasm instead of here
2787
3467
  const literalValue = arg.value ?? 0;
2788
- if (literalValue < 0 || !Number.isFinite(literalValue) || literalValue > 4294967295) return internalThrow(scope, 'RangeThrow', 'Invalid array length');
3468
+ if (literalValue < 0 || !Number.isFinite(literalValue) || literalValue > 4294967295) return internalThrow(scope, 'RangeThrow', 'Invalid array length', true);
2789
3469
 
2790
3470
  return [
2791
3471
  ...number(0, Valtype.i32),
@@ -2796,7 +3476,8 @@ const internalConstrs = {
2796
3476
  ...number(pointer)
2797
3477
  ];
2798
3478
  },
2799
- type: TYPES._array
3479
+ type: TYPES._array,
3480
+ length: 1
2800
3481
  },
2801
3482
 
2802
3483
  __Array_of: {
@@ -2808,7 +3489,98 @@ const internalConstrs = {
2808
3489
  }, global, name);
2809
3490
  },
2810
3491
  type: TYPES._array,
3492
+ notConstr: true,
3493
+ length: 0
3494
+ },
3495
+
3496
+ __Porffor_fastOr: {
3497
+ generate: (scope, decl) => {
3498
+ const out = [];
3499
+
3500
+ for (let i = 0; i < decl.arguments.length; i++) {
3501
+ out.push(
3502
+ ...generate(scope, decl.arguments[i]),
3503
+ Opcodes.i32_to_u,
3504
+ ...(i > 0 ? [ [ Opcodes.i32_or ] ] : [])
3505
+ );
3506
+ }
3507
+
3508
+ out.push(Opcodes.i32_from_u);
3509
+
3510
+ return out;
3511
+ },
3512
+ type: TYPES.boolean,
2811
3513
  notConstr: true
3514
+ },
3515
+
3516
+ __Porffor_fastAnd: {
3517
+ generate: (scope, decl) => {
3518
+ const out = [];
3519
+
3520
+ for (let i = 0; i < decl.arguments.length; i++) {
3521
+ out.push(
3522
+ ...generate(scope, decl.arguments[i]),
3523
+ Opcodes.i32_to_u,
3524
+ ...(i > 0 ? [ [ Opcodes.i32_and ] ] : [])
3525
+ );
3526
+ }
3527
+
3528
+ out.push(Opcodes.i32_from_u);
3529
+
3530
+ return out;
3531
+ },
3532
+ type: TYPES.boolean,
3533
+ notConstr: true
3534
+ },
3535
+
3536
+ Boolean: {
3537
+ generate: (scope, decl) => {
3538
+ // todo: boolean object when used as constructor
3539
+ const arg = decl.arguments[0] ?? DEFAULT_VALUE;
3540
+ return truthy(scope, generate(scope, arg), getNodeType(scope, arg));
3541
+ },
3542
+ type: TYPES.boolean,
3543
+ length: 1
3544
+ },
3545
+
3546
+ __Math_max: {
3547
+ generate: (scope, decl) => {
3548
+ const out = [
3549
+ ...number(-Infinity)
3550
+ ];
3551
+
3552
+ for (let i = 0; i < decl.arguments.length; i++) {
3553
+ out.push(
3554
+ ...generate(scope, decl.arguments[i]),
3555
+ [ Opcodes.f64_max ]
3556
+ );
3557
+ }
3558
+
3559
+ return out;
3560
+ },
3561
+ type: TYPES.number,
3562
+ notConstr: true,
3563
+ length: 2
3564
+ },
3565
+
3566
+ __Math_min: {
3567
+ generate: (scope, decl) => {
3568
+ const out = [
3569
+ ...number(Infinity)
3570
+ ];
3571
+
3572
+ for (let i = 0; i < decl.arguments.length; i++) {
3573
+ out.push(
3574
+ ...generate(scope, decl.arguments[i]),
3575
+ [ Opcodes.f64_min ]
3576
+ );
3577
+ }
3578
+
3579
+ return out;
3580
+ },
3581
+ type: TYPES.number,
3582
+ notConstr: true,
3583
+ length: 2
2812
3584
  }
2813
3585
  };
2814
3586
 
@@ -2837,7 +3609,6 @@ export default program => {
2837
3609
  funcs = [];
2838
3610
  funcIndex = {};
2839
3611
  depth = [];
2840
- arrays = new Map();
2841
3612
  pages = new Map();
2842
3613
  data = [];
2843
3614
  currentFuncIndex = importedFuncs.length;
@@ -2851,6 +3622,10 @@ export default program => {
2851
3622
 
2852
3623
  const valtypeInd = ['i32', 'i64', 'f64'].indexOf(valtype);
2853
3624
 
3625
+ globalThis.pageSize = PageSize;
3626
+ const pageSizeOpt = process.argv.find(x => x.startsWith('-page-size='));
3627
+ if (pageSizeOpt) pageSize = parseInt(pageSizeOpt.split('=')[1]) * 1024;
3628
+
2854
3629
  // set generic opcodes for current valtype
2855
3630
  Opcodes.const = [ Opcodes.i32_const, Opcodes.i64_const, Opcodes.f64_const ][valtypeInd];
2856
3631
  Opcodes.eq = [ Opcodes.i32_eq, Opcodes.i64_eq, Opcodes.f64_eq ][valtypeInd];
@@ -2859,10 +3634,10 @@ export default program => {
2859
3634
  Opcodes.add = [ Opcodes.i32_add, Opcodes.i64_add, Opcodes.f64_add ][valtypeInd];
2860
3635
  Opcodes.sub = [ Opcodes.i32_sub, Opcodes.i64_sub, Opcodes.f64_sub ][valtypeInd];
2861
3636
 
2862
- Opcodes.i32_to = [ [ null ], [ Opcodes.i32_wrap_i64 ], Opcodes.i32_trunc_sat_f64_s ][valtypeInd];
2863
- Opcodes.i32_to_u = [ [ null ], [ Opcodes.i32_wrap_i64 ], Opcodes.i32_trunc_sat_f64_u ][valtypeInd];
2864
- Opcodes.i32_from = [ [ null ], [ Opcodes.i64_extend_i32_s ], [ Opcodes.f64_convert_i32_s ] ][valtypeInd];
2865
- Opcodes.i32_from_u = [ [ null ], [ Opcodes.i64_extend_i32_u ], [ Opcodes.f64_convert_i32_u ] ][valtypeInd];
3637
+ Opcodes.i32_to = [ [], [ Opcodes.i32_wrap_i64 ], Opcodes.i32_trunc_sat_f64_s ][valtypeInd];
3638
+ Opcodes.i32_to_u = [ [], [ Opcodes.i32_wrap_i64 ], Opcodes.i32_trunc_sat_f64_u ][valtypeInd];
3639
+ Opcodes.i32_from = [ [], [ Opcodes.i64_extend_i32_s ], [ Opcodes.f64_convert_i32_s ] ][valtypeInd];
3640
+ Opcodes.i32_from_u = [ [], [ Opcodes.i64_extend_i32_u ], [ Opcodes.f64_convert_i32_u ] ][valtypeInd];
2866
3641
 
2867
3642
  Opcodes.load = [ Opcodes.i32_load, Opcodes.i64_load, Opcodes.f64_load ][valtypeInd];
2868
3643
  Opcodes.store = [ Opcodes.i32_store, Opcodes.i64_store, Opcodes.f64_store ][valtypeInd];
@@ -2875,10 +3650,6 @@ export default program => {
2875
3650
 
2876
3651
  program.id = { name: 'main' };
2877
3652
 
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
3653
  const scope = {
2883
3654
  locals: {},
2884
3655
  localInd: 0
@@ -2889,7 +3660,7 @@ export default program => {
2889
3660
  body: program.body
2890
3661
  };
2891
3662
 
2892
- if (process.argv.includes('-ast-log')) console.log(program.body.body);
3663
+ if (Prefs.astLog) console.log(JSON.stringify(program.body.body, null, 2));
2893
3664
 
2894
3665
  generateFunc(scope, program);
2895
3666
 
@@ -2906,7 +3677,11 @@ export default program => {
2906
3677
  }
2907
3678
 
2908
3679
  if (lastInst[0] === Opcodes.end || lastInst[0] === Opcodes.local_set || lastInst[0] === Opcodes.global_set) {
2909
- main.returns = [];
3680
+ if (lastInst[0] === Opcodes.local_set && lastInst[1] === main.locals['#last_type'].idx) {
3681
+ main.wasm.splice(main.wasm.length - 1, 1);
3682
+ } else {
3683
+ main.returns = [];
3684
+ }
2910
3685
  }
2911
3686
 
2912
3687
  if (lastInst[0] === Opcodes.call) {