porffor 0.16.0-fe07da0f4 → 0.17.0-55999d22b
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CONTRIBUTING.md +2 -2
- package/README.md +5 -17
- package/compiler/2c.js +123 -75
- package/compiler/allocators.js +128 -0
- package/compiler/assemble.js +12 -5
- package/compiler/builtins/array.ts +72 -5
- package/compiler/builtins/base64.ts +28 -24
- package/compiler/builtins/date.ts +3 -30
- package/compiler/builtins/number.ts +10 -21
- package/compiler/builtins/porffor.d.ts +10 -0
- package/compiler/builtins/set.ts +7 -5
- package/compiler/builtins/string_f64.ts +10 -0
- package/compiler/builtins/z_ecma262.ts +62 -0
- package/compiler/builtins.js +26 -6
- package/compiler/codegen.js +328 -373
- package/compiler/cyclone.js +535 -0
- package/compiler/decompile.js +3 -1
- package/compiler/generated_builtins.js +153 -77
- package/compiler/havoc.js +93 -0
- package/compiler/index.js +104 -7
- package/compiler/opt.js +10 -44
- package/compiler/parse.js +2 -8
- package/compiler/pgo.js +212 -0
- package/compiler/precompile.js +12 -7
- package/compiler/prefs.js +8 -4
- package/compiler/prototype.js +34 -43
- package/compiler/wasmSpec.js +2 -2
- package/compiler/wrap.js +55 -13
- package/package.json +3 -5
- package/runner/index.js +26 -11
- /package/runner/{profiler.js → profile.js} +0 -0
@@ -0,0 +1,535 @@
|
|
1
|
+
// cyclone: wasm partial constant evaluator (it is fast and dangerous hence "cyclone")
|
2
|
+
import { signedLEB128, ieee754_binary64, read_ieee754_binary64, read_signedLEB128 } from './encoding.js';
|
3
|
+
import { Opcodes, Valtype } from './wasmSpec.js';
|
4
|
+
|
5
|
+
const number = (n, valtype = valtypeBinary) => {
|
6
|
+
switch (valtype) {
|
7
|
+
case Valtype.i32: return [ Opcodes.i32_const, ...signedLEB128(n) ];
|
8
|
+
case Valtype.i64: return [ Opcodes.i64_const, ...signedLEB128(n) ];
|
9
|
+
case Valtype.f64: return [ Opcodes.f64_const, ...ieee754_binary64(n) ];
|
10
|
+
}
|
11
|
+
};
|
12
|
+
|
13
|
+
const f64ToI32Op = {
|
14
|
+
[Opcodes.f64_eq]: Opcodes.i32_eq,
|
15
|
+
[Opcodes.f64_ne]: Opcodes.i32_ne,
|
16
|
+
[Opcodes.f64_lt]: Opcodes.i32_lt_s,
|
17
|
+
[Opcodes.f64_le]: Opcodes.i32_le_s,
|
18
|
+
[Opcodes.f64_gt]: Opcodes.i32_gt_s,
|
19
|
+
[Opcodes.f64_ge]: Opcodes.i32_ge_s,
|
20
|
+
[Opcodes.f64_add]: Opcodes.i32_add,
|
21
|
+
[Opcodes.f64_sub]: Opcodes.i32_sub,
|
22
|
+
[Opcodes.f64_mul]: Opcodes.i32_mul,
|
23
|
+
[Opcodes.f64_div]: Opcodes.i32_div_s,
|
24
|
+
};
|
25
|
+
|
26
|
+
export default wasm => {
|
27
|
+
let stack = []; // """""stack"""""
|
28
|
+
for (let i = 0; i < wasm.length; i++) {
|
29
|
+
let op = wasm[i];
|
30
|
+
if (!op) continue;
|
31
|
+
|
32
|
+
// op = [ ...op.filter(x => x != null && x <= 0xff) ];
|
33
|
+
op = [ ...op ];
|
34
|
+
wasm[i] = op;
|
35
|
+
|
36
|
+
let opcode = op[0];
|
37
|
+
if (opcode === 0xfc) { // multibyte op
|
38
|
+
opcode = (opcode << 8) + op[1];
|
39
|
+
}
|
40
|
+
|
41
|
+
const push = val => {
|
42
|
+
stack.push({ val, op });
|
43
|
+
};
|
44
|
+
|
45
|
+
const pop = () => {
|
46
|
+
const popped = stack.pop();
|
47
|
+
|
48
|
+
// remove the op
|
49
|
+
wasm.splice(wasm.indexOf(popped.op), 1);
|
50
|
+
i--;
|
51
|
+
|
52
|
+
return popped.val;
|
53
|
+
};
|
54
|
+
|
55
|
+
const pop2 = () => [ pop(), pop() ];
|
56
|
+
|
57
|
+
const bool = v => v ? 1 : 0;
|
58
|
+
|
59
|
+
const replaceOp = newOp => {
|
60
|
+
op.splice(0, op.length, ...newOp);
|
61
|
+
};
|
62
|
+
const replaceVal = (val, valtype) => replaceOp(number(val, valtype));
|
63
|
+
|
64
|
+
const empty = () => {
|
65
|
+
stack = [];
|
66
|
+
};
|
67
|
+
|
68
|
+
switch (opcode) {
|
69
|
+
case Opcodes.i32_const: {
|
70
|
+
const n = read_signedLEB128(op.slice(1));
|
71
|
+
push(n);
|
72
|
+
break;
|
73
|
+
}
|
74
|
+
case Opcodes.f64_const: {
|
75
|
+
const n = read_ieee754_binary64(op.slice(1));
|
76
|
+
push(n);
|
77
|
+
break;
|
78
|
+
}
|
79
|
+
|
80
|
+
case Opcodes.i32_eqz: {
|
81
|
+
if (stack.length < 1) { empty(); break; };
|
82
|
+
const v = bool(pop() === 0);
|
83
|
+
|
84
|
+
replaceVal(v, Valtype.i32);
|
85
|
+
push(v);
|
86
|
+
break;
|
87
|
+
}
|
88
|
+
case Opcodes.i32_eq: {
|
89
|
+
if (stack.length < 2) { empty(); break; };
|
90
|
+
const [ b, a ] = pop2();
|
91
|
+
const v = bool(a === b);
|
92
|
+
|
93
|
+
replaceVal(v, Valtype.i32);
|
94
|
+
push(v);
|
95
|
+
break;
|
96
|
+
}
|
97
|
+
case Opcodes.i32_ne: {
|
98
|
+
if (stack.length < 2) { empty(); break; };
|
99
|
+
const [ b, a ] = pop2();
|
100
|
+
const v = bool(a !== b);
|
101
|
+
|
102
|
+
replaceVal(v, Valtype.i32);
|
103
|
+
push(v);
|
104
|
+
break;
|
105
|
+
}
|
106
|
+
case Opcodes.i32_lt_s: {
|
107
|
+
if (stack.length < 2) { empty(); break; };
|
108
|
+
const [ b, a ] = pop2();
|
109
|
+
const v = bool(a < b);
|
110
|
+
|
111
|
+
replaceVal(v, Valtype.i32);
|
112
|
+
push(v);
|
113
|
+
break;
|
114
|
+
}
|
115
|
+
case Opcodes.i32_le_s: {
|
116
|
+
if (stack.length < 2) { empty(); break; };
|
117
|
+
const [ b, a ] = pop2();
|
118
|
+
const v = bool(a <= b);
|
119
|
+
|
120
|
+
replaceVal(v, Valtype.i32);
|
121
|
+
push(v);
|
122
|
+
break;
|
123
|
+
}
|
124
|
+
case Opcodes.i32_gt_s: {
|
125
|
+
if (stack.length < 2) { empty(); break; };
|
126
|
+
const [ b, a ] = pop2();
|
127
|
+
const v = bool(a > b);
|
128
|
+
|
129
|
+
replaceVal(v, Valtype.i32);
|
130
|
+
push(v);
|
131
|
+
break;
|
132
|
+
}
|
133
|
+
case Opcodes.i32_ge_s: {
|
134
|
+
if (stack.length < 2) { empty(); break; };
|
135
|
+
const [ b, a ] = pop2();
|
136
|
+
const v = bool(a >= b);
|
137
|
+
|
138
|
+
replaceVal(v, Valtype.i32);
|
139
|
+
push(v);
|
140
|
+
break;
|
141
|
+
}
|
142
|
+
|
143
|
+
case Opcodes.i32_add: {
|
144
|
+
if (stack.length < 2) { empty(); break; };
|
145
|
+
const [ b, a ] = pop2();
|
146
|
+
const v = a + b;
|
147
|
+
|
148
|
+
replaceVal(v, Valtype.i32);
|
149
|
+
push(v);
|
150
|
+
break;
|
151
|
+
}
|
152
|
+
case Opcodes.i32_sub: {
|
153
|
+
if (stack.length < 2) { empty(); break; };
|
154
|
+
const [ b, a ] = pop2();
|
155
|
+
const v = a - b;
|
156
|
+
|
157
|
+
replaceVal(v, Valtype.i32);
|
158
|
+
push(v);
|
159
|
+
break;
|
160
|
+
}
|
161
|
+
case Opcodes.i32_mul: {
|
162
|
+
if (stack.length < 2) { empty(); break; };
|
163
|
+
const [ b, a ] = pop2();
|
164
|
+
const v = a * b;
|
165
|
+
|
166
|
+
replaceVal(v, Valtype.i32);
|
167
|
+
push(v);
|
168
|
+
break;
|
169
|
+
}
|
170
|
+
case Opcodes.i32_div_s: {
|
171
|
+
if (stack.length < 2) { empty(); break; };
|
172
|
+
const [ b, a ] = pop2();
|
173
|
+
const v = a / b;
|
174
|
+
|
175
|
+
replaceVal(v, Valtype.i32);
|
176
|
+
push(v);
|
177
|
+
break;
|
178
|
+
}
|
179
|
+
case Opcodes.i32_rem_s: {
|
180
|
+
if (stack.length < 2) { empty(); break; };
|
181
|
+
const [ b, a ] = pop2();
|
182
|
+
const v = a % b; // not rem but good enough
|
183
|
+
|
184
|
+
replaceVal(v, Valtype.i32);
|
185
|
+
push(v);
|
186
|
+
break;
|
187
|
+
}
|
188
|
+
|
189
|
+
case Opcodes.i32_and: {
|
190
|
+
if (stack.length < 2) { empty(); break; };
|
191
|
+
const [ b, a ] = pop2();
|
192
|
+
const v = a & b;
|
193
|
+
|
194
|
+
replaceVal(v, Valtype.i32);
|
195
|
+
push(v);
|
196
|
+
break;
|
197
|
+
}
|
198
|
+
case Opcodes.i32_or: {
|
199
|
+
if (stack.length < 2) { empty(); break; };
|
200
|
+
const [ b, a ] = pop2();
|
201
|
+
const v = a | b;
|
202
|
+
|
203
|
+
replaceVal(v, Valtype.i32);
|
204
|
+
push(v);
|
205
|
+
break;
|
206
|
+
}
|
207
|
+
case Opcodes.i32_xor: {
|
208
|
+
if (stack.length < 2) { empty(); break; };
|
209
|
+
const [ b, a ] = pop2();
|
210
|
+
const v = a ^ b;
|
211
|
+
|
212
|
+
replaceVal(v, Valtype.i32);
|
213
|
+
push(v);
|
214
|
+
break;
|
215
|
+
}
|
216
|
+
case Opcodes.i32_shl: {
|
217
|
+
if (stack.length < 2) { empty(); break; };
|
218
|
+
const [ b, a ] = pop2();
|
219
|
+
const v = a << b;
|
220
|
+
|
221
|
+
replaceVal(v, Valtype.i32);
|
222
|
+
push(v);
|
223
|
+
break;
|
224
|
+
}
|
225
|
+
case Opcodes.i32_shr_s: {
|
226
|
+
if (stack.length < 2) { empty(); break; };
|
227
|
+
const [ b, a ] = pop2();
|
228
|
+
const v = a >> b;
|
229
|
+
|
230
|
+
replaceVal(v, Valtype.i32);
|
231
|
+
push(v);
|
232
|
+
break;
|
233
|
+
}
|
234
|
+
case Opcodes.i32_shr_u: {
|
235
|
+
if (stack.length < 2) { empty(); break; };
|
236
|
+
const [ b, a ] = pop2();
|
237
|
+
const v = a >>> b;
|
238
|
+
|
239
|
+
replaceVal(v, Valtype.i32);
|
240
|
+
push(v);
|
241
|
+
break;
|
242
|
+
}
|
243
|
+
|
244
|
+
case Opcodes.f64_eq: {
|
245
|
+
if (stack.length < 2) { empty(); break; };
|
246
|
+
const [ b, a ] = pop2();
|
247
|
+
const v = bool(a === b);
|
248
|
+
|
249
|
+
replaceVal(v, Valtype.i32);
|
250
|
+
push(v);
|
251
|
+
break;
|
252
|
+
}
|
253
|
+
case Opcodes.f64_ne: {
|
254
|
+
if (stack.length < 2) { empty(); break; };
|
255
|
+
const [ b, a ] = pop2();
|
256
|
+
const v = bool(a !== b);
|
257
|
+
|
258
|
+
replaceVal(v, Valtype.i32);
|
259
|
+
push(v);
|
260
|
+
break;
|
261
|
+
}
|
262
|
+
case Opcodes.f64_lt: {
|
263
|
+
if (stack.length < 2) { empty(); break; };
|
264
|
+
const [ b, a ] = pop2();
|
265
|
+
const v = bool(a < b);
|
266
|
+
|
267
|
+
replaceVal(v, Valtype.i32);
|
268
|
+
push(v);
|
269
|
+
break;
|
270
|
+
}
|
271
|
+
case Opcodes.f64_le: {
|
272
|
+
if (stack.length < 2) { empty(); break; };
|
273
|
+
const [ b, a ] = pop2();
|
274
|
+
const v = bool(a <= b);
|
275
|
+
|
276
|
+
replaceVal(v, Valtype.i32);
|
277
|
+
push(v);
|
278
|
+
break;
|
279
|
+
}
|
280
|
+
case Opcodes.f64_gt: {
|
281
|
+
if (stack.length < 2) { empty(); break; };
|
282
|
+
const [ b, a ] = pop2();
|
283
|
+
const v = bool(a > b);
|
284
|
+
|
285
|
+
replaceVal(v, Valtype.i32);
|
286
|
+
push(v);
|
287
|
+
break;
|
288
|
+
}
|
289
|
+
case Opcodes.f64_ge: {
|
290
|
+
if (stack.length < 2) { empty(); break; };
|
291
|
+
const [ b, a ] = pop2();
|
292
|
+
const v = bool(a >= b);
|
293
|
+
|
294
|
+
replaceVal(v, Valtype.i32);
|
295
|
+
push(v);
|
296
|
+
break;
|
297
|
+
}
|
298
|
+
|
299
|
+
case Opcodes.f64_abs: {
|
300
|
+
if (stack.length < 1) { empty(); break; };
|
301
|
+
const v = Math.abs(pop());
|
302
|
+
|
303
|
+
replaceVal(v, Valtype.f64);
|
304
|
+
push(v);
|
305
|
+
break;
|
306
|
+
}
|
307
|
+
case Opcodes.f64_neg: {
|
308
|
+
if (stack.length < 1) { empty(); break; };
|
309
|
+
const v = -pop();
|
310
|
+
|
311
|
+
replaceVal(v, Valtype.f64);
|
312
|
+
push(v);
|
313
|
+
break;
|
314
|
+
}
|
315
|
+
|
316
|
+
case Opcodes.f64_ceil: {
|
317
|
+
if (stack.length < 1) { empty(); break; };
|
318
|
+
const v = Math.ceil(pop());
|
319
|
+
|
320
|
+
replaceVal(v, Valtype.f64);
|
321
|
+
push(v);
|
322
|
+
break;
|
323
|
+
}
|
324
|
+
case Opcodes.f64_floor: {
|
325
|
+
if (stack.length < 1) { empty(); break; };
|
326
|
+
const v = Math.floor(pop());
|
327
|
+
|
328
|
+
replaceVal(v, Valtype.f64);
|
329
|
+
push(v);
|
330
|
+
break;
|
331
|
+
}
|
332
|
+
case Opcodes.f64_trunc: {
|
333
|
+
if (stack.length < 1) { empty(); break; };
|
334
|
+
const v = Math.trunc(pop());
|
335
|
+
|
336
|
+
replaceVal(v, Valtype.f64);
|
337
|
+
push(v);
|
338
|
+
break;
|
339
|
+
}
|
340
|
+
case Opcodes.f64_nearest: {
|
341
|
+
if (stack.length < 1) { empty(); break; };
|
342
|
+
const v = Math.round(pop());
|
343
|
+
|
344
|
+
replaceVal(v, Valtype.f64);
|
345
|
+
push(v);
|
346
|
+
break;
|
347
|
+
}
|
348
|
+
|
349
|
+
case Opcodes.f64_sqrt: {
|
350
|
+
if (stack.length < 1) { empty(); break; };
|
351
|
+
const v = Math.sqrt(pop());
|
352
|
+
|
353
|
+
replaceVal(v, Valtype.f64);
|
354
|
+
push(v);
|
355
|
+
break;
|
356
|
+
}
|
357
|
+
|
358
|
+
case Opcodes.f64_add: {
|
359
|
+
if (stack.length < 2) { empty(); break; };
|
360
|
+
const [ b, a ] = pop2();
|
361
|
+
const v = a + b;
|
362
|
+
|
363
|
+
replaceVal(v, Valtype.f64);
|
364
|
+
push(v);
|
365
|
+
break;
|
366
|
+
}
|
367
|
+
case Opcodes.f64_sub: {
|
368
|
+
if (stack.length < 2) { empty(); break; };
|
369
|
+
const [ b, a ] = pop2();
|
370
|
+
const v = a - b;
|
371
|
+
|
372
|
+
replaceVal(v, Valtype.f64);
|
373
|
+
push(v);
|
374
|
+
break;
|
375
|
+
}
|
376
|
+
case Opcodes.f64_mul: {
|
377
|
+
if (stack.length < 2) { empty(); break; };
|
378
|
+
const [ b, a ] = pop2();
|
379
|
+
const v = a * b;
|
380
|
+
|
381
|
+
replaceVal(v, Valtype.f64);
|
382
|
+
push(v);
|
383
|
+
break;
|
384
|
+
}
|
385
|
+
case Opcodes.f64_div: {
|
386
|
+
if (stack.length < 2) { empty(); break; };
|
387
|
+
const [ b, a ] = pop2();
|
388
|
+
const v = a / b;
|
389
|
+
|
390
|
+
replaceVal(v, Valtype.f64);
|
391
|
+
push(v);
|
392
|
+
break;
|
393
|
+
}
|
394
|
+
|
395
|
+
case Opcodes.f64_min: {
|
396
|
+
if (stack.length < 2) { empty(); break; };
|
397
|
+
const [ b, a ] = pop2();
|
398
|
+
const v = Math.min(a, b);
|
399
|
+
|
400
|
+
replaceVal(v, Valtype.f64);
|
401
|
+
push(v);
|
402
|
+
break;
|
403
|
+
}
|
404
|
+
case Opcodes.f64_max: {
|
405
|
+
if (stack.length < 2) { empty(); break; };
|
406
|
+
const [ b, a ] = pop2();
|
407
|
+
const v = Math.max(a, b);
|
408
|
+
|
409
|
+
replaceVal(v, Valtype.f64);
|
410
|
+
push(v);
|
411
|
+
break;
|
412
|
+
}
|
413
|
+
|
414
|
+
case Opcodes.f64_copysign: { // ?
|
415
|
+
if (stack.length < 2) { empty(); break; };
|
416
|
+
const [ b, a ] = pop2();
|
417
|
+
const v = Math.abs(a) * (b > 0 ? 1 : -1);
|
418
|
+
|
419
|
+
replaceVal(v, Valtype.f64);
|
420
|
+
push(v);
|
421
|
+
break;
|
422
|
+
}
|
423
|
+
|
424
|
+
case Opcodes.f64_convert_i32_u:
|
425
|
+
case Opcodes.f64_convert_i32_s: {
|
426
|
+
if (stack.length < 1) { empty(); break; };
|
427
|
+
const v = pop();
|
428
|
+
|
429
|
+
replaceVal(v, Valtype.f64);
|
430
|
+
push(v);
|
431
|
+
break;
|
432
|
+
}
|
433
|
+
|
434
|
+
case 0xfc02: { // i32_trunc_sat_f64_s
|
435
|
+
if (stack.length < 1) { empty(); break; }
|
436
|
+
const v = pop();
|
437
|
+
|
438
|
+
replaceVal(v, Valtype.i32);
|
439
|
+
push(v);
|
440
|
+
break;
|
441
|
+
}
|
442
|
+
|
443
|
+
case 0xfc03: { // i32_trunc_sat_f64_u
|
444
|
+
if (stack.length < 1) { empty(); break; }
|
445
|
+
const v = pop();
|
446
|
+
|
447
|
+
replaceVal(v, Valtype.i32);
|
448
|
+
push(v);
|
449
|
+
break;
|
450
|
+
}
|
451
|
+
|
452
|
+
default: {
|
453
|
+
empty();
|
454
|
+
break;
|
455
|
+
}
|
456
|
+
}
|
457
|
+
|
458
|
+
// this does, eg:
|
459
|
+
// local.get 7 ;; $i (i32)
|
460
|
+
// f64.convert_i32_s
|
461
|
+
// f64.const 1
|
462
|
+
// f64.add
|
463
|
+
// i32.trunc_sat_f64_s <--
|
464
|
+
// local.set 7 ;; $i (i32)
|
465
|
+
// ->
|
466
|
+
// local.get 7 ;; $i (i32)
|
467
|
+
// i32.const 1
|
468
|
+
// i32.add
|
469
|
+
// local.set 7 ;; $i (i32)
|
470
|
+
if (i >= 2 &&
|
471
|
+
((opcode >= 0xa0 && opcode <= 0xa3) || // main f64 math op
|
472
|
+
(opcode >= 0x61 && opcode <= 0x66)) // main f64 eq op
|
473
|
+
) {
|
474
|
+
const o2 = wasm[i - 1][0];
|
475
|
+
if (o2 === Opcodes.f64_const) { // f64.const
|
476
|
+
const o3 = wasm[i - 2][0];
|
477
|
+
if (o3 === Opcodes.f64_convert_i32_s || o3 === Opcodes.f64_convert_i32_u) {
|
478
|
+
// remove now unneeded i32 -> f64 convert
|
479
|
+
wasm.splice(i - 2, 1);
|
480
|
+
i--;
|
481
|
+
|
482
|
+
// convert f64.const -> i32.const
|
483
|
+
const n = read_ieee754_binary64(wasm[i - 1].slice(1));
|
484
|
+
wasm.splice(i - 1, 1, number(n, Valtype.i32));
|
485
|
+
|
486
|
+
// convert math op from f64 to i32
|
487
|
+
wasm[i][0] = f64ToI32Op[wasm[i][0]];
|
488
|
+
|
489
|
+
const nextOp = wasm[i + 1];
|
490
|
+
if (nextOp && opcode >= 0xa0 && opcode <= 0xa3) {
|
491
|
+
if (nextOp[0] === 0xfc && (nextOp[1] === 0x02 || nextOp[1] === 0x03)) {
|
492
|
+
// remove optional unneeded f64 -> i32 convert after
|
493
|
+
wasm.splice(i + 1, 1);
|
494
|
+
} else {
|
495
|
+
// add now needed i32 -> f64 convert after
|
496
|
+
wasm.splice(i + 1, Opcodes.i32_trunc_sat_f64_s);
|
497
|
+
}
|
498
|
+
}
|
499
|
+
}
|
500
|
+
}
|
501
|
+
}
|
502
|
+
|
503
|
+
if ((opcode === 0xfc02 || opcode === 0xfc03) && i >= 3) { // i32.trunc_sat_f64_s/u
|
504
|
+
const o2 = wasm[i - 1][0];
|
505
|
+
if (
|
506
|
+
(o2 >= 0xa0 && o2 <= 0xa3) || // main f64 math op
|
507
|
+
(o2 >= 0x61 && o2 <= 0x66) // main f64 eq op
|
508
|
+
) {
|
509
|
+
const o3 = wasm[i - 2][0];
|
510
|
+
if (o3 === Opcodes.f64_const) { // f64.const
|
511
|
+
const o4 = wasm[i - 3][0];
|
512
|
+
if (o4 === Opcodes.f64_convert_i32_s || o4 === Opcodes.f64_convert_i32_u) {
|
513
|
+
// remove now unneeded i32 -> f64 convert
|
514
|
+
wasm.splice(i - 3, 1);
|
515
|
+
i--;
|
516
|
+
} else {
|
517
|
+
// add now needed f64 -> i32 convert prior
|
518
|
+
wasm.splice(i - 2, 0, Opcodes.i32_trunc_sat_f64_s);
|
519
|
+
i++;
|
520
|
+
}
|
521
|
+
|
522
|
+
// convert f64.const -> i32.const
|
523
|
+
const n = read_ieee754_binary64(wasm[i - 2].slice(1));
|
524
|
+
wasm.splice(i - 2, 1, number(n, Valtype.i32));
|
525
|
+
|
526
|
+
// convert math op from f64 to i32
|
527
|
+
wasm[i - 1][0] = f64ToI32Op[wasm[i - 1][0]];
|
528
|
+
|
529
|
+
// remove this now unneeded f64 -> i32 convert
|
530
|
+
wasm.splice(i, 1);
|
531
|
+
}
|
532
|
+
}
|
533
|
+
}
|
534
|
+
}
|
535
|
+
};
|
package/compiler/decompile.js
CHANGED
@@ -4,6 +4,8 @@ import { read_ieee754_binary64, read_signedLEB128, read_unsignedLEB128 } from '.
|
|
4
4
|
const inv = (obj, keyMap = x => x) => Object.keys(obj).reduce((acc, x) => { acc[keyMap(obj[x])] = x; return acc; }, {});
|
5
5
|
const invOpcodes = inv(Opcodes);
|
6
6
|
const invValtype = inv(Valtype);
|
7
|
+
globalThis.invOpcodes = invOpcodes;
|
8
|
+
globalThis.invValtype = invValtype;
|
7
9
|
|
8
10
|
export default (wasm, name = '', ind = 0, locals = {}, params = [], returns = [], funcs = [], globals = {}, exceptions = []) => {
|
9
11
|
const invLocals = inv(locals, x => x.idx);
|
@@ -91,7 +93,7 @@ export default (wasm, name = '', ind = 0, locals = {}, params = [], returns = []
|
|
91
93
|
if (callFunc) out += ` ;; $${callFunc.name} ${makeSignature(callFunc.params, callFunc.returns)}`;
|
92
94
|
if (globalThis.importFuncs && inst[1] < importFuncs.length) {
|
93
95
|
const importFunc = importFuncs[inst[1]];
|
94
|
-
out += ` ;; import ${importFunc.name} ${makeSignature(new Array(importFunc.params).fill(valtypeBinary), new Array(importFunc.returns).fill(valtypeBinary),)}`;
|
96
|
+
out += ` ;; import ${importFunc.name} ${makeSignature(typeof importFunc.params === 'object' ? importFunc.params : new Array(importFunc.params).fill(valtypeBinary), new Array(importFunc.returns).fill(valtypeBinary),)}`;
|
95
97
|
}
|
96
98
|
}
|
97
99
|
|