From e53055a560a6a8ce466f574d07110116790cc2fb Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Thu, 21 May 2020 12:54:50 +0300 Subject: [PATCH] opcode: use underscored names in String() --- pkg/vm/opcode/opcode.go | 22 +-- pkg/vm/opcode/opcode_string.go | 300 ++++++++++++++++----------------- 2 files changed, 161 insertions(+), 161 deletions(-) diff --git a/pkg/vm/opcode/opcode.go b/pkg/vm/opcode/opcode.go index b729c1e16..6b5a8ee5a 100644 --- a/pkg/vm/opcode/opcode.go +++ b/pkg/vm/opcode/opcode.go @@ -46,25 +46,25 @@ const ( // Flow control NOP Opcode = 0x21 JMP Opcode = 0x22 - JMPL Opcode = 0x23 + JMPL Opcode = 0x23 // JMP_L JMPIF Opcode = 0x24 - JMPIFL Opcode = 0x25 + JMPIFL Opcode = 0x25 // JMPIF_L JMPIFNOT Opcode = 0x26 - JMPIFNOTL Opcode = 0x27 + JMPIFNOTL Opcode = 0x27 // JMPIFNOT_L JMPEQ Opcode = 0x28 - JMPEQL Opcode = 0x29 + JMPEQL Opcode = 0x29 // JMPEQ_L JMPNE Opcode = 0x2A - JMPNEL Opcode = 0x2B + JMPNEL Opcode = 0x2B // JMPNE_L JMPGT Opcode = 0x2C - JMPGTL Opcode = 0x2D + JMPGTL Opcode = 0x2D // JMPGT_L JMPGE Opcode = 0x2E - JMPGEL Opcode = 0x2F + JMPGEL Opcode = 0x2F // JMPGE_L JMPLT Opcode = 0x30 - JMPLTL Opcode = 0x31 + JMPLTL Opcode = 0x31 // JMPLT_L JMPLE Opcode = 0x32 - JMPLEL Opcode = 0x33 + JMPLEL Opcode = 0x33 // JMPLE_L CALL Opcode = 0x34 - CALLL Opcode = 0x35 + CALLL Opcode = 0x35 // CALL_L CALLA Opcode = 0x36 // Exceptions @@ -193,7 +193,7 @@ const ( UNPACK Opcode = 0xC1 NEWARRAY0 Opcode = 0xC2 NEWARRAY Opcode = 0xC3 - NEWARRAYT Opcode = 0xC4 + NEWARRAYT Opcode = 0xC4 // NEWARRAY_T NEWSTRUCT0 Opcode = 0xC5 NEWSTRUCT Opcode = 0xC6 NEWMAP Opcode = 0xC8 diff --git a/pkg/vm/opcode/opcode_string.go b/pkg/vm/opcode/opcode_string.go index 8545c39f4..e8e5cf92d 100644 --- a/pkg/vm/opcode/opcode_string.go +++ b/pkg/vm/opcode/opcode_string.go @@ -1,4 +1,4 @@ -// Code generated by "stringer -type Opcode"; DO NOT EDIT. +// Code generated by "stringer -type Opcode -linecomment"; DO NOT EDIT. package opcode @@ -192,7 +192,7 @@ func _() { _ = x[CONVERT-219] } -const _Opcode_name = "PUSHINT8PUSHINT16PUSHINT32PUSHINT64PUSHINT128PUSHINT256PUSHAPUSHNULLPUSHDATA1PUSHDATA2PUSHDATA4PUSHM1PUSH0PUSH1PUSH2PUSH3PUSH4PUSH5PUSH6PUSH7PUSH8PUSH9PUSH10PUSH11PUSH12PUSH13PUSH14PUSH15PUSH16NOPJMPJMPLJMPIFJMPIFLJMPIFNOTJMPIFNOTLJMPEQJMPEQLJMPNEJMPNELJMPGTJMPGTLJMPGEJMPGELJMPLTJMPLTLJMPLEJMPLELCALLCALLLCALLAABORTASSERTTHROWRETSYSCALLDEPTHDROPNIPXDROPCLEARDUPOVERPICKTUCKSWAPOLDPUSH1ROLLREVERSE3REVERSE4REVERSENINITSSLOTINITSLOTLDSFLD0LDSFLD1LDSFLD2LDSFLD3LDSFLD4LDSFLD5LDSFLD6LDSFLDSTSFLD0STSFLD1STSFLD2STSFLD3STSFLD4STSFLD5STSFLD6STSFLDLDLOC0LDLOC1LDLOC2LDLOC3LDLOC4LDLOC5LDLOC6LDLOCSTLOC0STLOC1STLOC2STLOC3STLOC4STLOC5STLOC6STLOCLDARG0LDARG1LDARG2LDARG3LDARG4LDARG5LDARG6LDARGSTARG0STARG1STARG2STARG3STARG4STARG5STARG6STARGNEWBUFFERMEMCPYCATSUBSTRLEFTRIGHTINVERTANDORXOREQUALNOTEQUALSIGNABSNEGATEINCDECADDSUBMULDIVMODSHLSHRNOTBOOLANDBOOLORNZNUMEQUALNUMNOTEQUALLTLTEGTGTEMINMAXWITHINPACKUNPACKNEWARRAY0NEWARRAYNEWARRAYTNEWSTRUCT0NEWSTRUCTNEWMAPSIZEHASKEYKEYSVALUESPICKITEMAPPENDSETITEMREVERSEITEMSREMOVECLEARITEMSISNULLISTYPECONVERT" +const _Opcode_name = "PUSHINT8PUSHINT16PUSHINT32PUSHINT64PUSHINT128PUSHINT256PUSHAPUSHNULLPUSHDATA1PUSHDATA2PUSHDATA4PUSHM1PUSH0PUSH1PUSH2PUSH3PUSH4PUSH5PUSH6PUSH7PUSH8PUSH9PUSH10PUSH11PUSH12PUSH13PUSH14PUSH15PUSH16NOPJMPJMP_LJMPIFJMPIF_LJMPIFNOTJMPIFNOT_LJMPEQJMPEQ_LJMPNEJMPNE_LJMPGTJMPGT_LJMPGEJMPGE_LJMPLTJMPLT_LJMPLEJMPLE_LCALLCALL_LCALLAABORTASSERTTHROWRETSYSCALLDEPTHDROPNIPXDROPCLEARDUPOVERPICKTUCKSWAPFIXME remove #927ROLLREVERSE3REVERSE4REVERSENINITSSLOTINITSLOTLDSFLD0LDSFLD1LDSFLD2LDSFLD3LDSFLD4LDSFLD5LDSFLD6LDSFLDSTSFLD0STSFLD1STSFLD2STSFLD3STSFLD4STSFLD5STSFLD6STSFLDLDLOC0LDLOC1LDLOC2LDLOC3LDLOC4LDLOC5LDLOC6LDLOCSTLOC0STLOC1STLOC2STLOC3STLOC4STLOC5STLOC6STLOCLDARG0LDARG1LDARG2LDARG3LDARG4LDARG5LDARG6LDARGSTARG0STARG1STARG2STARG3STARG4STARG5STARG6STARGNEWBUFFERMEMCPYCATSUBSTRLEFTRIGHTINVERTANDORXOREQUALNOTEQUALSIGNABSNEGATEINCDECADDSUBMULDIVMODSHLSHRNOTBOOLANDBOOLORNZNUMEQUALNUMNOTEQUALLTLTEGTGTEMINMAXWITHINPACKUNPACKNEWARRAY0NEWARRAYNEWARRAY_TNEWSTRUCT0NEWSTRUCTNEWMAPSIZEHASKEYKEYSVALUESPICKITEMAPPENDSETITEMREVERSEITEMSREMOVECLEARITEMSISNULLISTYPECONVERT" var _Opcode_map = map[Opcode]string{ 0: _Opcode_name[0:8], @@ -226,154 +226,154 @@ var _Opcode_map = map[Opcode]string{ 32: _Opcode_name[187:193], 33: _Opcode_name[193:196], 34: _Opcode_name[196:199], - 35: _Opcode_name[199:203], - 36: _Opcode_name[203:208], - 37: _Opcode_name[208:214], - 38: _Opcode_name[214:222], - 39: _Opcode_name[222:231], - 40: _Opcode_name[231:236], - 41: _Opcode_name[236:242], - 42: _Opcode_name[242:247], - 43: _Opcode_name[247:253], - 44: _Opcode_name[253:258], - 45: _Opcode_name[258:264], - 46: _Opcode_name[264:269], - 47: _Opcode_name[269:275], - 48: _Opcode_name[275:280], - 49: _Opcode_name[280:286], - 50: _Opcode_name[286:291], - 51: _Opcode_name[291:297], - 52: _Opcode_name[297:301], - 53: _Opcode_name[301:306], - 54: _Opcode_name[306:311], - 55: _Opcode_name[311:316], - 56: _Opcode_name[316:322], - 58: _Opcode_name[322:327], - 64: _Opcode_name[327:330], - 65: _Opcode_name[330:337], - 67: _Opcode_name[337:342], - 69: _Opcode_name[342:346], - 70: _Opcode_name[346:349], - 72: _Opcode_name[349:354], - 73: _Opcode_name[354:359], - 74: _Opcode_name[359:362], - 75: _Opcode_name[362:366], - 77: _Opcode_name[366:370], - 78: _Opcode_name[370:374], - 80: _Opcode_name[374:378], - 81: _Opcode_name[378:386], - 82: _Opcode_name[386:390], - 83: _Opcode_name[390:398], - 84: _Opcode_name[398:406], - 85: _Opcode_name[406:414], - 86: _Opcode_name[414:423], - 87: _Opcode_name[423:431], - 88: _Opcode_name[431:438], - 89: _Opcode_name[438:445], - 90: _Opcode_name[445:452], - 91: _Opcode_name[452:459], - 92: _Opcode_name[459:466], - 93: _Opcode_name[466:473], - 94: _Opcode_name[473:480], - 95: _Opcode_name[480:486], - 96: _Opcode_name[486:493], - 97: _Opcode_name[493:500], - 98: _Opcode_name[500:507], - 99: _Opcode_name[507:514], - 100: _Opcode_name[514:521], - 101: _Opcode_name[521:528], - 102: _Opcode_name[528:535], - 103: _Opcode_name[535:541], - 104: _Opcode_name[541:547], - 105: _Opcode_name[547:553], - 106: _Opcode_name[553:559], - 107: _Opcode_name[559:565], - 108: _Opcode_name[565:571], - 109: _Opcode_name[571:577], - 110: _Opcode_name[577:583], - 111: _Opcode_name[583:588], - 112: _Opcode_name[588:594], - 113: _Opcode_name[594:600], - 114: _Opcode_name[600:606], - 115: _Opcode_name[606:612], - 116: _Opcode_name[612:618], - 117: _Opcode_name[618:624], - 118: _Opcode_name[624:630], - 119: _Opcode_name[630:635], - 120: _Opcode_name[635:641], - 121: _Opcode_name[641:647], - 122: _Opcode_name[647:653], - 123: _Opcode_name[653:659], - 124: _Opcode_name[659:665], - 125: _Opcode_name[665:671], - 126: _Opcode_name[671:677], - 127: _Opcode_name[677:682], - 128: _Opcode_name[682:688], - 129: _Opcode_name[688:694], - 130: _Opcode_name[694:700], - 131: _Opcode_name[700:706], - 132: _Opcode_name[706:712], - 133: _Opcode_name[712:718], - 134: _Opcode_name[718:724], - 135: _Opcode_name[724:729], - 136: _Opcode_name[729:738], - 137: _Opcode_name[738:744], - 139: _Opcode_name[744:747], - 140: _Opcode_name[747:753], - 141: _Opcode_name[753:757], - 142: _Opcode_name[757:762], - 144: _Opcode_name[762:768], - 145: _Opcode_name[768:771], - 146: _Opcode_name[771:773], - 147: _Opcode_name[773:776], - 151: _Opcode_name[776:781], - 152: _Opcode_name[781:789], - 153: _Opcode_name[789:793], - 154: _Opcode_name[793:796], - 155: _Opcode_name[796:802], - 156: _Opcode_name[802:805], - 157: _Opcode_name[805:808], - 158: _Opcode_name[808:811], - 159: _Opcode_name[811:814], - 160: _Opcode_name[814:817], - 161: _Opcode_name[817:820], - 162: _Opcode_name[820:823], - 168: _Opcode_name[823:826], - 169: _Opcode_name[826:829], - 170: _Opcode_name[829:832], - 171: _Opcode_name[832:839], - 172: _Opcode_name[839:845], - 177: _Opcode_name[845:847], - 179: _Opcode_name[847:855], - 180: _Opcode_name[855:866], - 181: _Opcode_name[866:868], - 182: _Opcode_name[868:871], - 183: _Opcode_name[871:873], - 184: _Opcode_name[873:876], - 185: _Opcode_name[876:879], - 186: _Opcode_name[879:882], - 187: _Opcode_name[882:888], - 192: _Opcode_name[888:892], - 193: _Opcode_name[892:898], - 194: _Opcode_name[898:907], - 195: _Opcode_name[907:915], - 196: _Opcode_name[915:924], - 197: _Opcode_name[924:934], - 198: _Opcode_name[934:943], - 200: _Opcode_name[943:949], - 202: _Opcode_name[949:953], - 203: _Opcode_name[953:959], - 204: _Opcode_name[959:963], - 205: _Opcode_name[963:969], - 206: _Opcode_name[969:977], - 207: _Opcode_name[977:983], - 208: _Opcode_name[983:990], - 209: _Opcode_name[990:1002], - 210: _Opcode_name[1002:1008], - 211: _Opcode_name[1008:1018], - 216: _Opcode_name[1018:1024], - 217: _Opcode_name[1024:1030], - 219: _Opcode_name[1030:1037], + 35: _Opcode_name[199:204], + 36: _Opcode_name[204:209], + 37: _Opcode_name[209:216], + 38: _Opcode_name[216:224], + 39: _Opcode_name[224:234], + 40: _Opcode_name[234:239], + 41: _Opcode_name[239:246], + 42: _Opcode_name[246:251], + 43: _Opcode_name[251:258], + 44: _Opcode_name[258:263], + 45: _Opcode_name[263:270], + 46: _Opcode_name[270:275], + 47: _Opcode_name[275:282], + 48: _Opcode_name[282:287], + 49: _Opcode_name[287:294], + 50: _Opcode_name[294:299], + 51: _Opcode_name[299:306], + 52: _Opcode_name[306:310], + 53: _Opcode_name[310:316], + 54: _Opcode_name[316:321], + 55: _Opcode_name[321:326], + 56: _Opcode_name[326:332], + 58: _Opcode_name[332:337], + 64: _Opcode_name[337:340], + 65: _Opcode_name[340:347], + 67: _Opcode_name[347:352], + 69: _Opcode_name[352:356], + 70: _Opcode_name[356:359], + 72: _Opcode_name[359:364], + 73: _Opcode_name[364:369], + 74: _Opcode_name[369:372], + 75: _Opcode_name[372:376], + 77: _Opcode_name[376:380], + 78: _Opcode_name[380:384], + 80: _Opcode_name[384:388], + 81: _Opcode_name[388:405], + 82: _Opcode_name[405:409], + 83: _Opcode_name[409:417], + 84: _Opcode_name[417:425], + 85: _Opcode_name[425:433], + 86: _Opcode_name[433:442], + 87: _Opcode_name[442:450], + 88: _Opcode_name[450:457], + 89: _Opcode_name[457:464], + 90: _Opcode_name[464:471], + 91: _Opcode_name[471:478], + 92: _Opcode_name[478:485], + 93: _Opcode_name[485:492], + 94: _Opcode_name[492:499], + 95: _Opcode_name[499:505], + 96: _Opcode_name[505:512], + 97: _Opcode_name[512:519], + 98: _Opcode_name[519:526], + 99: _Opcode_name[526:533], + 100: _Opcode_name[533:540], + 101: _Opcode_name[540:547], + 102: _Opcode_name[547:554], + 103: _Opcode_name[554:560], + 104: _Opcode_name[560:566], + 105: _Opcode_name[566:572], + 106: _Opcode_name[572:578], + 107: _Opcode_name[578:584], + 108: _Opcode_name[584:590], + 109: _Opcode_name[590:596], + 110: _Opcode_name[596:602], + 111: _Opcode_name[602:607], + 112: _Opcode_name[607:613], + 113: _Opcode_name[613:619], + 114: _Opcode_name[619:625], + 115: _Opcode_name[625:631], + 116: _Opcode_name[631:637], + 117: _Opcode_name[637:643], + 118: _Opcode_name[643:649], + 119: _Opcode_name[649:654], + 120: _Opcode_name[654:660], + 121: _Opcode_name[660:666], + 122: _Opcode_name[666:672], + 123: _Opcode_name[672:678], + 124: _Opcode_name[678:684], + 125: _Opcode_name[684:690], + 126: _Opcode_name[690:696], + 127: _Opcode_name[696:701], + 128: _Opcode_name[701:707], + 129: _Opcode_name[707:713], + 130: _Opcode_name[713:719], + 131: _Opcode_name[719:725], + 132: _Opcode_name[725:731], + 133: _Opcode_name[731:737], + 134: _Opcode_name[737:743], + 135: _Opcode_name[743:748], + 136: _Opcode_name[748:757], + 137: _Opcode_name[757:763], + 139: _Opcode_name[763:766], + 140: _Opcode_name[766:772], + 141: _Opcode_name[772:776], + 142: _Opcode_name[776:781], + 144: _Opcode_name[781:787], + 145: _Opcode_name[787:790], + 146: _Opcode_name[790:792], + 147: _Opcode_name[792:795], + 151: _Opcode_name[795:800], + 152: _Opcode_name[800:808], + 153: _Opcode_name[808:812], + 154: _Opcode_name[812:815], + 155: _Opcode_name[815:821], + 156: _Opcode_name[821:824], + 157: _Opcode_name[824:827], + 158: _Opcode_name[827:830], + 159: _Opcode_name[830:833], + 160: _Opcode_name[833:836], + 161: _Opcode_name[836:839], + 162: _Opcode_name[839:842], + 168: _Opcode_name[842:845], + 169: _Opcode_name[845:848], + 170: _Opcode_name[848:851], + 171: _Opcode_name[851:858], + 172: _Opcode_name[858:864], + 177: _Opcode_name[864:866], + 179: _Opcode_name[866:874], + 180: _Opcode_name[874:885], + 181: _Opcode_name[885:887], + 182: _Opcode_name[887:890], + 183: _Opcode_name[890:892], + 184: _Opcode_name[892:895], + 185: _Opcode_name[895:898], + 186: _Opcode_name[898:901], + 187: _Opcode_name[901:907], + 192: _Opcode_name[907:911], + 193: _Opcode_name[911:917], + 194: _Opcode_name[917:926], + 195: _Opcode_name[926:934], + 196: _Opcode_name[934:944], + 197: _Opcode_name[944:954], + 198: _Opcode_name[954:963], + 200: _Opcode_name[963:969], + 202: _Opcode_name[969:973], + 203: _Opcode_name[973:979], + 204: _Opcode_name[979:983], + 205: _Opcode_name[983:989], + 206: _Opcode_name[989:997], + 207: _Opcode_name[997:1003], + 208: _Opcode_name[1003:1010], + 209: _Opcode_name[1010:1022], + 210: _Opcode_name[1022:1028], + 211: _Opcode_name[1028:1038], + 216: _Opcode_name[1038:1044], + 217: _Opcode_name[1044:1050], + 219: _Opcode_name[1050:1057], } func (i Opcode) String() string {