Skip to content

Commit 6795294

Browse files
i582i582
authored
fix: rename XCHG_01_LONG to XCHG_0I_LONG (#9)
1 parent 3a175c3 commit 6795294

File tree

11 files changed

+59
-59
lines changed

11 files changed

+59
-59
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ton-assembly",
3-
"version": "0.2.3",
3+
"version": "0.2.4",
44
"description": "TON assembler and disassembler",
55
"keywords": [
66
"ton",

‎src/generator/instructions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1287,7 +1287,7 @@ export const instructions: Record<string, Opcode> = {
12871287
PUSHINT_16: cat("int_const", mkfixedn(0x81, 8, 16, seq(int16), `exec_push_smallint`)),
12881288
PUSHINT_LONG: cat("int_const", mkextrange(0x820 << 1, (0x820 << 1) + 31, 13, 5, seq(largeInt), `exec_push_int`)),
12891289

1290-
XCHG_01_LONG: cat("stack", mkfixedn(0x11, 8, 8, seq(stack2(8, 1n)), `exec_xchg0_l`)),
1290+
XCHG_0I_LONG: cat("stack", mkfixedn(0x11, 8, 8, seq(stack2(8, 1n)), `exec_xchg0_l`)),
12911291
XCHG_0I: cat("stack", mkfixedrangen(0x02, 0x10, 8, 4, seq(stack2(4, 1n)), `exec_xchg0`)),
12921292
XCHG_IJ: cat("stack", mkfixedn(0x10, 8, 8, xchgArgs, `exec_xchg`)),
12931293
XCHG_1I: cat("stack", mkfixedrangen(0x12, 0x20, 8, 4, seq(s1, stack2(4, 2n)), `exec_xchg1`)),

‎src/runtime/constructors.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7381,13 +7381,13 @@ export type PUSHINT_LONG = {
73817381
arg0: bigint
73827382
loc: $.Loc | undefined
73837383
}
7384-
export const XCHG_01_LONG = (arg0: number, loc?: $.Loc): XCHG_01_LONG => ({
7385-
$: "XCHG_01_LONG",
7384+
export const XCHG_0I_LONG = (arg0: number, loc?: $.Loc): XCHG_0I_LONG => ({
7385+
$: "XCHG_0I_LONG",
73867386
arg0,
73877387
loc,
73887388
})
7389-
export type XCHG_01_LONG = {
7390-
$: "XCHG_01_LONG"
7389+
export type XCHG_0I_LONG = {
7390+
$: "XCHG_0I_LONG"
73917391
arg0: number
73927392
loc: $.Loc | undefined
73937393
}

‎src/runtime/fift-instr.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import {
3939
THROWIFNOT,
4040
THROWIFNOT_SHORT,
4141
XCHG_0I,
42-
XCHG_01_LONG,
42+
XCHG_0I_LONG,
4343
XCHG_IJ,
4444
SDBEGINS,
4545
SDBEGINSQ,
@@ -479,7 +479,7 @@ export const fSTSLICECONST: $.Type<c.fSTSLICECONST> = {
479479
export const fXCHG: $.Type<c.fXCHG> = {
480480
load: s => {
481481
const loaded = instr.load(s)
482-
if (loaded.$ === "XCHG_0I" || loaded.$ === "XCHG_01_LONG") {
482+
if (loaded.$ === "XCHG_0I" || loaded.$ === "XCHG_0I_LONG") {
483483
return {
484484
$: "fXCHG",
485485
arg0: 0,
@@ -529,12 +529,12 @@ export const fXCHG: $.Type<c.fXCHG> = {
529529
)
530530
return
531531
} else {
532-
XCHG_01_LONG.store(
532+
XCHG_0I_LONG.store(
533533
b,
534534
{
535535
...val,
536536
arg0: arg1,
537-
$: "XCHG_01_LONG",
537+
$: "XCHG_0I_LONG",
538538
},
539539
options,
540540
)
@@ -572,30 +572,30 @@ export const fXCHG: $.Type<c.fXCHG> = {
572572
return
573573
}
574574

575-
// For large indices, we need to emit multiple XCHG_01_LONG operations
576-
// XCHG si, sj = XCHG_01_LONG si, XCHG_01_LONG sj, XCHG_01_LONG si
577-
XCHG_01_LONG.store(
575+
// For large indices, we need to emit multiple XCHG_0I_LONG operations
576+
// XCHG si, sj = XCHG_0I_LONG si, XCHG_0I_LONG sj, XCHG_0I_LONG si
577+
XCHG_0I_LONG.store(
578578
b,
579579
{
580-
$: "XCHG_01_LONG",
580+
$: "XCHG_0I_LONG",
581581
arg0: arg0,
582582
loc: val.loc,
583583
},
584584
options,
585585
)
586-
XCHG_01_LONG.store(
586+
XCHG_0I_LONG.store(
587587
b,
588588
{
589-
$: "XCHG_01_LONG",
589+
$: "XCHG_0I_LONG",
590590
arg0: arg1,
591591
loc: val.loc,
592592
},
593593
options,
594594
)
595-
XCHG_01_LONG.store(
595+
XCHG_0I_LONG.store(
596596
b,
597597
{
598-
$: "XCHG_01_LONG",
598+
$: "XCHG_0I_LONG",
599599
arg0: arg0,
600600
loc: val.loc,
601601
},

‎src/runtime/instr-gen.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ export type Instr =
872872
| c.PUSHINT_8
873873
| c.PUSHINT_16
874874
| c.PUSHINT_LONG
875-
| c.XCHG_01_LONG
875+
| c.XCHG_0I_LONG
876876
| c.XCHG_0I
877877
| c.XCHG_IJ
878878
| c.XCHG_1I
@@ -5272,7 +5272,7 @@ export const rangeToType = [
52725272
{
52735273
min: 1114112,
52745274
max: 1179648,
5275-
load: types.XCHG_01_LONG.load,
5275+
load: types.XCHG_0I_LONG.load,
52765276
},
52775277
{
52785278
min: 131072,
@@ -6348,7 +6348,7 @@ storeMapping.set("PUSHINT_4", types.PUSHINT_4.store)
63486348
storeMapping.set("PUSHINT_8", types.PUSHINT_8.store)
63496349
storeMapping.set("PUSHINT_16", types.PUSHINT_16.store)
63506350
storeMapping.set("PUSHINT_LONG", types.PUSHINT_LONG.store)
6351-
storeMapping.set("XCHG_01_LONG", types.XCHG_01_LONG.store)
6351+
storeMapping.set("XCHG_0I_LONG", types.XCHG_0I_LONG.store)
63526352
storeMapping.set("XCHG_0I", types.XCHG_0I.store)
63536353
storeMapping.set("XCHG_IJ", types.XCHG_IJ.store)
63546354
storeMapping.set("XCHG_1I", types.XCHG_1I.store)

‎src/runtime/instr-mapping-gen.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4338,7 +4338,7 @@ export const rangeToName = [
43384338
{
43394339
min: 1114112,
43404340
max: 1179648,
4341-
name: "XCHG_01_LONG",
4341+
name: "XCHG_0I_LONG",
43424342
},
43434343
{
43444344
min: 131072,

‎src/runtime/test/fift.spec.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -391,22 +391,22 @@ describe("Test XCHG Fift instruction", () => {
391391
),
392392
)
393393
it(
394-
"with s0, s16 -> XCHG_01_LONG",
394+
"with s0, s16 -> XCHG_0I_LONG",
395395
test(
396396
[fXCHG(0, 16)],
397397
`
398-
XCHG_01_LONG s16
398+
XCHG_0I_LONG s16
399399
`,
400400
),
401401
)
402402
it(
403-
"with large indices -> triple XCHG_01_LONG sequence",
403+
"with large indices -> triple XCHG_0I_LONG sequence",
404404
test(
405405
[fXCHG(5, 20)],
406406
`
407-
XCHG_01_LONG s5
408-
XCHG_01_LONG s20
409-
XCHG_01_LONG s5
407+
XCHG_0I_LONG s5
408+
XCHG_0I_LONG s20
409+
XCHG_0I_LONG s5
410410
`,
411411
),
412412
)

‎src/runtime/test/testdata/WithExotic.tasm.ts‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2604,24 +2604,24 @@ export const instructions = [
26042604
i.PUSHINT_4(0),
26052605
i.SENDRAWMSG(),
26062606
i.XCHG_0I(6),
2607-
i.XCHG_01_LONG(22),
2607+
i.XCHG_0I_LONG(22),
26082608
i.XCHG_0I(6),
26092609
i.XCHG_0I(5),
2610-
i.XCHG_01_LONG(21),
2610+
i.XCHG_0I_LONG(21),
26112611
i.XCHG_0I(5),
26122612
i.XCHG_0I(4),
2613-
i.XCHG_01_LONG(20),
2613+
i.XCHG_0I_LONG(20),
26142614
i.XCHG_0I(4),
26152615
i.XCHG_0I(3),
2616-
i.XCHG_01_LONG(19),
2616+
i.XCHG_0I_LONG(19),
26172617
i.XCHG_0I(3),
26182618
i.XCHG_0I(2),
2619-
i.XCHG_01_LONG(18),
2619+
i.XCHG_0I_LONG(18),
26202620
i.XCHG_0I(2),
26212621
i.SWAP(),
2622-
i.XCHG_01_LONG(17),
2622+
i.XCHG_0I_LONG(17),
26232623
i.SWAP(),
2624-
i.XCHG_01_LONG(16),
2624+
i.XCHG_0I_LONG(16),
26252625
i.PUSH(13),
26262626
i.CALLREF(
26272627
u.code([
@@ -3286,7 +3286,7 @@ export const instructions = [
32863286
),
32873287
]),
32883288
),
3289-
i.XCHG_01_LONG(17),
3289+
i.XCHG_0I_LONG(17),
32903290
i.CALLREF(
32913291
u.code([
32923292
i.PUSHNULL(),
@@ -3308,7 +3308,7 @@ export const instructions = [
33083308
]),
33093309
),
33103310
i.SWAP(),
3311-
i.XCHG_01_LONG(17),
3311+
i.XCHG_0I_LONG(17),
33123312
i.SWAP(),
33133313
i.DUP2(),
33143314
i.PUSHINT_4(0),
@@ -3355,42 +3355,42 @@ export const instructions = [
33553355
i.EQUAL(),
33563356
i.THROWIFNOT(136),
33573357
i.XCHG_0I(14),
3358-
i.XCHG_01_LONG(17),
3358+
i.XCHG_0I_LONG(17),
33593359
i.XCHG_0I(14),
33603360
i.XCHG_0I(13),
3361-
i.XCHG_01_LONG(16),
3361+
i.XCHG_0I_LONG(16),
33623362
i.XCHG_0I(13),
33633363
i.XCHG_IJ(12, 15),
33643364
i.XCHG_0I(11),
3365-
i.XCHG_01_LONG(17),
3365+
i.XCHG_0I_LONG(17),
33663366
i.XCHG_0I(11),
33673367
i.XCHG_0I(10),
3368-
i.XCHG_01_LONG(16),
3368+
i.XCHG_0I_LONG(16),
33693369
i.XCHG_0I(10),
33703370
i.XCHG_IJ(9, 15),
33713371
i.XCHG_0I(8),
3372-
i.XCHG_01_LONG(17),
3372+
i.XCHG_0I_LONG(17),
33733373
i.XCHG_0I(8),
33743374
i.XCHG_0I(7),
3375-
i.XCHG_01_LONG(16),
3375+
i.XCHG_0I_LONG(16),
33763376
i.XCHG_0I(7),
33773377
i.XCHG_IJ(6, 15),
33783378
i.XCHG_0I(5),
3379-
i.XCHG_01_LONG(24),
3379+
i.XCHG_0I_LONG(24),
33803380
i.XCHG_0I(5),
33813381
i.XCHG_0I(4),
3382-
i.XCHG_01_LONG(23),
3382+
i.XCHG_0I_LONG(23),
33833383
i.XCHG_0I(4),
33843384
i.XCHG_0I(3),
3385-
i.XCHG_01_LONG(22),
3385+
i.XCHG_0I_LONG(22),
33863386
i.XCHG_0I(3),
33873387
i.XCHG_0I(2),
3388-
i.XCHG_01_LONG(21),
3388+
i.XCHG_0I_LONG(21),
33893389
i.XCHG_0I(2),
33903390
i.SWAP(),
3391-
i.XCHG_01_LONG(20),
3391+
i.XCHG_0I_LONG(20),
33923392
i.SWAP(),
3393-
i.XCHG_01_LONG(19),
3393+
i.XCHG_0I_LONG(19),
33943394
i.PSEUDO_PUSHREF(
33953395
u.code([
33963396
i.NEWC(),
@@ -3401,7 +3401,7 @@ export const instructions = [
34013401
1022504860n,
34023402
),
34033403
i.SWAP(),
3404-
i.XCHG_01_LONG(16),
3404+
i.XCHG_0I_LONG(16),
34053405
i.STU(32),
34063406
i.XCHG_1I(1, 14),
34073407
i.STU(64),
@@ -5396,10 +5396,10 @@ export const instructions = [
53965396
i.XCHG_IJ(7, 10),
53975397
i.XCHG_IJ(6, 9),
53985398
i.XCHG_0I(5),
5399-
i.XCHG_01_LONG(17),
5399+
i.XCHG_0I_LONG(17),
54005400
i.XCHG_0I(5),
54015401
i.XCHG_0I(4),
5402-
i.XCHG_01_LONG(16),
5402+
i.XCHG_0I_LONG(16),
54035403
i.XCHG_0I(4),
54045404
i.XCHG_IJ(3, 15),
54055405
i.XCHG3(14, 13, 12),

‎src/runtime/types.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8036,10 +8036,10 @@ export const PUSHINT_LONG: $.Type<c.PUSHINT_LONG> = {
80368036
$.largeInt.store(b, val.arg0, options)
80378037
},
80388038
}
8039-
export const XCHG_01_LONG: $.Type<c.XCHG_01_LONG> = {
8039+
export const XCHG_0I_LONG: $.Type<c.XCHG_0I_LONG> = {
80408040
load: s => {
80418041
s.skip(8)
8042-
return c.XCHG_01_LONG($.uint(8).load(s))
8042+
return c.XCHG_0I_LONG($.uint(8).load(s))
80438043
},
80448044
store: (b, val, options) => {
80458045
b.storeInstructionPrefix(17, 8, val)

‎src/text/convert.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3743,10 +3743,10 @@ export const PUSHINT_LONG: $.Convert = (ctx, instr, loc) => {
37433743
const args = $.singleBigIntArg(instr)
37443744
return c.PUSHINT_LONG(args, loc)
37453745
}
3746-
export const XCHG_01_LONG: $.Convert = (ctx, instr, loc) => {
3746+
export const XCHG_0I_LONG: $.Convert = (ctx, instr, loc) => {
37473747
u.assertSingleArgs(instr, loc)
37483748
const args = $.singleStackArg(instr)
3749-
return c.XCHG_01_LONG(args, loc)
3749+
return c.XCHG_0I_LONG(args, loc)
37503750
}
37513751
export const XCHG_0I: $.Convert = (ctx, instr, loc) => {
37523752
u.assertSingleArgs(instr, loc)
@@ -5801,8 +5801,8 @@ export const convertInstruction = (ctx: $.Ctx, instr: $ast.Instruction, loc: c.u
58015801
return PUSHINT_16(ctx, instr, loc)
58025802
case "PUSHINT_LONG":
58035803
return PUSHINT_LONG(ctx, instr, loc)
5804-
case "XCHG_01_LONG":
5805-
return XCHG_01_LONG(ctx, instr, loc)
5804+
case "XCHG_0I_LONG":
5805+
return XCHG_0I_LONG(ctx, instr, loc)
58065806
case "XCHG_0I":
58075807
return XCHG_0I(ctx, instr, loc)
58085808
case "XCHG_IJ":

0 commit comments

Comments
 (0)