aarifullin/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

vm: implement NEWARRAY0 and NEWSTRUCT0 opcodes

Browse source
This commit is contained in:
Evgenii Stratonikov 2020-04-24 12:31:59 +03:00
parent 03761421f8
commit 9fd04aefa5
4 changed files with 131 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkg/vm/opcode/opcode.go
View file

@ -143,12 +143,12 @@ const (
CHECKMULTISIG Opcode = 0xAE
// Advanced data structures (arrays, structures, maps)
PACK Opcode = 0xC0
UNPACK Opcode = 0xC1
// NEWARRAY0 Opcode = 0xC2
NEWARRAY Opcode = 0xC3
PACK Opcode = 0xC0
UNPACK Opcode = 0xC1
NEWARRAY0 Opcode = 0xC2
NEWARRAY Opcode = 0xC3
// NEWARRAYT Opcode = 0xC4
// NEWSTRUCT0 Opcode = 0xC5
NEWSTRUCT0 Opcode = 0xC5
NEWSTRUCT Opcode = 0xC6
NEWMAP Opcode = 0xC8
SIZE Opcode = 0xCA

202
pkg/vm/opcode/opcode_string.go
View file

@ -124,7 +124,9 @@ func _() {
_ = x[CHECKMULTISIG-174]
_ = x[PACK-192]
_ = x[UNPACK-193]
_ = x[NEWARRAY0-194]
_ = x[NEWARRAY-195]
_ = x[NEWSTRUCT0-197]
_ = x[NEWSTRUCT-198]
_ = x[NEWMAP-200]
_ = x[SIZE-202]
@ -140,7 +142,7 @@ func _() {
_ = x[THROWIFNOT-241]
}
const _Opcode_name = "PUSHINT8PUSHINT16PUSHINT32PUSHINT64PUSHINT128PUSHINT256PUSHNULLPUSHDATA1PUSHDATA2PUSHDATA4PUSHM1PUSH0PUSH1PUSH2PUSH3PUSH4PUSH5PUSH6PUSH7PUSH8PUSH9PUSH10PUSH11PUSH12PUSH13PUSH14PUSH15PUSH16NOPJMPJMP_LJMPIFJMPIF_LJMPIFNOTJMPIFNOT_LJMPEQJMPEQ_LJMPNEJMPNE_LJMPGTJMPGT_LJMPGEJMPGE_LJMPLTJMPLT_LJMPLEJMPLE_LCALLCALL_LOLDPUSH1RETAPPCALLSYSCALLTAILCALLDUPFROMALTSTACKTOALTSTACKFROMALTSTACKXDROPISNULLXSWAPXTUCKDEPTHDROPDUPNIPOVERPICKROLLROTSWAPTUCKCATSUBSTRLEFTRIGHTINVERTANDORXOREQUALINCDECSIGNNEGATEABSNOTNZADDSUBMULDIVMODSHLSHRBOOLANDBOOLORNUMEQUALNUMNOTEQUALLTGTLTEGTEMINMAXWITHINSHA1SHA256HASH160HASH256CHECKSIGVERIFYCHECKMULTISIGPACKUNPACKNEWARRAYNEWSTRUCTNEWMAPSIZEHASKEYKEYSVALUESPICKITEMAPPENDSETITEMREVERSEITEMSREMOVETHROWTHROWIFNOT"
const _Opcode_name = "PUSHINT8PUSHINT16PUSHINT32PUSHINT64PUSHINT128PUSHINT256PUSHNULLPUSHDATA1PUSHDATA2PUSHDATA4PUSHM1PUSH0PUSH1PUSH2PUSH3PUSH4PUSH5PUSH6PUSH7PUSH8PUSH9PUSH10PUSH11PUSH12PUSH13PUSH14PUSH15PUSH16NOPJMPJMPLJMPIFJMPIFLJMPIFNOTJMPIFNOTLJMPEQJMPEQLJMPNEJMPNELJMPGTJMPGTLJMPGEJMPGELJMPLTJMPLTLJMPLEJMPLELCALLCALLLOLDPUSH1RETAPPCALLSYSCALLTAILCALLDUPFROMALTSTACKTOALTSTACKFROMALTSTACKXDROPISNULLXSWAPXTUCKDEPTHDROPDUPNIPOVERPICKROLLROTSWAPTUCKCATSUBSTRLEFTRIGHTINVERTANDORXOREQUALINCDECSIGNNEGATEABSNOTNZADDSUBMULDIVMODSHLSHRBOOLANDBOOLORNUMEQUALNUMNOTEQUALLTGTLTEGTEMINMAXWITHINSHA1SHA256HASH160HASH256CHECKSIGVERIFYCHECKMULTISIGPACKUNPACKNEWARRAY0NEWARRAYNEWSTRUCT0NEWSTRUCTNEWMAPSIZEHASKEYKEYSVALUESPICKITEMAPPENDSETITEMREVERSEITEMSREMOVETHROWTHROWIFNOT"
var _Opcode_map = map[Opcode]string{
0: _Opcode_name[0:8],
@ -173,104 +175,106 @@ var _Opcode_map = map[Opcode]string{
32: _Opcode_name[182:188],
33: _Opcode_name[188:191],
34: _Opcode_name[191:194],
35: _Opcode_name[194:199],
36: _Opcode_name[199:204],
37: _Opcode_name[204:211],
38: _Opcode_name[211:219],
39: _Opcode_name[219:229],
40: _Opcode_name[229:234],
41: _Opcode_name[234:241],
42: _Opcode_name[241:246],
43: _Opcode_name[246:253],
44: _Opcode_name[253:258],
45: _Opcode_name[258:265],
46: _Opcode_name[265:270],
47: _Opcode_name[270:277],
48: _Opcode_name[277:282],
49: _Opcode_name[282:289],
50: _Opcode_name[289:294],
51: _Opcode_name[294:301],
52: _Opcode_name[301:305],
53: _Opcode_name[305:311],
81: _Opcode_name[311:319],
102: _Opcode_name[319:322],
103: _Opcode_name[322:329],
104: _Opcode_name[329:336],
105: _Opcode_name[336:344],
106: _Opcode_name[344:359],
107: _Opcode_name[359:369],
108: _Opcode_name[369:381],
109: _Opcode_name[381:386],
112: _Opcode_name[386:392],
114: _Opcode_name[392:397],
115: _Opcode_name[397:402],
116: _Opcode_name[402:407],
117: _Opcode_name[407:411],
118: _Opcode_name[411:414],
119: _Opcode_name[414:417],
120: _Opcode_name[417:421],
121: _Opcode_name[421:425],
122: _Opcode_name[425:429],
123: _Opcode_name[429:432],
124: _Opcode_name[432:436],
125: _Opcode_name[436:440],
126: _Opcode_name[440:443],
127: _Opcode_name[443:449],
128: _Opcode_name[449:453],
129: _Opcode_name[453:458],
131: _Opcode_name[458:464],
132: _Opcode_name[464:467],
133: _Opcode_name[467:469],
134: _Opcode_name[469:472],
135: _Opcode_name[472:477],
139: _Opcode_name[477:480],
140: _Opcode_name[480:483],
141: _Opcode_name[483:487],
143: _Opcode_name[487:493],
144: _Opcode_name[493:496],
145: _Opcode_name[496:499],
146: _Opcode_name[499:501],
147: _Opcode_name[501:504],
148: _Opcode_name[504:507],
149: _Opcode_name[507:510],
150: _Opcode_name[510:513],
151: _Opcode_name[513:516],
152: _Opcode_name[516:519],
153: _Opcode_name[519:522],
154: _Opcode_name[522:529],
155: _Opcode_name[529:535],
156: _Opcode_name[535:543],
158: _Opcode_name[543:554],
159: _Opcode_name[554:556],
160: _Opcode_name[556:558],
161: _Opcode_name[558:561],
162: _Opcode_name[561:564],
163: _Opcode_name[564:567],
164: _Opcode_name[567:570],
165: _Opcode_name[570:576],
167: _Opcode_name[576:580],
168: _Opcode_name[580:586],
169: _Opcode_name[586:593],
170: _Opcode_name[593:600],
172: _Opcode_name[600:608],
173: _Opcode_name[608:614],
174: _Opcode_name[614:627],
192: _Opcode_name[627:631],
193: _Opcode_name[631:637],
195: _Opcode_name[637:645],
198: _Opcode_name[645:654],
200: _Opcode_name[654:660],
202: _Opcode_name[660:664],
203: _Opcode_name[664:670],
204: _Opcode_name[670:674],
205: _Opcode_name[674:680],
206: _Opcode_name[680:688],
207: _Opcode_name[688:694],
208: _Opcode_name[694:701],
209: _Opcode_name[701:713],
210: _Opcode_name[713:719],
240: _Opcode_name[719:724],
241: _Opcode_name[724:734],
35: _Opcode_name[194:198],
36: _Opcode_name[198:203],
37: _Opcode_name[203:209],
38: _Opcode_name[209:217],
39: _Opcode_name[217:226],
40: _Opcode_name[226:231],
41: _Opcode_name[231:237],
42: _Opcode_name[237:242],
43: _Opcode_name[242:248],
44: _Opcode_name[248:253],
45: _Opcode_name[253:259],
46: _Opcode_name[259:264],
47: _Opcode_name[264:270],
48: _Opcode_name[270:275],
49: _Opcode_name[275:281],
50: _Opcode_name[281:286],
51: _Opcode_name[286:292],
52: _Opcode_name[292:296],
53: _Opcode_name[296:301],
81: _Opcode_name[301:309],
102: _Opcode_name[309:312],
103: _Opcode_name[312:319],
104: _Opcode_name[319:326],
105: _Opcode_name[326:334],
106: _Opcode_name[334:349],
107: _Opcode_name[349:359],
108: _Opcode_name[359:371],
109: _Opcode_name[371:376],
112: _Opcode_name[376:382],
114: _Opcode_name[382:387],
115: _Opcode_name[387:392],
116: _Opcode_name[392:397],
117: _Opcode_name[397:401],
118: _Opcode_name[401:404],
119: _Opcode_name[404:407],
120: _Opcode_name[407:411],
121: _Opcode_name[411:415],
122: _Opcode_name[415:419],
123: _Opcode_name[419:422],
124: _Opcode_name[422:426],
125: _Opcode_name[426:430],
126: _Opcode_name[430:433],
127: _Opcode_name[433:439],
128: _Opcode_name[439:443],
129: _Opcode_name[443:448],
131: _Opcode_name[448:454],
132: _Opcode_name[454:457],
133: _Opcode_name[457:459],
134: _Opcode_name[459:462],
135: _Opcode_name[462:467],
139: _Opcode_name[467:470],
140: _Opcode_name[470:473],
141: _Opcode_name[473:477],
143: _Opcode_name[477:483],
144: _Opcode_name[483:486],
145: _Opcode_name[486:489],
146: _Opcode_name[489:491],
147: _Opcode_name[491:494],
148: _Opcode_name[494:497],
149: _Opcode_name[497:500],
150: _Opcode_name[500:503],
151: _Opcode_name[503:506],
152: _Opcode_name[506:509],
153: _Opcode_name[509:512],
154: _Opcode_name[512:519],
155: _Opcode_name[519:525],
156: _Opcode_name[525:533],
158: _Opcode_name[533:544],
159: _Opcode_name[544:546],
160: _Opcode_name[546:548],
161: _Opcode_name[548:551],
162: _Opcode_name[551:554],
163: _Opcode_name[554:557],
164: _Opcode_name[557:560],
165: _Opcode_name[560:566],
167: _Opcode_name[566:570],
168: _Opcode_name[570:576],
169: _Opcode_name[576:583],
170: _Opcode_name[583:590],
172: _Opcode_name[590:598],
173: _Opcode_name[598:604],
174: _Opcode_name[604:617],
192: _Opcode_name[617:621],
193: _Opcode_name[621:627],
194: _Opcode_name[627:636],
195: _Opcode_name[636:644],
197: _Opcode_name[644:654],
198: _Opcode_name[654:663],
200: _Opcode_name[663:669],
202: _Opcode_name[669:673],
203: _Opcode_name[673:679],
204: _Opcode_name[679:683],
205: _Opcode_name[683:689],
206: _Opcode_name[689:697],
207: _Opcode_name[697:703],
208: _Opcode_name[703:710],
209: _Opcode_name[710:722],
210: _Opcode_name[722:728],
240: _Opcode_name[728:733],
241: _Opcode_name[733:743],
}
func (i Opcode) String() string {

8
pkg/vm/vm.go
View file

@ -911,7 +911,10 @@ func (v *VM) execute(ctx *Context, op opcode.Opcode, parameter []byte) (err erro
x := v.estack.Pop().BigInt()
v.estack.PushVal(x.Cmp(big.NewInt(0)) != 0)
// Object operations.
// Object operations
case opcode.NEWARRAY0:
v.estack.PushVal(&ArrayItem{[]StackItem{}})
case opcode.NEWARRAY:
item := v.estack.Pop()
switch t := item.value.(type) {
@ -930,6 +933,9 @@ func (v *VM) execute(ctx *Context, op opcode.Opcode, parameter []byte) (err erro
v.estack.PushVal(&ArrayItem{items})
}
case opcode.NEWSTRUCT0:
v.estack.PushVal(&StructItem{[]StackItem{}})
case opcode.NEWSTRUCT:
item := v.estack.Pop()
switch t := item.value.(type) {

16
pkg/vm/vm_test.go
View file

@ -1252,6 +1252,22 @@ func TestDECBigResult(t *testing.T) {
checkVMFailed(t, vm)
}
func TestNEWARRAY0(t *testing.T) {
prog := makeProgram(opcode.NEWARRAY0)
v := load(prog)
runVM(t, v)
require.Equal(t, 1, v.estack.Len())
require.Equal(t, &ArrayItem{[]StackItem{}}, v.estack.Pop().value)
}
func TestNEWSTRUCT0(t *testing.T) {
prog := makeProgram(opcode.NEWSTRUCT0)
v := load(prog)
runVM(t, v)
require.Equal(t, 1, v.estack.Len())
require.Equal(t, &StructItem{[]StackItem{}}, v.estack.Pop().value)
}
func TestNEWARRAYInteger(t *testing.T) {
prog := makeProgram(opcode.NEWARRAY)
vm := load(prog)