Skip to content

Commit e4a24e9

Browse files
xunilrjxunilrj
committed
fix rebase issues
1 parent faccb21 commit e4a24e9

File tree

6 files changed

+57
-292
lines changed

6 files changed

+57
-292
lines changed

‎test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json

+17-17
Original file line numberDiff line numberDiff line change
@@ -74,87 +74,87 @@
7474
{
7575
"concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903",
7676
"name": "BOOL",
77-
"offset": 7700
77+
"offset": 7612
7878
},
7979
{
8080
"concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
8181
"name": "U8",
82-
"offset": 7795
82+
"offset": 7707
8383
},
8484
{
8585
"concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
8686
"name": "ANOTHER_U8",
87-
"offset": 7640
87+
"offset": 7552
8888
},
8989
{
9090
"concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef",
9191
"name": "U16",
92-
"offset": 7749
92+
"offset": 7661
9393
},
9494
{
9595
"concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc",
9696
"name": "U32",
97-
"offset": 7783
97+
"offset": 7695
9898
},
9999
{
100100
"concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0",
101101
"name": "U64",
102-
"offset": 7787
102+
"offset": 7699
103103
},
104104
{
105105
"concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e",
106106
"name": "U256",
107-
"offset": 7751
107+
"offset": 7663
108108
},
109109
{
110110
"concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b",
111111
"name": "B256",
112-
"offset": 7668
112+
"offset": 7580
113113
},
114114
{
115115
"concreteTypeId": "81fc10c4681a3271cf2d66b2ec6fbc8ed007a442652930844fcf11818c295bff",
116116
"name": "CONFIGURABLE_STRUCT",
117-
"offset": 7726
117+
"offset": 7638
118118
},
119119
{
120120
"concreteTypeId": "a2922861f03be8a650595dd76455b95383a61b46dd418f02607fa2e00dc39d5c",
121121
"name": "CONFIGURABLE_ENUM_A",
122-
"offset": 7701
122+
"offset": 7613
123123
},
124124
{
125125
"concreteTypeId": "a2922861f03be8a650595dd76455b95383a61b46dd418f02607fa2e00dc39d5c",
126126
"name": "CONFIGURABLE_ENUM_B",
127-
"offset": 7710
127+
"offset": 7622
128128
},
129129
{
130130
"concreteTypeId": "4926d35d1a5157936b0a29bc126b8aace6d911209a5c130e9b716b0c73643ea6",
131131
"name": "ARRAY_BOOL",
132-
"offset": 7641
132+
"offset": 7553
133133
},
134134
{
135135
"concreteTypeId": "776fb5a3824169d6736138565fdc20aad684d9111266a5ff6d5c675280b7e199",
136136
"name": "ARRAY_U64",
137-
"offset": 7644
137+
"offset": 7556
138138
},
139139
{
140140
"concreteTypeId": "c998ca9a5f221fe7b5c66ae70c8a9562b86d964408b00d17f883c906bc1fe4be",
141141
"name": "TUPLE_BOOL_U64",
142-
"offset": 7740
142+
"offset": 7652
143143
},
144144
{
145145
"concreteTypeId": "94f0fa95c830be5e4f711963e83259fe7e8bc723278ab6ec34449e791a99b53a",
146146
"name": "STR_4",
147-
"offset": 7736
147+
"offset": 7648
148148
},
149149
{
150150
"concreteTypeId": "27a0fb3d3a821e04e7a3f17ab6a617f0eb10f11e6eeb0f2c0ff9e6237207319e",
151151
"name": "VEC_U8",
152-
"offset": 7796
152+
"offset": 7708
153153
},
154154
{
155155
"concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
156156
"name": "NOT_USED",
157-
"offset": 7735
157+
"offset": 7647
158158
}
159159
],
160160
"encodingVersion": "1",

‎test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/test.toml

+17-17
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ validate_abi = true
55
expected_warnings = 1
66
unsupported_profiles = ["debug"]
77

8-
# check: $()Configurable "ANOTHER_U8": offset: 7640, size: 1
9-
# check: $()Configurable "ARRAY_BOOL": offset: 7641, size: 3
10-
# check: $()Configurable "ARRAY_U64": offset: 7644, size: 24
11-
# check: $()Configurable "B256": offset: 7668, size: 32
12-
# check: $()Configurable "BOOL": offset: 7700, size: 1
13-
# check: $()Configurable "CONFIGURABLE_ENUM_A": offset: 7701, size: 9
14-
# check: $()Configurable "CONFIGURABLE_ENUM_B": offset: 7710, size: 16
15-
# check: $()Configurable "CONFIGURABLE_STRUCT": offset: 7726, size: 9
16-
# check: $()Configurable "NOT_USED": offset: 7735, size: 1
17-
# check: $()Configurable "STR_4": offset: 7736, size: 4
18-
# check: $()Configurable "TUPLE_BOOL_U64": offset: 7740, size: 9
19-
# check: $()Configurable "U16": offset: 7749, size: 2
20-
# check: $()Configurable "U256": offset: 7751, size: 32
21-
# check: $()Configurable "U32": offset: 7783, size: 4
22-
# check: $()Configurable "U64": offset: 7787, size: 8
23-
# check: $()Configurable "U8": offset: 7795, size: 1
24-
# check: $()Configurable "VEC_U8": offset: 7796, size: 8
8+
# check: $()Configurable "ANOTHER_U8": offset: 7552, size: 1
9+
# check: $()Configurable "ARRAY_BOOL": offset: 7553, size: 3
10+
# check: $()Configurable "ARRAY_U64": offset: 7556, size: 24
11+
# check: $()Configurable "B256": offset: 7580, size: 32
12+
# check: $()Configurable "BOOL": offset: 7612, size: 1
13+
# check: $()Configurable "CONFIGURABLE_ENUM_A": offset: 7613, size: 9
14+
# check: $()Configurable "CONFIGURABLE_ENUM_B": offset: 7622, size: 16
15+
# check: $()Configurable "CONFIGURABLE_STRUCT": offset: 7638, size: 9
16+
# check: $()Configurable "NOT_USED": offset: 7647, size: 1
17+
# check: $()Configurable "STR_4": offset: 7648, size: 4
18+
# check: $()Configurable "TUPLE_BOOL_U64": offset: 7652, size: 9
19+
# check: $()Configurable "U16": offset: 7661, size: 2
20+
# check: $()Configurable "U256": offset: 7663, size: 32
21+
# check: $()Configurable "U32": offset: 7695, size: 4
22+
# check: $()Configurable "U64": offset: 7699, size: 8
23+
# check: $()Configurable "U8": offset: 7707, size: 1
24+
# check: $()Configurable "VEC_U8": offset: 7708, size: 8

‎test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_dedup_decode/stdout.snap

+16-19
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,6 @@ script {
365365
!129 = fn_call_path_span !0 235 236
366366
!130 = (!128 !129)
367367

368-
<<<<<<< HEAD
369368
;; ASM: Final program
370369
;; Program kind: Script
371370
.program:
@@ -378,16 +377,16 @@ CONFIGURABLES_OFFSET[32..64]
378377
lw $$ds $$tmp i1
379378
add $$ds $$ds $$tmp
380379
cfei i16 ; allocate stack space for globals
381-
addr $$arg0 data_Configurable_0; get pointer to configurable TUPLE default value
382-
addi $$arg1 $zero i8 ; get length of configurable TUPLE default value
383-
addi $$arg2 $ssp i0 ; get pointer to configurable TUPLE stack address
380+
lw $$retv $$tmp i2 ; load configurables offset
381+
add $$retv $$retv $$tmp ; translate it into real memory offset
382+
move $$arg0 $$retv ; pointer to configurable TUPLE default value
383+
addi $$arg1 $ssp i0 ; pointer to configurable TUPLE stack address
384384
sub $$reta $pc $is ; get current instruction offset from instructions start ($is)
385385
srli $$reta $$reta i2 ; get current instruction offset in 32-bit words
386386
addi $$reta $$reta i4 ; set new return address
387-
jmpf $zero i93 ; decode configurable TUPLE
388-
addr $$arg0 data_Configurable_1; get pointer to configurable WRAPPED default value
389-
addi $$arg1 $zero i8 ; get length of configurable WRAPPED default value
390-
addi $$arg2 $ssp i8 ; get pointer to configurable WRAPPED stack address
387+
jmpf $zero i91 ; decode configurable TUPLE
388+
move $$arg0 $$retv ; pointer to configurable WRAPPED default value
389+
addi $$arg1 $ssp i8 ; pointer to configurable WRAPPED stack address
391390
sub $$reta $pc $is ; get current instruction offset from instructions start ($is)
392391
srli $$reta $$reta i2 ; get current instruction offset in 32-bit words
393392
addi $$reta $$reta i4 ; set new return address
@@ -482,30 +481,30 @@ pshh i524288 ; save registers 40..64
482481
move $$locbase $sp ; save locals base register for function abi_decode_in_place_0
483482
cfei i24 ; allocate 24 bytes for locals and 0 slots for call arguments
484483
move $r0 $$arg0 ; save argument 0 (ptr)
485-
move $r1 $$arg1 ; save argument 1 (len)
486-
move $r2 $$arg2 ; save argument 2 (target)
484+
move $r1 $$arg1 ; save argument 1 (target)
487485
move $r3 $$reta ; save return address
488486
move $$arg0 $r0 ; [call]: pass argument 0
489-
move $$arg1 $r1 ; [call]: pass argument 1
487+
move $$arg1 $zero ; [call]: pass argument 1
490488
move $$arg2 $$locbase ; [call]: pass argument 2
491489
sub $$reta $pc $is ; get current instruction offset from instructions start ($is)
492490
srli $$reta $$reta i2 ; get current instruction offset in 32-bit words
493491
addi $$reta $$reta i4 ; [call]: set new return address
494-
jmpf $zero i19 ; [call]: call from_parts_1
492+
jmpf $zero i20 ; [call]: call from_parts_1
495493
lw $r0 $$retv i0 ; load word
496494
sw $$locbase $r0 i1 ; store word
497495
addi $r0 $$locbase i8 ; get offset to local
498496
move $$arg0 $r0 ; [call]: pass argument 0
499497
sub $$reta $pc $is ; get current instruction offset from instructions start ($is)
500498
srli $$reta $$reta i2 ; get current instruction offset in 32-bit words
501499
addi $$reta $$reta i4 ; [call]: set new return address
502-
jmpf $zero i23 ; [call]: call abi_decode_3
500+
jmpf $zero i24 ; [call]: call abi_decode_3
503501
move $r0 $$retv ; [call]: copy the return value
504502
sw $$locbase $r0 i2 ; store word
505503
addi $r0 $$locbase i16 ; get offset to local
506-
movi $r1 i8 ; initialize constant into register
507-
mcp $r2 $r0 $r1 ; mcp target temp size
508-
move $$retv $zero ; set return value
504+
movi $r2 i8 ; initialize constant into register
505+
mcp $r1 $r0 $r2 ; mcp target temp size
506+
lw $r0 $$locbase i1 ; load word
507+
move $$retv $r0 ; set return value
509508
cfsi i24 ; free 24 bytes for locals and 0 slots for extra call arguments
510509
move $$reta $r3 ; restore return address
511510
poph i524288 ; restore registers 40..64
@@ -556,6 +555,4 @@ data_<Configurable, TUPLE>_0 .bytes[8] 00 00 00 00 00 00 00 02 ........
556555
data_<Configurable, WRAPPED>_1 .bytes[8] 00 00 00 00 00 00 00 01 ........
557556

558557

559-
=======
560-
>>>>>>> 03833190f (allow dynamic types in configurables)
561-
Finished release [optimized + fuel] target(s) [752 B] in ???
558+
Finished release [optimized + fuel] target(s) [744 B] in ???

‎test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_empty/json_abi_oracle.encoding_v1.json

+3-119
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,11 @@
11
{
22
"concreteTypes": [
3-
{
4-
"concreteTypeId": "27a0fb3d3a821e04e7a3f17ab6a617f0eb10f11e6eeb0f2c0ff9e6237207319e",
5-
"metadataTypeId": 3,
6-
"type": "struct std::vec::Vec<u8>",
7-
"typeArguments": [
8-
"c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b"
9-
]
10-
},
11-
{
12-
"concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef",
13-
"type": "u16"
14-
},
15-
{
16-
"concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc",
17-
"type": "u32"
18-
},
193
{
204
"concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0",
215
"type": "u64"
22-
},
23-
{
24-
"concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
25-
"type": "u8"
26-
}
27-
],
28-
"configurables": [
29-
{
30-
"concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
31-
"name": "A",
32-
"offset": 4752
33-
},
34-
{
35-
"concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef",
36-
"name": "B",
37-
"offset": 4753
38-
},
39-
{
40-
"concreteTypeId": "27a0fb3d3a821e04e7a3f17ab6a617f0eb10f11e6eeb0f2c0ff9e6237207319e",
41-
"name": "V",
42-
"offset": 4767
43-
},
44-
{
45-
"concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc",
46-
"name": "C",
47-
"offset": 4755
48-
},
49-
{
50-
"concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0",
51-
"name": "D",
52-
"offset": 4759
536
}
547
],
8+
"configurables": [],
559
"encodingVersion": "1",
5610
"functions": [
5711
{
@@ -61,79 +15,9 @@
6115
"output": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0"
6216
}
6317
],
64-
"loggedTypes": [
65-
{
66-
"concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
67-
"logId": "14454674236531057292"
68-
},
69-
{
70-
"concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef",
71-
"logId": "2992671284987479467"
72-
},
73-
{
74-
"concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc",
75-
"logId": "15520703124961489725"
76-
},
77-
{
78-
"concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0",
79-
"logId": "1515152261580153489"
80-
},
81-
{
82-
"concreteTypeId": "27a0fb3d3a821e04e7a3f17ab6a617f0eb10f11e6eeb0f2c0ff9e6237207319e",
83-
"logId": "2855558404146077188"
84-
}
85-
],
18+
"loggedTypes": [],
8619
"messagesTypes": [],
87-
"metadataTypes": [
88-
{
89-
"metadataTypeId": 0,
90-
"type": "generic T"
91-
},
92-
{
93-
"metadataTypeId": 1,
94-
"type": "raw untyped ptr"
95-
},
96-
{
97-
"components": [
98-
{
99-
"name": "ptr",
100-
"typeId": 1
101-
},
102-
{
103-
"name": "cap",
104-
"typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0"
105-
}
106-
],
107-
"metadataTypeId": 2,
108-
"type": "struct std::vec::RawVec",
109-
"typeParameters": [
110-
0
111-
]
112-
},
113-
{
114-
"components": [
115-
{
116-
"name": "buf",
117-
"typeArguments": [
118-
{
119-
"name": "",
120-
"typeId": 0
121-
}
122-
],
123-
"typeId": 2
124-
},
125-
{
126-
"name": "len",
127-
"typeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0"
128-
}
129-
],
130-
"metadataTypeId": 3,
131-
"type": "struct std::vec::Vec",
132-
"typeParameters": [
133-
0
134-
]
135-
}
136-
],
20+
"metadataTypes": [],
13721
"programType": "script",
13822
"specVersion": "1"
13923
}

0 commit comments

Comments
 (0)