@fluffylabs/anan-as 1.2.0-ef04361 → 1.3.0-1ebcf8f

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 (85) hide show
  1. package/dist/bin/index.js +138 -5
  2. package/dist/bin/src/fuzz.js +2 -2
  3. package/dist/bin/src/test-json.js +2 -6
  4. package/dist/bin/src/trace-parse.js +1 -0
  5. package/dist/bin/src/trace-replay.js +14 -9
  6. package/dist/bin/src/tracer.js +16 -13
  7. package/dist/bin/src/utils.js +2 -2
  8. package/dist/build/compiler-inline.js +1 -1
  9. package/dist/build/compiler.d.ts +17 -13
  10. package/dist/build/compiler.js +13 -21
  11. package/dist/build/compiler.wasm +0 -0
  12. package/dist/build/debug-inline.js +1 -1
  13. package/dist/build/debug-raw-inline.js +1 -1
  14. package/dist/build/debug-raw.d.ts +34 -32
  15. package/dist/build/debug-raw.js +62 -69
  16. package/dist/build/debug-raw.wasm +0 -0
  17. package/dist/build/debug.d.ts +34 -32
  18. package/dist/build/debug.js +63 -70
  19. package/dist/build/debug.wasm +0 -0
  20. package/dist/build/js/assembly/api-debugger.d.ts +4 -4
  21. package/dist/build/js/assembly/api-debugger.js +6 -6
  22. package/dist/build/js/assembly/api-internal.d.ts +1 -1
  23. package/dist/build/js/assembly/api-internal.js +2 -3
  24. package/dist/build/js/assembly/api-types.d.ts +4 -4
  25. package/dist/build/js/assembly/api-types.js +3 -4
  26. package/dist/build/js/assembly/api-utils.d.ts +14 -6
  27. package/dist/build/js/assembly/api-utils.js +28 -13
  28. package/dist/build/js/assembly/arguments.d.ts +4 -4
  29. package/dist/build/js/assembly/arguments.js +10 -10
  30. package/dist/build/js/assembly/gas.d.ts +8 -13
  31. package/dist/build/js/assembly/gas.js +17 -7
  32. package/dist/build/js/assembly/instructions/bit.js +22 -22
  33. package/dist/build/js/assembly/instructions/branch.js +56 -56
  34. package/dist/build/js/assembly/instructions/jump.js +10 -10
  35. package/dist/build/js/assembly/instructions/load.js +41 -41
  36. package/dist/build/js/assembly/instructions/logic.js +20 -20
  37. package/dist/build/js/assembly/instructions/math.js +105 -105
  38. package/dist/build/js/assembly/instructions/misc.js +10 -10
  39. package/dist/build/js/assembly/instructions/mov.js +16 -16
  40. package/dist/build/js/assembly/instructions/outcome.d.ts +7 -7
  41. package/dist/build/js/assembly/instructions/outcome.js +63 -38
  42. package/dist/build/js/assembly/instructions/rot.js +18 -18
  43. package/dist/build/js/assembly/instructions/set.js +18 -18
  44. package/dist/build/js/assembly/instructions/shift.js +59 -59
  45. package/dist/build/js/assembly/instructions/store.js +29 -29
  46. package/dist/build/js/assembly/instructions/utils.d.ts +6 -4
  47. package/dist/build/js/assembly/instructions/utils.js +32 -16
  48. package/dist/build/js/assembly/instructions.d.ts +2 -3
  49. package/dist/build/js/assembly/instructions.js +4 -4
  50. package/dist/build/js/assembly/interpreter.d.ts +0 -1
  51. package/dist/build/js/assembly/interpreter.js +30 -38
  52. package/dist/build/js/assembly/math.d.ts +6 -8
  53. package/dist/build/js/assembly/math.js +21 -13
  54. package/dist/build/js/assembly/memory-page.d.ts +2 -4
  55. package/dist/build/js/assembly/memory-page.js +13 -7
  56. package/dist/build/js/assembly/memory.d.ts +1 -0
  57. package/dist/build/js/assembly/memory.js +119 -23
  58. package/dist/build/js/assembly/portable.js +1 -0
  59. package/dist/build/js/assembly/program-build.js +4 -4
  60. package/dist/build/js/assembly/program.d.ts +15 -8
  61. package/dist/build/js/assembly/program.js +95 -39
  62. package/dist/build/js/assembly/spi.d.ts +1 -1
  63. package/dist/build/js/assembly/spi.js +2 -2
  64. package/dist/build/js/portable/bootstrap.js +1 -0
  65. package/dist/build/js/portable-bundle.js +829 -641
  66. package/dist/build/release-inline.js +1 -1
  67. package/dist/build/release-mini-inline.js +1 -1
  68. package/dist/build/release-mini.d.ts +34 -32
  69. package/dist/build/release-mini.js +63 -70
  70. package/dist/build/release-mini.wasm +0 -0
  71. package/dist/build/release-stub-inline.js +1 -1
  72. package/dist/build/release-stub.d.ts +34 -32
  73. package/dist/build/release-stub.js +63 -70
  74. package/dist/build/release-stub.wasm +0 -0
  75. package/dist/build/release.d.ts +34 -32
  76. package/dist/build/release.js +63 -70
  77. package/dist/build/release.wasm +0 -0
  78. package/dist/build/test-inline.js +1 -1
  79. package/dist/build/test.wasm +0 -0
  80. package/dist/test/test-gas-cost.js +2 -3
  81. package/dist/test/test-trace-format.js +166 -0
  82. package/dist/test/test-w3f-common.js +1 -2
  83. package/package.json +14 -10
  84. package/dist/build/js/assembly/gas-costs.d.ts +0 -6
  85. package/dist/build/js/assembly/gas-costs.js +0 -39
@@ -1,134 +1,134 @@
1
1
  import { MaybePageFault } from "../memory";
2
2
  import { portable } from "../portable";
3
- import { ok, okOrFault } from "./outcome";
4
- import { reg, u32SignExtend } from "./utils";
3
+ import { OutcomeData } from "./outcome";
4
+ import { Inst } from "./utils";
5
5
  const faultRes = new MaybePageFault();
6
6
  // LOAD_IMM_64
7
7
  export const load_imm_64 = (r, args, registers) => {
8
- registers[reg(args.a)] = portable.u64_add(u64(args.b), u64(args.c) << u64(32));
9
- return ok(r);
8
+ registers[Inst.reg(args.a)] = portable.u64_add(u64(args.b), u64(args.c) << u64(32));
9
+ return OutcomeData.ok(r);
10
10
  };
11
11
  // LOAD_IMM
12
12
  export const load_imm = (r, args, registers) => {
13
- registers[reg(args.a)] = u32SignExtend(args.b);
14
- return ok(r);
13
+ registers[Inst.reg(args.a)] = Inst.u32SignExtend(args.b);
14
+ return OutcomeData.ok(r);
15
15
  };
16
16
  // LOAD_U8
17
17
  export const load_u8 = (r, args, registers, memory) => {
18
18
  const result = memory.getU8(faultRes, args.b);
19
19
  if (!faultRes.isFault) {
20
- registers[reg(args.a)] = result;
20
+ registers[Inst.reg(args.a)] = result;
21
21
  }
22
- return okOrFault(r, faultRes);
22
+ return OutcomeData.okOrFault(r, faultRes);
23
23
  };
24
24
  // LOAD_I8
25
25
  export const load_i8 = (r, args, registers, memory) => {
26
26
  const result = memory.getI8(faultRes, args.b);
27
27
  if (!faultRes.isFault) {
28
- registers[reg(args.a)] = result;
28
+ registers[Inst.reg(args.a)] = result;
29
29
  }
30
- return okOrFault(r, faultRes);
30
+ return OutcomeData.okOrFault(r, faultRes);
31
31
  };
32
32
  // LOAD_U16
33
33
  export const load_u16 = (r, args, registers, memory) => {
34
34
  const result = memory.getU16(faultRes, args.b);
35
35
  if (!faultRes.isFault) {
36
- registers[reg(args.a)] = result;
36
+ registers[Inst.reg(args.a)] = result;
37
37
  }
38
- return okOrFault(r, faultRes);
38
+ return OutcomeData.okOrFault(r, faultRes);
39
39
  };
40
40
  // LOAD_I16
41
41
  export const load_i16 = (r, args, registers, memory) => {
42
42
  const result = memory.getI16(faultRes, args.b);
43
43
  if (!faultRes.isFault) {
44
- registers[reg(args.a)] = result;
44
+ registers[Inst.reg(args.a)] = result;
45
45
  }
46
- return okOrFault(r, faultRes);
46
+ return OutcomeData.okOrFault(r, faultRes);
47
47
  };
48
48
  // LOAD_U32
49
49
  export const load_u32 = (r, args, registers, memory) => {
50
50
  const result = memory.getU32(faultRes, args.b);
51
51
  if (!faultRes.isFault) {
52
- registers[reg(args.a)] = result;
52
+ registers[Inst.reg(args.a)] = result;
53
53
  }
54
- return okOrFault(r, faultRes);
54
+ return OutcomeData.okOrFault(r, faultRes);
55
55
  };
56
56
  // LOAD_I32
57
57
  export const load_i32 = (r, args, registers, memory) => {
58
58
  const result = memory.getI32(faultRes, args.b);
59
59
  if (!faultRes.isFault) {
60
- registers[reg(args.a)] = result;
60
+ registers[Inst.reg(args.a)] = result;
61
61
  }
62
- return okOrFault(r, faultRes);
62
+ return OutcomeData.okOrFault(r, faultRes);
63
63
  };
64
64
  // LOAD_U64
65
65
  export const load_u64 = (r, args, registers, memory) => {
66
66
  const result = memory.getU64(faultRes, args.b);
67
67
  if (!faultRes.isFault) {
68
- registers[reg(args.a)] = result;
68
+ registers[Inst.reg(args.a)] = result;
69
69
  }
70
- return okOrFault(r, faultRes);
70
+ return OutcomeData.okOrFault(r, faultRes);
71
71
  };
72
72
  // LOAD_IND_U8
73
73
  export const load_ind_u8 = (r, args, registers, memory) => {
74
- const address = u32(portable.u64_add(registers[reg(args.a)], u32SignExtend(args.c)));
74
+ const address = u32(portable.u64_add(registers[Inst.reg(args.a)], Inst.u32SignExtend(args.c)));
75
75
  const result = memory.getU8(faultRes, address);
76
76
  if (!faultRes.isFault) {
77
- registers[reg(args.b)] = result;
77
+ registers[Inst.reg(args.b)] = result;
78
78
  }
79
- return okOrFault(r, faultRes);
79
+ return OutcomeData.okOrFault(r, faultRes);
80
80
  };
81
81
  // LOAD_IND_I8
82
82
  export const load_ind_i8 = (r, args, registers, memory) => {
83
- const address = u32(portable.u64_add(registers[reg(args.a)], u32SignExtend(args.c)));
83
+ const address = u32(portable.u64_add(registers[Inst.reg(args.a)], Inst.u32SignExtend(args.c)));
84
84
  const result = memory.getI8(faultRes, address);
85
85
  if (!faultRes.isFault) {
86
- registers[reg(args.b)] = result;
86
+ registers[Inst.reg(args.b)] = result;
87
87
  }
88
- return okOrFault(r, faultRes);
88
+ return OutcomeData.okOrFault(r, faultRes);
89
89
  };
90
90
  // LOAD_IND_U16
91
91
  export const load_ind_u16 = (r, args, registers, memory) => {
92
- const address = u32(portable.u64_add(registers[reg(args.a)], u32SignExtend(args.c)));
92
+ const address = u32(portable.u64_add(registers[Inst.reg(args.a)], Inst.u32SignExtend(args.c)));
93
93
  const result = memory.getU16(faultRes, address);
94
94
  if (!faultRes.isFault) {
95
- registers[reg(args.b)] = result;
95
+ registers[Inst.reg(args.b)] = result;
96
96
  }
97
- return okOrFault(r, faultRes);
97
+ return OutcomeData.okOrFault(r, faultRes);
98
98
  };
99
99
  // LOAD_IND_I16
100
100
  export const load_ind_i16 = (r, args, registers, memory) => {
101
- const address = u32(portable.u64_add(registers[reg(args.a)], u32SignExtend(args.c)));
101
+ const address = u32(portable.u64_add(registers[Inst.reg(args.a)], Inst.u32SignExtend(args.c)));
102
102
  const result = memory.getI16(faultRes, address);
103
103
  if (!faultRes.isFault) {
104
- registers[reg(args.b)] = result;
104
+ registers[Inst.reg(args.b)] = result;
105
105
  }
106
- return okOrFault(r, faultRes);
106
+ return OutcomeData.okOrFault(r, faultRes);
107
107
  };
108
108
  // LOAD_IND_U32
109
109
  export const load_ind_u32 = (r, args, registers, memory) => {
110
- const address = u32(portable.u64_add(registers[reg(args.a)], u32SignExtend(args.c)));
110
+ const address = u32(portable.u64_add(registers[Inst.reg(args.a)], Inst.u32SignExtend(args.c)));
111
111
  const result = memory.getU32(faultRes, address);
112
112
  if (!faultRes.isFault) {
113
- registers[reg(args.b)] = result;
113
+ registers[Inst.reg(args.b)] = result;
114
114
  }
115
- return okOrFault(r, faultRes);
115
+ return OutcomeData.okOrFault(r, faultRes);
116
116
  };
117
117
  // LOAD_IND_I32
118
118
  export const load_ind_i32 = (r, args, registers, memory) => {
119
- const address = u32(portable.u64_add(registers[reg(args.a)], u32SignExtend(args.c)));
119
+ const address = u32(portable.u64_add(registers[Inst.reg(args.a)], Inst.u32SignExtend(args.c)));
120
120
  const result = memory.getI32(faultRes, address);
121
121
  if (!faultRes.isFault) {
122
- registers[reg(args.b)] = result;
122
+ registers[Inst.reg(args.b)] = result;
123
123
  }
124
- return okOrFault(r, faultRes);
124
+ return OutcomeData.okOrFault(r, faultRes);
125
125
  };
126
126
  // LOAD_IND_U64
127
127
  export const load_ind_u64 = (r, args, registers, memory) => {
128
- const address = u32(portable.u64_add(registers[reg(args.a)], u32SignExtend(args.c)));
128
+ const address = u32(portable.u64_add(registers[Inst.reg(args.a)], Inst.u32SignExtend(args.c)));
129
129
  const result = memory.getU64(faultRes, u32(address));
130
130
  if (!faultRes.isFault) {
131
- registers[reg(args.b)] = result;
131
+ registers[Inst.reg(args.b)] = result;
132
132
  }
133
- return okOrFault(r, faultRes);
133
+ return OutcomeData.okOrFault(r, faultRes);
134
134
  };
@@ -1,47 +1,47 @@
1
- import { ok } from "./outcome";
2
- import { reg, u32SignExtend } from "./utils";
1
+ import { OutcomeData } from "./outcome";
2
+ import { Inst } from "./utils";
3
3
  // AND_IMM
4
4
  export const and_imm = (r, args, registers) => {
5
- registers[reg(args.b)] = registers[reg(args.a)] & u32SignExtend(args.c);
6
- return ok(r);
5
+ registers[Inst.reg(args.b)] = registers[Inst.reg(args.a)] & Inst.u32SignExtend(args.c);
6
+ return OutcomeData.ok(r);
7
7
  };
8
8
  // XOR_IMM
9
9
  export const xor_imm = (r, args, registers) => {
10
- registers[reg(args.b)] = registers[reg(args.a)] ^ u32SignExtend(args.c);
11
- return ok(r);
10
+ registers[Inst.reg(args.b)] = registers[Inst.reg(args.a)] ^ Inst.u32SignExtend(args.c);
11
+ return OutcomeData.ok(r);
12
12
  };
13
13
  // OR_IMM
14
14
  export const or_imm = (r, args, registers) => {
15
- registers[reg(args.b)] = registers[reg(args.a)] | u32SignExtend(args.c);
16
- return ok(r);
15
+ registers[Inst.reg(args.b)] = registers[Inst.reg(args.a)] | Inst.u32SignExtend(args.c);
16
+ return OutcomeData.ok(r);
17
17
  };
18
18
  // AND
19
19
  export const and = (r, args, registers) => {
20
- registers[reg(args.c)] = registers[reg(args.b)] & registers[reg(args.a)];
21
- return ok(r);
20
+ registers[Inst.reg(args.c)] = registers[Inst.reg(args.b)] & registers[Inst.reg(args.a)];
21
+ return OutcomeData.ok(r);
22
22
  };
23
23
  // XOR
24
24
  export const xor = (r, args, registers) => {
25
- registers[reg(args.c)] = registers[reg(args.b)] ^ registers[reg(args.a)];
26
- return ok(r);
25
+ registers[Inst.reg(args.c)] = registers[Inst.reg(args.b)] ^ registers[Inst.reg(args.a)];
26
+ return OutcomeData.ok(r);
27
27
  };
28
28
  // OR
29
29
  export const or = (r, args, registers) => {
30
- registers[reg(args.c)] = registers[reg(args.b)] | registers[reg(args.a)];
31
- return ok(r);
30
+ registers[Inst.reg(args.c)] = registers[Inst.reg(args.b)] | registers[Inst.reg(args.a)];
31
+ return OutcomeData.ok(r);
32
32
  };
33
33
  // AND_INV
34
34
  export const and_inv = (r, args, registers) => {
35
- registers[reg(args.c)] = registers[reg(args.b)] & ~registers[reg(args.a)];
36
- return ok(r);
35
+ registers[Inst.reg(args.c)] = registers[Inst.reg(args.b)] & ~registers[Inst.reg(args.a)];
36
+ return OutcomeData.ok(r);
37
37
  };
38
38
  // OR_INV
39
39
  export const or_inv = (r, args, registers) => {
40
- registers[reg(args.c)] = u64(registers[reg(args.b)] | ~registers[reg(args.a)]);
41
- return ok(r);
40
+ registers[Inst.reg(args.c)] = u64(registers[Inst.reg(args.b)] | ~registers[Inst.reg(args.a)]);
41
+ return OutcomeData.ok(r);
42
42
  };
43
43
  // XNOR
44
44
  export const xnor = (r, args, registers) => {
45
- registers[reg(args.c)] = u64(~(registers[reg(args.b)] ^ registers[reg(args.a)]));
46
- return ok(r);
45
+ registers[Inst.reg(args.c)] = u64(~(registers[Inst.reg(args.b)] ^ registers[Inst.reg(args.a)]));
46
+ return OutcomeData.ok(r);
47
47
  };
@@ -1,225 +1,225 @@
1
1
  import { portable } from "../portable";
2
- import { ok } from "./outcome";
3
- import { mulUpperSigned, mulUpperSignedUnsigned, mulUpperUnsigned, reg, u32SignExtend } from "./utils";
2
+ import { OutcomeData } from "./outcome";
3
+ import { Inst, mulUpperSigned, mulUpperSignedUnsigned, mulUpperUnsigned } from "./utils";
4
4
  // ADD_IMM_32
5
5
  export const add_imm_32 = (r, args, registers) => {
6
- const a = registers[reg(args.a)];
7
- const c = u32SignExtend(args.c);
8
- registers[reg(args.b)] = u32SignExtend(u32(portable.u64_add(a, c)));
9
- return ok(r);
6
+ const a = registers[Inst.reg(args.a)];
7
+ const c = Inst.u32SignExtend(args.c);
8
+ registers[Inst.reg(args.b)] = Inst.u32SignExtend(u32(portable.u64_add(a, c)));
9
+ return OutcomeData.ok(r);
10
10
  };
11
11
  // MUL_IMM_32
12
12
  export const mul_imm_32 = (r, args, registers) => {
13
- registers[reg(args.b)] = u32SignExtend(u32(portable.u64_mul(registers[reg(args.a)], u64(args.c))));
14
- return ok(r);
13
+ registers[Inst.reg(args.b)] = Inst.u32SignExtend(u32(portable.u64_mul(registers[Inst.reg(args.a)], u64(args.c))));
14
+ return OutcomeData.ok(r);
15
15
  };
16
16
  // NEG_ADD_IMM_32
17
17
  export const neg_add_imm_32 = (r, args, registers) => {
18
- const sum = portable.u64_sub(u64(args.c) | u64(4294967296), registers[reg(args.a)]);
19
- registers[reg(args.b)] = u32SignExtend(u32(sum));
20
- return ok(r);
18
+ const sum = portable.u64_sub(u64(args.c) | u64(4294967296), registers[Inst.reg(args.a)]);
19
+ registers[Inst.reg(args.b)] = Inst.u32SignExtend(u32(sum));
20
+ return OutcomeData.ok(r);
21
21
  };
22
22
  // ADD_IMM
23
23
  export const add_imm = (r, args, registers) => {
24
- const sum = portable.u64_add(registers[reg(args.a)], u32SignExtend(args.c));
25
- registers[reg(args.b)] = sum;
26
- return ok(r);
24
+ const sum = portable.u64_add(registers[Inst.reg(args.a)], Inst.u32SignExtend(args.c));
25
+ registers[Inst.reg(args.b)] = sum;
26
+ return OutcomeData.ok(r);
27
27
  };
28
28
  // MUL_IMM
29
29
  export const mul_imm = (r, args, registers) => {
30
- registers[reg(args.b)] = portable.u64_mul(registers[reg(args.a)], u32SignExtend(args.c));
31
- return ok(r);
30
+ registers[Inst.reg(args.b)] = portable.u64_mul(registers[Inst.reg(args.a)], Inst.u32SignExtend(args.c));
31
+ return OutcomeData.ok(r);
32
32
  };
33
33
  // NEG_ADD_IMM
34
34
  export const neg_add_imm = (r, args, registers) => {
35
- const sum = portable.u64_sub(u32SignExtend(args.c), registers[reg(args.a)]);
36
- registers[reg(args.b)] = sum;
37
- return ok(r);
35
+ const sum = portable.u64_sub(Inst.u32SignExtend(args.c), registers[Inst.reg(args.a)]);
36
+ registers[Inst.reg(args.b)] = sum;
37
+ return OutcomeData.ok(r);
38
38
  };
39
39
  // ADD_32
40
40
  export const add_32 = (r, args, registers) => {
41
- const a = u32(registers[reg(args.a)]);
42
- const b = u32(registers[reg(args.b)]);
43
- registers[reg(args.c)] = u32SignExtend(a + b);
44
- return ok(r);
41
+ const a = u32(registers[Inst.reg(args.a)]);
42
+ const b = u32(registers[Inst.reg(args.b)]);
43
+ registers[Inst.reg(args.c)] = Inst.u32SignExtend(a + b);
44
+ return OutcomeData.ok(r);
45
45
  };
46
46
  // SUB_32
47
47
  export const sub_32 = (r, args, registers) => {
48
- const a = registers[reg(args.b)];
49
- const b = u64(4294967296 - u32(registers[reg(args.a)]));
50
- registers[reg(args.c)] = u32SignExtend(u32(portable.u64_add(a, b)));
51
- return ok(r);
48
+ const a = registers[Inst.reg(args.b)];
49
+ const b = u64(4294967296 - u32(registers[Inst.reg(args.a)]));
50
+ registers[Inst.reg(args.c)] = Inst.u32SignExtend(u32(portable.u64_add(a, b)));
51
+ return OutcomeData.ok(r);
52
52
  };
53
53
  // MUL_32
54
54
  export const mul_32 = (r, args, registers) => {
55
- registers[reg(args.c)] = u32SignExtend(u32(portable.u64_mul(registers[reg(args.a)], registers[reg(args.b)])));
56
- return ok(r);
55
+ registers[Inst.reg(args.c)] = Inst.u32SignExtend(u32(portable.u64_mul(registers[Inst.reg(args.a)], registers[Inst.reg(args.b)])));
56
+ return OutcomeData.ok(r);
57
57
  };
58
58
  // DIV_U_32
59
59
  export const div_u_32 = (r, args, registers) => {
60
- const a = u32(registers[reg(args.a)]);
60
+ const a = u32(registers[Inst.reg(args.a)]);
61
61
  if (a === 0) {
62
- registers[reg(args.c)] = u64.MAX_VALUE;
62
+ registers[Inst.reg(args.c)] = u64.MAX_VALUE;
63
63
  }
64
64
  else {
65
- const b = u32(registers[reg(args.b)]);
66
- registers[reg(args.c)] = u32SignExtend(b / a);
65
+ const b = u32(registers[Inst.reg(args.b)]);
66
+ registers[Inst.reg(args.c)] = Inst.u32SignExtend(b / a);
67
67
  }
68
- return ok(r);
68
+ return OutcomeData.ok(r);
69
69
  };
70
70
  // DIV_S_32
71
71
  export const div_s_32 = (r, args, registers) => {
72
- const b = i64(u32SignExtend(u32(registers[reg(args.b)])));
73
- const a = i64(u32SignExtend(u32(registers[reg(args.a)])));
72
+ const b = i64(Inst.u32SignExtend(u32(registers[Inst.reg(args.b)])));
73
+ const a = i64(Inst.u32SignExtend(u32(registers[Inst.reg(args.a)])));
74
74
  if (a === i64(0)) {
75
- registers[reg(args.c)] = u64.MAX_VALUE;
75
+ registers[Inst.reg(args.c)] = u64.MAX_VALUE;
76
76
  }
77
77
  else if (a === i64(-1) && b === i64(i32.MIN_VALUE)) {
78
- registers[reg(args.c)] = u64(b);
78
+ registers[Inst.reg(args.c)] = u64(b);
79
79
  }
80
80
  else {
81
- registers[reg(args.c)] = u64(b / a);
81
+ registers[Inst.reg(args.c)] = u64(b / a);
82
82
  }
83
- return ok(r);
83
+ return OutcomeData.ok(r);
84
84
  };
85
85
  // REM_U_32
86
86
  export const rem_u_32 = (r, args, registers) => {
87
- const a = u32(registers[reg(args.a)]);
88
- const b = u32(registers[reg(args.b)]);
87
+ const a = u32(registers[Inst.reg(args.a)]);
88
+ const b = u32(registers[Inst.reg(args.b)]);
89
89
  if (a === 0) {
90
- registers[reg(args.c)] = u32SignExtend(b);
90
+ registers[Inst.reg(args.c)] = Inst.u32SignExtend(b);
91
91
  }
92
92
  else {
93
- registers[reg(args.c)] = u32SignExtend(b % a);
93
+ registers[Inst.reg(args.c)] = Inst.u32SignExtend(b % a);
94
94
  }
95
- return ok(r);
95
+ return OutcomeData.ok(r);
96
96
  };
97
97
  // REM_S_32
98
98
  export const rem_s_32 = (r, args, registers) => {
99
- const b = i32(registers[reg(args.b)]);
100
- const a = i32(registers[reg(args.a)]);
99
+ const b = i32(registers[Inst.reg(args.b)]);
100
+ const a = i32(registers[Inst.reg(args.a)]);
101
101
  if (a === 0) {
102
- registers[reg(args.c)] = u64(i64(b));
102
+ registers[Inst.reg(args.c)] = u64(i64(b));
103
103
  }
104
104
  else if (a === -1 && b === i32.MIN_VALUE) {
105
- registers[reg(args.c)] = u64(0);
105
+ registers[Inst.reg(args.c)] = u64(0);
106
106
  }
107
107
  else {
108
- registers[reg(args.c)] = u64(i64(b) % i64(a));
108
+ registers[Inst.reg(args.c)] = u64(i64(b) % i64(a));
109
109
  }
110
- return ok(r);
110
+ return OutcomeData.ok(r);
111
111
  };
112
112
  // ADD_64
113
113
  export const add_64 = (r, args, registers) => {
114
- const a = registers[reg(args.a)];
115
- const b = registers[reg(args.b)];
116
- registers[reg(args.c)] = portable.u64_add(a, b);
117
- return ok(r);
114
+ const a = registers[Inst.reg(args.a)];
115
+ const b = registers[Inst.reg(args.b)];
116
+ registers[Inst.reg(args.c)] = portable.u64_add(a, b);
117
+ return OutcomeData.ok(r);
118
118
  };
119
119
  // SUB
120
120
  export const sub = (r, args, registers) => {
121
- const a = registers[reg(args.a)];
122
- const b = registers[reg(args.b)];
123
- registers[reg(args.c)] = portable.u64_sub(b, a);
124
- return ok(r);
121
+ const a = registers[Inst.reg(args.a)];
122
+ const b = registers[Inst.reg(args.b)];
123
+ registers[Inst.reg(args.c)] = portable.u64_sub(b, a);
124
+ return OutcomeData.ok(r);
125
125
  };
126
126
  // MUL
127
127
  export const mul = (r, args, registers) => {
128
- const a = registers[reg(args.a)];
129
- const b = registers[reg(args.b)];
130
- registers[reg(args.c)] = portable.u64_mul(a, b);
131
- return ok(r);
128
+ const a = registers[Inst.reg(args.a)];
129
+ const b = registers[Inst.reg(args.b)];
130
+ registers[Inst.reg(args.c)] = portable.u64_mul(a, b);
131
+ return OutcomeData.ok(r);
132
132
  };
133
133
  // DIV_U
134
134
  export const div_u = (r, args, registers) => {
135
- if (registers[reg(args.a)] === u64(0)) {
136
- registers[reg(args.c)] = u64.MAX_VALUE;
135
+ if (registers[Inst.reg(args.a)] === u64(0)) {
136
+ registers[Inst.reg(args.c)] = u64.MAX_VALUE;
137
137
  }
138
138
  else {
139
- registers[reg(args.c)] = registers[reg(args.b)] / registers[reg(args.a)];
139
+ registers[Inst.reg(args.c)] = registers[Inst.reg(args.b)] / registers[Inst.reg(args.a)];
140
140
  }
141
- return ok(r);
141
+ return OutcomeData.ok(r);
142
142
  };
143
143
  // DIV_S
144
144
  export const div_s = (r, args, registers) => {
145
- const b = i64(registers[reg(args.b)]);
146
- const a = i64(registers[reg(args.a)]);
145
+ const b = i64(registers[Inst.reg(args.b)]);
146
+ const a = i64(registers[Inst.reg(args.a)]);
147
147
  if (a === i64(0)) {
148
- registers[reg(args.c)] = u64.MAX_VALUE;
148
+ registers[Inst.reg(args.c)] = u64.MAX_VALUE;
149
149
  }
150
150
  else if (a === i64(-1) && b === i64.MIN_VALUE) {
151
- registers[reg(args.c)] = u64(b);
151
+ registers[Inst.reg(args.c)] = u64(b);
152
152
  }
153
153
  else {
154
- registers[reg(args.c)] = u64(b / a);
154
+ registers[Inst.reg(args.c)] = u64(b / a);
155
155
  }
156
- return ok(r);
156
+ return OutcomeData.ok(r);
157
157
  };
158
158
  // REM_U
159
159
  export const rem_u = (r, args, registers) => {
160
- if (registers[reg(args.a)] === u64(0)) {
161
- registers[reg(args.c)] = registers[reg(args.b)];
160
+ if (registers[Inst.reg(args.a)] === u64(0)) {
161
+ registers[Inst.reg(args.c)] = registers[Inst.reg(args.b)];
162
162
  }
163
163
  else {
164
- registers[reg(args.c)] = registers[reg(args.b)] % registers[reg(args.a)];
164
+ registers[Inst.reg(args.c)] = registers[Inst.reg(args.b)] % registers[Inst.reg(args.a)];
165
165
  }
166
- return ok(r);
166
+ return OutcomeData.ok(r);
167
167
  };
168
168
  // REM_S
169
169
  export const rem_s = (r, args, registers) => {
170
- const b = i64(registers[reg(args.b)]);
171
- const a = i64(registers[reg(args.a)]);
170
+ const b = i64(registers[Inst.reg(args.b)]);
171
+ const a = i64(registers[Inst.reg(args.a)]);
172
172
  if (a === i64(0)) {
173
- registers[reg(args.c)] = u64(b);
173
+ registers[Inst.reg(args.c)] = u64(b);
174
174
  }
175
175
  else if (a === i64(-1) && b === i64.MIN_VALUE) {
176
- registers[reg(args.c)] = u64(0);
176
+ registers[Inst.reg(args.c)] = u64(0);
177
177
  }
178
178
  else {
179
- registers[reg(args.c)] = u64(b % a);
179
+ registers[Inst.reg(args.c)] = u64(b % a);
180
180
  }
181
- return ok(r);
181
+ return OutcomeData.ok(r);
182
182
  };
183
183
  // MUL_UPPER_S_S
184
184
  export const mul_upper_s_s = (r, args, registers) => {
185
- registers[reg(args.c)] = mulUpperSigned(i64(registers[reg(args.b)]), i64(registers[reg(args.a)]));
186
- return ok(r);
185
+ registers[Inst.reg(args.c)] = mulUpperSigned(i64(registers[Inst.reg(args.b)]), i64(registers[Inst.reg(args.a)]));
186
+ return OutcomeData.ok(r);
187
187
  };
188
188
  // MUL_UPPER_U_U
189
189
  export const mul_upper_u_u = (r, args, registers) => {
190
- registers[reg(args.c)] = mulUpperUnsigned(registers[reg(args.b)], registers[reg(args.a)]);
191
- return ok(r);
190
+ registers[Inst.reg(args.c)] = mulUpperUnsigned(registers[Inst.reg(args.b)], registers[Inst.reg(args.a)]);
191
+ return OutcomeData.ok(r);
192
192
  };
193
193
  // MUL_UPPER_S_U
194
194
  export const mul_upper_s_u = (r, args, registers) => {
195
- registers[reg(args.c)] = mulUpperSignedUnsigned(i64(registers[reg(args.b)]), registers[reg(args.a)]);
196
- return ok(r);
195
+ registers[Inst.reg(args.c)] = mulUpperSignedUnsigned(i64(registers[Inst.reg(args.b)]), registers[Inst.reg(args.a)]);
196
+ return OutcomeData.ok(r);
197
197
  };
198
198
  // MAX
199
199
  export const max = (r, args, registers) => {
200
- const a = i64(registers[reg(args.a)]);
201
- const b = i64(registers[reg(args.b)]);
202
- registers[reg(args.c)] = u64(a < b ? b : a);
203
- return ok(r);
200
+ const a = i64(registers[Inst.reg(args.a)]);
201
+ const b = i64(registers[Inst.reg(args.b)]);
202
+ registers[Inst.reg(args.c)] = u64(a < b ? b : a);
203
+ return OutcomeData.ok(r);
204
204
  };
205
205
  // MAX_U
206
206
  export const max_u = (r, args, registers) => {
207
- const a = registers[reg(args.a)];
208
- const b = registers[reg(args.b)];
209
- registers[reg(args.c)] = a < b ? b : a;
210
- return ok(r);
207
+ const a = registers[Inst.reg(args.a)];
208
+ const b = registers[Inst.reg(args.b)];
209
+ registers[Inst.reg(args.c)] = a < b ? b : a;
210
+ return OutcomeData.ok(r);
211
211
  };
212
212
  // MIN
213
213
  export const min = (r, args, registers) => {
214
- const a = i64(registers[reg(args.a)]);
215
- const b = i64(registers[reg(args.b)]);
216
- registers[reg(args.c)] = u64(a > b ? b : a);
217
- return ok(r);
214
+ const a = i64(registers[Inst.reg(args.a)]);
215
+ const b = i64(registers[Inst.reg(args.b)]);
216
+ registers[Inst.reg(args.c)] = u64(a > b ? b : a);
217
+ return OutcomeData.ok(r);
218
218
  };
219
219
  // MIN_U
220
220
  export const min_u = (r, args, registers) => {
221
- const a = registers[reg(args.a)];
222
- const b = registers[reg(args.b)];
223
- registers[reg(args.c)] = a > b ? b : a;
224
- return ok(r);
221
+ const a = registers[Inst.reg(args.a)];
222
+ const b = registers[Inst.reg(args.b)];
223
+ registers[Inst.reg(args.c)] = a > b ? b : a;
224
+ return OutcomeData.ok(r);
225
225
  };
@@ -1,22 +1,22 @@
1
1
  import { MaybePageFault } from "../memory";
2
- import { hostCall, ok, okOrFault, panic } from "./outcome";
3
- import { reg } from "./utils";
2
+ import { OutcomeData } from "./outcome";
3
+ import { Inst } from "./utils";
4
4
  const faultRes = new MaybePageFault();
5
5
  // INVALID
6
- export const INVALID = (r) => panic(r);
6
+ export const INVALID = (r) => OutcomeData.panic(r);
7
7
  // TRAP
8
- export const trap = (r) => panic(r);
8
+ export const trap = (r) => OutcomeData.panic(r);
9
9
  // FALLTHROUGH
10
- export const fallthrough = (r) => ok(r);
10
+ export const fallthrough = (r) => OutcomeData.ok(r);
11
11
  // ECALLI
12
- export const ecalli = (r, args) => hostCall(r, args.a);
12
+ export const ecalli = (r, args) => OutcomeData.hostCall(r, args.a);
13
13
  // SBRK
14
14
  export const sbrk = (r, args, registers, memory) => {
15
- const res = memory.sbrk(faultRes, u32(registers[reg(args.a)]));
15
+ const res = memory.sbrk(faultRes, u32(registers[Inst.reg(args.a)]));
16
16
  // out of memory
17
17
  if (faultRes.isFault) {
18
- return okOrFault(r, faultRes);
18
+ return OutcomeData.okOrFault(r, faultRes);
19
19
  }
20
- registers[reg(args.b)] = res;
21
- return ok(r);
20
+ registers[Inst.reg(args.b)] = res;
21
+ return OutcomeData.ok(r);
22
22
  };
@@ -1,35 +1,35 @@
1
- import { ok } from "./outcome";
2
- import { reg, u32SignExtend } from "./utils";
1
+ import { OutcomeData } from "./outcome";
2
+ import { Inst } from "./utils";
3
3
  // MOVE_REG
4
4
  export const move_reg = (r, args, registers) => {
5
- registers[reg(args.b)] = registers[reg(args.a)];
6
- return ok(r);
5
+ registers[Inst.reg(args.b)] = registers[Inst.reg(args.a)];
6
+ return OutcomeData.ok(r);
7
7
  };
8
8
  // CMOV_IZ_IMM
9
9
  export const cmov_iz_imm = (r, args, registers) => {
10
- if (registers[reg(args.a)] === u64(0)) {
11
- registers[reg(args.b)] = u32SignExtend(args.c);
10
+ if (registers[Inst.reg(args.a)] === u64(0)) {
11
+ registers[Inst.reg(args.b)] = Inst.u32SignExtend(args.c);
12
12
  }
13
- return ok(r);
13
+ return OutcomeData.ok(r);
14
14
  };
15
15
  // CMOV_NZ_IMM
16
16
  export const cmov_nz_imm = (r, args, registers) => {
17
- if (registers[reg(args.a)] !== u64(0)) {
18
- registers[reg(args.b)] = u32SignExtend(args.c);
17
+ if (registers[Inst.reg(args.a)] !== u64(0)) {
18
+ registers[Inst.reg(args.b)] = Inst.u32SignExtend(args.c);
19
19
  }
20
- return ok(r);
20
+ return OutcomeData.ok(r);
21
21
  };
22
22
  // CMOV_IZ
23
23
  export const cmov_iz = (r, args, registers) => {
24
- if (registers[reg(args.a)] === u64(0)) {
25
- registers[reg(args.c)] = registers[reg(args.b)];
24
+ if (registers[Inst.reg(args.a)] === u64(0)) {
25
+ registers[Inst.reg(args.c)] = registers[Inst.reg(args.b)];
26
26
  }
27
- return ok(r);
27
+ return OutcomeData.ok(r);
28
28
  };
29
29
  // CMOV_NZ
30
30
  export const cmov_nz = (r, args, registers) => {
31
- if (registers[reg(args.a)] !== u64(0)) {
32
- registers[reg(args.c)] = registers[reg(args.b)];
31
+ if (registers[Inst.reg(args.a)] !== u64(0)) {
32
+ registers[Inst.reg(args.c)] = registers[Inst.reg(args.b)];
33
33
  }
34
- return ok(r);
34
+ return OutcomeData.ok(r);
35
35
  };