porffor 0.55.27 → 0.55.28
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/compiler/cyclone.js +174 -113
- package/compiler/disassemble.js +1 -1
- package/compiler/index.js +3 -3
- package/package.json +1 -1
- package/runner/index.js +1 -1
package/compiler/cyclone.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// cyclone: wasm partial constant evaluator (it is fast and dangerous hence "cyclone")
|
|
2
2
|
import { number, signedLEB128, ieee754_binary64, read_ieee754_binary64, read_signedLEB128 } from './encoding.js';
|
|
3
3
|
import { Opcodes, Valtype } from './wasmSpec.js';
|
|
4
|
+
import './prefs.js';
|
|
4
5
|
|
|
5
6
|
const f64ToI32Op = {
|
|
6
7
|
[Opcodes.f64_eq]: Opcodes.i32_eq,
|
|
@@ -15,8 +16,16 @@ const f64ToI32Op = {
|
|
|
15
16
|
[Opcodes.f64_div]: Opcodes.i32_div_s,
|
|
16
17
|
};
|
|
17
18
|
|
|
18
|
-
export default wasm => {
|
|
19
|
-
let
|
|
19
|
+
export default ({ name, wasm, locals: _locals, params }) => {
|
|
20
|
+
let locals = Object.values(_locals);
|
|
21
|
+
const localValtypes = locals.map(x => x.type);
|
|
22
|
+
|
|
23
|
+
const resetLocals = () => {
|
|
24
|
+
locals = new Array(locals.length).fill(false);
|
|
25
|
+
};
|
|
26
|
+
resetLocals();
|
|
27
|
+
|
|
28
|
+
let stack = []; // "stack"
|
|
20
29
|
for (let i = 0; i < wasm.length; i++) {
|
|
21
30
|
let op = wasm[i];
|
|
22
31
|
if (!op) continue;
|
|
@@ -33,8 +42,13 @@ export default wasm => {
|
|
|
33
42
|
stack.push({ val, op });
|
|
34
43
|
};
|
|
35
44
|
|
|
45
|
+
const peek = () => stack[stack.length - 1]?.val;
|
|
46
|
+
const popWithoutRemove = () => stack.pop().val;
|
|
47
|
+
|
|
48
|
+
// let debugPops = [];
|
|
36
49
|
const pop = () => {
|
|
37
50
|
const popped = stack.pop();
|
|
51
|
+
// debugPops.unshift({ ...popped, index: wasm.indexOf(popped.op) });
|
|
38
52
|
|
|
39
53
|
// remove the op
|
|
40
54
|
wasm.splice(wasm.indexOf(popped.op), 1);
|
|
@@ -42,12 +56,18 @@ export default wasm => {
|
|
|
42
56
|
|
|
43
57
|
return popped.val;
|
|
44
58
|
};
|
|
45
|
-
|
|
46
59
|
const pop2 = () => [ pop(), pop() ];
|
|
47
60
|
|
|
48
61
|
const bool = v => v ? 1 : 0;
|
|
49
62
|
|
|
50
63
|
const replaceOp = newOp => {
|
|
64
|
+
// console.log(`\x1b[4m${name}\x1b[0m`);
|
|
65
|
+
// const oldOps = [ ...debugPops, { op, index: i + debugPops.length } ];
|
|
66
|
+
// for (const x of oldOps) {
|
|
67
|
+
// console.log(`\x1b[90m${x.index.toString().padStart(4)} ▌\x1b[0m ${disassemble([ x.op ], undefined, undefined, _locals).slice(0, -1)}${x.val != null ? ` \x1b[2m(${x.val})\x1b[0m` : ''}`);
|
|
68
|
+
// }
|
|
69
|
+
// process.stdout.write(`\x1b[s\x1b[${oldOps.length}A\x1b[40C\x1b[2m->\x1b[0m ${disassemble([ newOp ]).slice(0, -1)}\x1b[u\n`);
|
|
70
|
+
|
|
51
71
|
op.splice(0, op.length, ...newOp);
|
|
52
72
|
};
|
|
53
73
|
const replaceVal = (val, valtype) => replaceOp(number(val, valtype));
|
|
@@ -57,41 +77,41 @@ export default wasm => {
|
|
|
57
77
|
};
|
|
58
78
|
|
|
59
79
|
switch (opcode) {
|
|
60
|
-
case Opcodes.if: {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
80
|
+
// case Opcodes.if: {
|
|
81
|
+
// if (stack.length < 1) { empty(); break; }
|
|
82
|
+
// const cond = bool(pop());
|
|
83
|
+
|
|
84
|
+
// // find else split and end
|
|
85
|
+
// let j = i + 1;
|
|
86
|
+
// let depth = 0, elseStart = 0;
|
|
87
|
+
// for (; j < wasm.length; j++) {
|
|
88
|
+
// const op = wasm[j][0];
|
|
89
|
+
// if (op === Opcodes.if || op === Opcodes.block || op === Opcodes.loop || op === Opcodes.try) depth++;
|
|
90
|
+
// if (op === Opcodes.else && depth === 0) elseStart = j;
|
|
91
|
+
// if (op === Opcodes.end) {
|
|
92
|
+
// depth--;
|
|
93
|
+
// if (depth < 0) break;
|
|
94
|
+
// }
|
|
95
|
+
// if (op === Opcodes.br || op === Opcodes.br_if) wasm[j][1] -= 1;
|
|
96
|
+
// }
|
|
97
|
+
|
|
98
|
+
// if (cond) {
|
|
99
|
+
// // remove else if it exists, or just remove end
|
|
100
|
+
// if (elseStart) wasm.splice(elseStart, j - elseStart + 1);
|
|
101
|
+
// else wasm.splice(j, 1);
|
|
102
|
+
// } else {
|
|
103
|
+
// // remove truthy conseq and keep else if it exists, or just remove entire thing
|
|
104
|
+
// if (elseStart) {
|
|
105
|
+
// wasm.splice(j, 1); // remove end
|
|
106
|
+
// wasm.splice(i + 1, elseStart - i + 1); // remove truthy conseq
|
|
107
|
+
// } else wasm.splice(i + 1, j - i + 0); // no else, remove entire if
|
|
108
|
+
// }
|
|
109
|
+
|
|
110
|
+
// // remove this if op
|
|
111
|
+
// wasm.splice(i, 1);
|
|
92
112
|
|
|
93
|
-
|
|
94
|
-
}
|
|
113
|
+
// break;
|
|
114
|
+
// }
|
|
95
115
|
|
|
96
116
|
case Opcodes.i32_const: {
|
|
97
117
|
const n = read_signedLEB128(op.slice(1));
|
|
@@ -448,8 +468,8 @@ export default wasm => {
|
|
|
448
468
|
break;
|
|
449
469
|
}
|
|
450
470
|
|
|
451
|
-
case Opcodes.
|
|
452
|
-
case Opcodes.
|
|
471
|
+
case Opcodes.f64_convert_i32_s:
|
|
472
|
+
case Opcodes.f64_convert_i32_u: {
|
|
453
473
|
if (stack.length < 1) { empty(); break; };
|
|
454
474
|
const v = pop();
|
|
455
475
|
|
|
@@ -458,7 +478,8 @@ export default wasm => {
|
|
|
458
478
|
break;
|
|
459
479
|
}
|
|
460
480
|
|
|
461
|
-
case 0xfc02:
|
|
481
|
+
case 0xfc02: // i32.trunc_sat_f64_s
|
|
482
|
+
case 0xfc03: { // i32.trunc_sat_f64_u
|
|
462
483
|
if (stack.length < 1) { empty(); break; }
|
|
463
484
|
const v = pop();
|
|
464
485
|
|
|
@@ -467,20 +488,60 @@ export default wasm => {
|
|
|
467
488
|
break;
|
|
468
489
|
}
|
|
469
490
|
|
|
470
|
-
case
|
|
491
|
+
case Opcodes.drop: {
|
|
471
492
|
if (stack.length < 1) { empty(); break; }
|
|
472
|
-
|
|
493
|
+
pop();
|
|
494
|
+
break;
|
|
495
|
+
}
|
|
473
496
|
|
|
474
|
-
|
|
475
|
-
|
|
497
|
+
case Opcodes.local_get: {
|
|
498
|
+
const x = locals[op[1]];
|
|
499
|
+
if (x === false) {
|
|
500
|
+
empty();
|
|
501
|
+
} else {
|
|
502
|
+
replaceVal(x, localValtypes[op[1]]);
|
|
503
|
+
push(x);
|
|
504
|
+
}
|
|
476
505
|
break;
|
|
477
506
|
}
|
|
478
507
|
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
508
|
+
case Opcodes.local_set: {
|
|
509
|
+
if (stack.length < 1) {
|
|
510
|
+
locals[op[1]] = false;
|
|
511
|
+
empty();
|
|
512
|
+
break;
|
|
513
|
+
}
|
|
514
|
+
|
|
515
|
+
const x = popWithoutRemove();
|
|
516
|
+
locals[op[1]] = x;
|
|
517
|
+
break;
|
|
518
|
+
}
|
|
519
|
+
|
|
520
|
+
case Opcodes.local_tee: {
|
|
521
|
+
if (stack.length < 1) {
|
|
522
|
+
locals[op[1]] = false;
|
|
523
|
+
empty();
|
|
524
|
+
break;
|
|
525
|
+
}
|
|
526
|
+
|
|
527
|
+
const x = pop();
|
|
528
|
+
locals[op[1]] = x;
|
|
529
|
+
replaceVal(x, localValtypes[op[1]]);
|
|
530
|
+
push(x);
|
|
531
|
+
break;
|
|
532
|
+
}
|
|
533
|
+
|
|
534
|
+
case Opcodes.block:
|
|
535
|
+
case Opcodes.loop:
|
|
536
|
+
case Opcodes.try:
|
|
537
|
+
case Opcodes.if:
|
|
538
|
+
case Opcodes.else:
|
|
539
|
+
case Opcodes.catch:
|
|
540
|
+
case Opcodes.end: {
|
|
541
|
+
resetLocals();
|
|
542
|
+
empty();
|
|
543
|
+
break;
|
|
544
|
+
}
|
|
484
545
|
|
|
485
546
|
default: {
|
|
486
547
|
empty();
|
|
@@ -500,69 +561,69 @@ export default wasm => {
|
|
|
500
561
|
// i32.const 1
|
|
501
562
|
// i32.add
|
|
502
563
|
// local.set 7 ;; $i (i32)
|
|
503
|
-
if (i >= 2 &&
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
) {
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
}
|
|
535
|
-
|
|
536
|
-
if ((opcode === 0xfc02 || opcode === 0xfc03) && i >= 3) { // i32.trunc_sat_f64_s/u
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
|
|
564
|
-
|
|
565
|
-
|
|
566
|
-
}
|
|
564
|
+
// if (i >= 2 &&
|
|
565
|
+
// ((opcode >= 0xa0 && opcode <= 0xa3) || // main f64 math op
|
|
566
|
+
// (opcode >= 0x61 && opcode <= 0x66)) // main f64 eq op
|
|
567
|
+
// ) {
|
|
568
|
+
// const o2 = wasm[i - 1][0];
|
|
569
|
+
// if (o2 === Opcodes.f64_const) { // f64.const
|
|
570
|
+
// const o3 = wasm[i - 2][0];
|
|
571
|
+
// if (o3 === Opcodes.f64_convert_i32_s || o3 === Opcodes.f64_convert_i32_u) {
|
|
572
|
+
// // remove now unneeded i32 -> f64 convert
|
|
573
|
+
// wasm.splice(i - 2, 1);
|
|
574
|
+
// i--;
|
|
575
|
+
|
|
576
|
+
// // convert f64.const -> i32.const
|
|
577
|
+
// const n = wasm[i - 1][1];
|
|
578
|
+
// wasm.splice(i - 1, 1, number(n, Valtype.i32));
|
|
579
|
+
|
|
580
|
+
// // convert math op from f64 to i32
|
|
581
|
+
// wasm[i][0] = f64ToI32Op[wasm[i][0]];
|
|
582
|
+
|
|
583
|
+
// const nextOp = wasm[i + 1];
|
|
584
|
+
// if (nextOp && opcode >= 0xa0 && opcode <= 0xa3) {
|
|
585
|
+
// if (nextOp[0] === 0xfc && (nextOp[1] === 0x02 || nextOp[1] === 0x03)) {
|
|
586
|
+
// // remove optional unneeded f64 -> i32 convert after
|
|
587
|
+
// wasm.splice(i + 1, 1);
|
|
588
|
+
// } else {
|
|
589
|
+
// // add now needed i32 -> f64 convert after
|
|
590
|
+
// wasm.splice(i + 1, Opcodes.i32_trunc_sat_f64_s);
|
|
591
|
+
// }
|
|
592
|
+
// }
|
|
593
|
+
// }
|
|
594
|
+
// }
|
|
595
|
+
// }
|
|
596
|
+
|
|
597
|
+
// if ((opcode === 0xfc02 || opcode === 0xfc03) && i >= 3) { // i32.trunc_sat_f64_s/u
|
|
598
|
+
// const o2 = wasm[i - 1][0];
|
|
599
|
+
// if (
|
|
600
|
+
// (o2 >= 0xa0 && o2 <= 0xa3) || // main f64 math op
|
|
601
|
+
// (o2 >= 0x61 && o2 <= 0x66) // main f64 eq op
|
|
602
|
+
// ) {
|
|
603
|
+
// const o3 = wasm[i - 2][0];
|
|
604
|
+
// if (o3 === Opcodes.f64_const) { // f64.const
|
|
605
|
+
// const o4 = wasm[i - 3][0];
|
|
606
|
+
// if (o4 === Opcodes.f64_convert_i32_s || o4 === Opcodes.f64_convert_i32_u) {
|
|
607
|
+
// // remove now unneeded i32 -> f64 convert
|
|
608
|
+
// wasm.splice(i - 3, 1);
|
|
609
|
+
// i--;
|
|
610
|
+
// } else {
|
|
611
|
+
// // add now needed f64 -> i32 convert prior
|
|
612
|
+
// wasm.splice(i - 2, 0, Opcodes.i32_trunc_sat_f64_s);
|
|
613
|
+
// i++;
|
|
614
|
+
// }
|
|
615
|
+
|
|
616
|
+
// // convert f64.const -> i32.const
|
|
617
|
+
// const n = wasm[i - 2][1];
|
|
618
|
+
// wasm.splice(i - 2, 1, number(n, Valtype.i32));
|
|
619
|
+
|
|
620
|
+
// // convert math op from f64 to i32
|
|
621
|
+
// wasm[i - 1][0] = f64ToI32Op[wasm[i - 1][0]];
|
|
622
|
+
|
|
623
|
+
// // remove this now unneeded f64 -> i32 convert
|
|
624
|
+
// wasm.splice(i, 1);
|
|
625
|
+
// }
|
|
626
|
+
// }
|
|
627
|
+
// }
|
|
567
628
|
}
|
|
568
629
|
};
|
package/compiler/disassemble.js
CHANGED
|
@@ -18,7 +18,7 @@ export default (wasm, name = '', ind = 0, locals = {}, params = [], returns = []
|
|
|
18
18
|
}
|
|
19
19
|
|
|
20
20
|
return `(${params.map((x, i) => invValtype[x]).join(', ')}) -> (${returns.map(x => invValtype[x]).join(', ')})`;
|
|
21
|
-
}
|
|
21
|
+
};
|
|
22
22
|
|
|
23
23
|
let out = '', depth = 0;
|
|
24
24
|
if (name) out += `${name}(${ind}) ${makeSignature(params, returns, locals)}\n`;
|
package/compiler/index.js
CHANGED
|
@@ -132,9 +132,9 @@ export default (code, module = undefined) => {
|
|
|
132
132
|
|
|
133
133
|
for (const x of funcs) {
|
|
134
134
|
const preOps = x.wasm.length;
|
|
135
|
-
cyclone(x
|
|
135
|
+
cyclone(x);
|
|
136
136
|
|
|
137
|
-
console.log(`${x.name}: ${preOps} -> ${x.wasm.length} ops`);
|
|
137
|
+
if (preOps !== x.wasm.length) console.log(`${x.name}: ${preOps} -> ${x.wasm.length} ops`);
|
|
138
138
|
}
|
|
139
139
|
opt(funcs, globals, pages, tags, exceptions);
|
|
140
140
|
|
|
@@ -144,7 +144,7 @@ export default (code, module = undefined) => {
|
|
|
144
144
|
console.log(`cyclone size diff: ${oldSize - newSize} bytes (${oldSize} -> ${newSize})\n`);
|
|
145
145
|
} else {
|
|
146
146
|
for (const x of funcs) {
|
|
147
|
-
cyclone(x
|
|
147
|
+
cyclone(x);
|
|
148
148
|
}
|
|
149
149
|
}
|
|
150
150
|
}
|
package/package.json
CHANGED