Skip to content

Commit 4b3fdbb

Browse files
Sahil-4555Sahil-4555
committed
vm: inline minStack/minDupStack/minSwapStack and delete unused functions
1 parent 6452b7a commit 4b3fdbb

File tree

3 files changed

+172
-181
lines changed

3 files changed

+172
-181
lines changed

‎core/vm/eips.go‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func enable1884(jt *JumpTable) {
8585
jt[SELFBALANCE] = &operation{
8686
execute: opSelfBalance,
8787
constantGas: GasFastStep,
88-
minStack: minStack(0, 1),
88+
minStack: 0,
8989
maxStack: maxStack(0, 1),
9090
}
9191
}
@@ -103,7 +103,7 @@ func enable1344(jt *JumpTable) {
103103
jt[CHAINID] = &operation{
104104
execute: opChainID,
105105
constantGas: GasQuickStep,
106-
minStack: minStack(0, 1),
106+
minStack: 0,
107107
maxStack: maxStack(0, 1),
108108
}
109109
}
@@ -175,7 +175,7 @@ func enable3198(jt *JumpTable) {
175175
jt[BASEFEE] = &operation{
176176
execute: opBaseFee,
177177
constantGas: GasQuickStep,
178-
minStack: minStack(0, 1),
178+
minStack: 0,
179179
maxStack: maxStack(0, 1),
180180
}
181181
}
@@ -187,14 +187,14 @@ func enable1153(jt *JumpTable) {
187187
jt[TLOAD] = &operation{
188188
execute: opTload,
189189
constantGas: params.WarmStorageReadCostEIP2929,
190-
minStack: minStack(1, 1),
190+
minStack: 1,
191191
maxStack: maxStack(1, 1),
192192
}
193193

194194
jt[TSTORE] = &operation{
195195
execute: opTstore,
196196
constantGas: params.WarmStorageReadCostEIP2929,
197-
minStack: minStack(2, 0),
197+
minStack: 2,
198198
maxStack: maxStack(2, 0),
199199
}
200200
}
@@ -232,7 +232,7 @@ func enable3855(jt *JumpTable) {
232232
jt[PUSH0] = &operation{
233233
execute: opPush0,
234234
constantGas: GasQuickStep,
235-
minStack: minStack(0, 1),
235+
minStack: 0,
236236
maxStack: maxStack(0, 1),
237237
}
238238
}
@@ -257,7 +257,7 @@ func enable5656(jt *JumpTable) {
257257
execute: opMcopy,
258258
constantGas: GasFastestStep,
259259
dynamicGas: gasMcopy,
260-
minStack: minStack(3, 0),
260+
minStack: 3,
261261
maxStack: maxStack(3, 0),
262262
memorySize: memoryMcopy,
263263
}
@@ -307,7 +307,7 @@ func enable4844(jt *JumpTable) {
307307
jt[BLOBHASH] = &operation{
308308
execute: opBlobHash,
309309
constantGas: GasFastestStep,
310-
minStack: minStack(1, 1),
310+
minStack: 1,
311311
maxStack: maxStack(1, 1),
312312
}
313313
}
@@ -317,7 +317,7 @@ func enable7939(jt *JumpTable) {
317317
jt[CLZ] = &operation{
318318
execute: opCLZ,
319319
constantGas: GasFastStep,
320-
minStack: minStack(1, 1),
320+
minStack: 1,
321321
maxStack: maxStack(1, 1),
322322
}
323323
}
@@ -327,7 +327,7 @@ func enable7516(jt *JumpTable) {
327327
jt[BLOBBASEFEE] = &operation{
328328
execute: opBlobBaseFee,
329329
constantGas: GasQuickStep,
330-
minStack: minStack(0, 1),
330+
minStack: 0,
331331
maxStack: maxStack(0, 1),
332332
}
333333
}
@@ -338,7 +338,7 @@ func enable6780(jt *JumpTable) {
338338
execute: opSelfdestruct6780,
339339
dynamicGas: gasSelfdestructEIP3529,
340340
constantGas: params.SelfdestructGasEIP150,
341-
minStack: minStack(1, 0),
341+
minStack: 1,
342342
maxStack: maxStack(1, 0),
343343
}
344344
}
@@ -348,19 +348,19 @@ func enable8024(jt *JumpTable) {
348348
jt[DUPN] = &operation{
349349
execute: opDupN,
350350
constantGas: GasFastestStep,
351-
minStack: minStack(1, 0),
351+
minStack: 1,
352352
maxStack: maxStack(0, 1),
353353
}
354354
jt[SWAPN] = &operation{
355355
execute: opSwapN,
356356
constantGas: GasFastestStep,
357-
minStack: minStack(2, 0),
357+
minStack: 2,
358358
maxStack: maxStack(0, 0),
359359
}
360360
jt[EXCHANGE] = &operation{
361361
execute: opExchange,
362362
constantGas: GasFastestStep,
363-
minStack: minStack(2, 0),
363+
minStack: 2,
364364
maxStack: maxStack(0, 0),
365365
}
366366
}
@@ -450,41 +450,41 @@ func enable4762(jt *JumpTable) {
450450
jt[SSTORE] = &operation{
451451
dynamicGas: gasSStore4762,
452452
execute: opSstore,
453-
minStack: minStack(2, 0),
453+
minStack: 2,
454454
maxStack: maxStack(2, 0),
455455
}
456456
jt[SLOAD] = &operation{
457457
dynamicGas: gasSLoad4762,
458458
execute: opSload,
459-
minStack: minStack(1, 1),
459+
minStack: 1,
460460
maxStack: maxStack(1, 1),
461461
}
462462

463463
jt[BALANCE] = &operation{
464464
execute: opBalance,
465465
dynamicGas: gasBalance4762,
466-
minStack: minStack(1, 1),
466+
minStack: 1,
467467
maxStack: maxStack(1, 1),
468468
}
469469

470470
jt[EXTCODESIZE] = &operation{
471471
execute: opExtCodeSize,
472472
dynamicGas: gasExtCodeSize4762,
473-
minStack: minStack(1, 1),
473+
minStack: 1,
474474
maxStack: maxStack(1, 1),
475475
}
476476

477477
jt[EXTCODEHASH] = &operation{
478478
execute: opExtCodeHash,
479479
dynamicGas: gasExtCodeHash4762,
480-
minStack: minStack(1, 1),
480+
minStack: 1,
481481
maxStack: maxStack(1, 1),
482482
}
483483

484484
jt[EXTCODECOPY] = &operation{
485485
execute: opExtCodeCopyEIP4762,
486486
dynamicGas: gasExtCodeCopyEIP4762,
487-
minStack: minStack(4, 0),
487+
minStack: 4,
488488
maxStack: maxStack(4, 0),
489489
memorySize: memoryExtCodeCopy,
490490
}
@@ -493,7 +493,7 @@ func enable4762(jt *JumpTable) {
493493
execute: opCodeCopy,
494494
constantGas: GasFastestStep,
495495
dynamicGas: gasCodeCopyEip4762,
496-
minStack: minStack(3, 0),
496+
minStack: 3,
497497
maxStack: maxStack(3, 0),
498498
memorySize: memoryCodeCopy,
499499
}
@@ -502,15 +502,15 @@ func enable4762(jt *JumpTable) {
502502
execute: opSelfdestruct6780,
503503
dynamicGas: gasSelfdestructEIP4762,
504504
constantGas: params.SelfdestructGasEIP150,
505-
minStack: minStack(1, 0),
505+
minStack: 1,
506506
maxStack: maxStack(1, 0),
507507
}
508508

509509
jt[CREATE] = &operation{
510510
execute: opCreate,
511511
constantGas: params.CreateNGasEip4762,
512512
dynamicGas: gasCreateEip3860,
513-
minStack: minStack(3, 1),
513+
minStack: 3,
514514
maxStack: maxStack(3, 1),
515515
memorySize: memoryCreate,
516516
}
@@ -519,54 +519,54 @@ func enable4762(jt *JumpTable) {
519519
execute: opCreate2,
520520
constantGas: params.CreateNGasEip4762,
521521
dynamicGas: gasCreate2Eip3860,
522-
minStack: minStack(4, 1),
522+
minStack: 4,
523523
maxStack: maxStack(4, 1),
524524
memorySize: memoryCreate2,
525525
}
526526

527527
jt[CALL] = &operation{
528528
execute: opCall,
529529
dynamicGas: gasCallEIP4762,
530-
minStack: minStack(7, 1),
530+
minStack: 7,
531531
maxStack: maxStack(7, 1),
532532
memorySize: memoryCall,
533533
}
534534

535535
jt[CALLCODE] = &operation{
536536
execute: opCallCode,
537537
dynamicGas: gasCallCodeEIP4762,
538-
minStack: minStack(7, 1),
538+
minStack: 7,
539539
maxStack: maxStack(7, 1),
540540
memorySize: memoryCall,
541541
}
542542

543543
jt[STATICCALL] = &operation{
544544
execute: opStaticCall,
545545
dynamicGas: gasStaticCallEIP4762,
546-
minStack: minStack(6, 1),
546+
minStack: 6,
547547
maxStack: maxStack(6, 1),
548548
memorySize: memoryStaticCall,
549549
}
550550

551551
jt[DELEGATECALL] = &operation{
552552
execute: opDelegateCall,
553553
dynamicGas: gasDelegateCallEIP4762,
554-
minStack: minStack(6, 1),
554+
minStack: 6,
555555
maxStack: maxStack(6, 1),
556556
memorySize: memoryDelegateCall,
557557
}
558558

559559
jt[PUSH1] = &operation{
560560
execute: opPush1EIP4762,
561561
constantGas: GasFastestStep,
562-
minStack: minStack(0, 1),
562+
minStack: 0,
563563
maxStack: maxStack(0, 1),
564564
}
565565
for i := 1; i < 32; i++ {
566566
jt[PUSH1+OpCode(i)] = &operation{
567567
execute: makePushEIP4762(uint64(i+1), i+1),
568568
constantGas: GasFastestStep,
569-
minStack: minStack(0, 1),
569+
minStack: 0,
570570
maxStack: maxStack(0, 1),
571571
}
572572
}

0 commit comments

Comments
 (0)