Remove pre and post opcode handlers from EVM (#2409)

nimbus/evm/interpreter/op_handlers.nim

@@ -97,7 +97,7 @@ const
   #
   #   to pick right function when <op> is a variable . Using
   #
-  #      VmOpHandlers[fork][op].exec.run
+  #      VmOpHandlers[fork][op].exec
   #
   #   only works when <op> is a constant. There seems to be some optimisation
   #   that garbles the <exec> sub-structures elements <prep>, <run>, and <post>.
@@ -113,7 +113,7 @@ const
         for op in Op:
           rc[fork][op].name = tab[op].name
           rc[fork][op].info = tab[op].info
-          rc[fork][op].run  = tab[op].exec.run
+          rc[fork][op].run  = tab[op].exec
       rc
 
 # ------------------------------------------------------------------------------

nimbus/evm/interpreter/op_handlers/oph_arithmetic.nim

@@ -290,179 +290,157 @@ const
      forks: VmOpAllForks,
      name: "add",
      info: "Addition operation",
-     exec: (prep: VmOpIgnore,
+     exec: VmOpFn addOp),
-            run:  VmOpFn addOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Mul,         ##  0x02, Multiplication
      forks: VmOpAllForks,
      name: "mul",
      info: "Multiplication operation",
-     exec: (prep: VmOpIgnore,
+     exec: mulOp),
-            run:  mulOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Sub,         ## 0x03, Subtraction
      forks: VmOpAllForks,
      name: "sub",
      info: "Subtraction operation",
-     exec: (prep: VmOpIgnore,
+     exec: subOp),
-            run:  subOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Div,         ## 0x04, Division
      forks: VmOpAllForks,
      name: "divide",
      info: "Integer division operation",
-     exec: (prep: VmOpIgnore,
+     exec: divideOp),
-            run:  divideOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Sdiv,        ## 0x05, Signed division
      forks: VmOpAllForks,
      name: "sdiv",
      info: "Signed integer division operation (truncated)",
-     exec: (prep: VmOpIgnore,
+     exec: sdivOp),
-            run:  sdivOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Mod,         ## 0x06, Modulo
      forks: VmOpAllForks,
      name: "modulo",
      info: "Modulo remainder operation",
-     exec: (prep: VmOpIgnore,
+     exec: moduloOp),
-            run:  moduloOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Smod,        ## 0x07, Signed modulo
      forks: VmOpAllForks,
      name: "smod",
      info: "Signed modulo remainder operation",
-     exec: (prep: VmOpIgnore,
+     exec: smodOp),
-            run:  smodOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Addmod,      ## 0x08, Modulo addition, Intermediate
                           ## computations do not roll over at 2^256
      forks: VmOpAllForks,
      name: "addmod",
      info: "Modulo addition operation",
-     exec: (prep: VmOpIgnore,
+     exec: addmodOp),
-            run:  addmodOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Mulmod,      ## 0x09, Modulo multiplication, Intermediate
                           ## computations do not roll over at 2^256
      forks: VmOpAllForks,
      name: "mulmod",
      info: "Modulo multiplication operation",
-     exec: (prep: VmOpIgnore,
+     exec: mulmodOp),
-            run:  mulmodOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Exp,         ## 0x0a, Exponentiation
      forks: VmOpAllForks,
      name: "exp",
      info: "Exponentiation operation",
-     exec: (prep: VmOpIgnore,
+     exec: expOp),
-            run:  expOp,
+
-            post: VmOpIgnore)),
 
     (opCode: SignExtend,  ## 0x0b, Extend 2's complemet length
      forks: VmOpAllForks,
      name: "signExtend",
      info: "Extend length of two’s complement signed integer",
-     exec: (prep: VmOpIgnore,
+     exec: signExtendOp),
-            run:  signExtendOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Lt,          ## 0x10, Less-than
      forks: VmOpAllForks,
      name: "lt",
      info: "Less-than comparison",
-     exec: (prep: VmOpIgnore,
+     exec: ltOp),
-            run:  ltOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Gt,          ## 0x11, Greater-than
      forks: VmOpAllForks,
      name: "gt",
      info: "Greater-than comparison",
-     exec: (prep: VmOpIgnore,
+     exec: gtOp),
-            run:  gtOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Slt,         ## 0x12, Signed less-than
      forks: VmOpAllForks,
      name: "slt",
      info: "Signed less-than comparison",
-     exec: (prep: VmOpIgnore,
+     exec: sltOp),
-            run:  sltOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Sgt,         ## 0x13, Signed greater-than
      forks: VmOpAllForks,
      name: "sgt",
      info: "Signed greater-than comparison",
-     exec: (prep: VmOpIgnore,
+     exec: sgtOp),
-            run:  sgtOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Eq,          ## 0x14, Equality
      forks: VmOpAllForks,
      name: "eq",
      info: "Equality comparison",
-     exec: (prep: VmOpIgnore,
+     exec: eqOp),
-            run:  eqOp,
+
-            post: VmOpIgnore)),
 
     (opCode: IsZero,      ## 0x15, Not operator
      forks: VmOpAllForks,
      name: "isZero",
      info: "Simple not operator (Note: real Yellow Paper description)",
-     exec: (prep: VmOpIgnore,
+     exec: isZeroOp),
-            run:  isZeroOp,
+
-            post: VmOpIgnore)),
 
     (opCode: And,         ## 0x16, AND
      forks: VmOpAllForks,
      name: "andOp",
      info: "Bitwise AND operation",
-     exec: (prep: VmOpIgnore,
+     exec: andOp),
-            run:  andOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Or,          ## 0x17, OR
      forks: VmOpAllForks,
      name: "orOp",
      info: "Bitwise OR operation",
-     exec: (prep: VmOpIgnore,
+     exec: orOp),
-            run:  orOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Xor,         ## 0x18, XOR
      forks: VmOpAllForks,
      name: "xorOp",
      info: "Bitwise XOR operation",
-     exec: (prep: VmOpIgnore,
+     exec: xorOp),
-            run:  xorOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Not,         ## 0x19, NOT
      forks: VmOpAllForks,
      name: "notOp",
      info: "Bitwise NOT operation",
-     exec: (prep: VmOpIgnore,
+     exec: notOp),
-            run:  notOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Byte,        ## 0x1a, Retrieve byte
      forks: VmOpAllForks,
      name: "byteOp",
      info: "Retrieve single byte from word",
-     exec: (prep: VmOpIgnore,
+     exec: byteOp),
-            run:  byteOp,
+
-            post: VmOpIgnore)),
 
     # Constantinople's new opcodes
 
@@ -470,25 +448,21 @@ const
      forks: VmOpConstantinopleAndLater,
      name: "shlOp",
      info: "Shift left",
-     exec: (prep: VmOpIgnore,
+     exec: shlOp),
-            run:  shlOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Shr,         ## 0x1c, Shift right logical
      forks: VmOpConstantinopleAndLater,
      name: "shrOp",
      info: "Logical shift right",
-     exec: (prep: VmOpIgnore,
+     exec: shrOp),
-            run:  shrOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Sar,         ## 0x1d, Shift right arithmetic
      forks: VmOpConstantinopleAndLater,
      name: "sarOp",
      info: "Arithmetic shift right",
-     exec: (prep: VmOpIgnore,
+     exec: sarOp)]
-            run:  sarOp,
-            post: VmOpIgnore))]
 
 # ------------------------------------------------------------------------------
 # End

nimbus/evm/interpreter/op_handlers/oph_blockdata.nim

@@ -100,89 +100,77 @@ const
      forks: VmOpAllForks,
      name: "blockhash",
      info: "Get the hash of one of the 256 most recent complete blocks",
-     exec: (prep: VmOpIgnore,
+     exec: blockhashOp),
-            run:  blockhashOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Coinbase,        ## 0x41, Beneficiary address
      forks: VmOpAllForks,
      name: "coinbase",
      info: "Get the block's beneficiary address",
-     exec: (prep: VmOpIgnore,
+     exec: coinBaseOp),
-            run:  coinBaseOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Timestamp,       ## 0x42, Block timestamp.
      forks: VmOpAllForks,
      name: "timestamp",
      info: "Get the block's timestamp",
-     exec: (prep: VmOpIgnore,
+     exec: timestampOp),
-            run:  timestampOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Number,          ## 0x43, Block number
      forks: VmOpAllForks,
      name: "blockNumber",
      info: "Get the block's number",
-     exec: (prep: VmOpIgnore,
+     exec: blocknumberOp),
-            run:  blocknumberOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Difficulty,      ## 0x44, Block difficulty
      forks: VmOpAllForks,
      name: "difficulty",
      info: "Get the block's difficulty",
-     exec: (prep: VmOpIgnore,
+     exec: difficultyOp),
-            run:  difficultyOp,
+
-            post: VmOpIgnore)),
 
     (opCode: GasLimit,        ## 0x45, Block gas limit
      forks: VmOpAllForks,
      name: "gasLimit",
      info: "Get the block's gas limit",
-     exec: (prep: VmOpIgnore,
+     exec: gasLimitOp),
-            run:  gasLimitOp,
+
-            post: VmOpIgnore)),
 
     (opCode: ChainIdOp,       ## 0x46, EIP-155 chain identifier
      forks: VmOpIstanbulAndLater,
      name: "chainId",
      info: "Get current chain’s EIP-155 unique identifier",
-     exec: (prep: VmOpIgnore,
+     exec: chainIdOp),
-            run:  chainIdOp,
+
-            post: VmOpIgnore)),
 
     (opCode: SelfBalance,     ## 0x47, Contract balance.
      forks: VmOpIstanbulAndLater,
      name: "selfBalance",
      info: "Get current contract's balance",
-     exec: (prep: VmOpIgnore,
+     exec: selfBalanceOp),
-            run:  selfBalanceOp,
+
-            post: VmOpIgnore)),
 
     (opCode: BaseFee,         ## 0x48, EIP-1559 Block base fee.
      forks: VmOpLondonAndLater,
      name: "baseFee",
      info: "Get current block's EIP-1559 base fee",
-     exec: (prep: VmOpIgnore,
+     exec: baseFeeOp),
-            run:  baseFeeOp,
+
-            post: VmOpIgnore)),
 
     (opCode: BlobHash,        ## 0x49, EIP-4844 Transaction versioned hash
      forks: VmOpCancunAndLater,
      name: "blobHash",
      info: "Get current transaction's EIP-4844 versioned hash",
-     exec: (prep: VmOpIgnore,
+     exec: blobHashOp),
-            run:  blobHashOp,
+
-            post: VmOpIgnore)),
 
     (opCode: BlobBaseFee,     ## 0x4a, EIP-7516 Returns the current data-blob base-fee
      forks: VmOpCancunAndLater,
      name: "blobBaseFee",
      info: "Returns the current data-blob base-fee",
-     exec: (prep: VmOpIgnore,
+     exec: blobBaseFeeOp)]
-            run:  blobBaseFeeOp,
-            post: VmOpIgnore))]
 
 # ------------------------------------------------------------------------------
 # End

nimbus/evm/interpreter/op_handlers/oph_call.nim

@@ -514,34 +514,29 @@ const
      forks: VmOpAllForks,
      name: "call",
      info: "Message-Call into an account",
-     exec: (prep: VmOpIgnore,
+     exec: callOp),
-            run: callOp,
+
-            post: VmOpIgnore)),
 
     (opCode: CallCode,     ## 0xf2, Message-Call with alternative code
      forks: VmOpAllForks,
      name: "callCode",
      info: "Message-call into this account with alternative account's code",
-     exec: (prep: VmOpIgnore,
+     exec: callCodeOp),
-            run: callCodeOp,
+
-            post: VmOpIgnore)),
 
     (opCode: DelegateCall, ## 0xf4, CallCode with persisting sender and value
      forks: VmOpHomesteadAndLater,
      name: "delegateCall",
      info: "Message-call into this account with an alternative account's " &
            "code but persisting the current values for sender and value.",
-     exec: (prep: VmOpIgnore,
+     exec: delegateCallOp),
-            run: delegateCallOp,
+
-            post: VmOpIgnore)),
 
     (opCode: StaticCall,   ## 0xfa, Static message-call into an account
      forks: VmOpByzantiumAndLater,
      name: "staticCall",
      info: "Static message-call into an account",
-     exec: (prep: VmOpIgnore,
+     exec: staticCallOp)]
-            run: staticCallOp,
-            post: VmOpIgnore))]
 
 # ------------------------------------------------------------------------------
 # End

nimbus/evm/interpreter/op_handlers/oph_create.nim

@@ -255,17 +255,14 @@ const
      forks: VmOpAllForks,
      name: "create",
      info: "Create a new account with associated code",
-     exec: (prep: VmOpIgnore,
+     exec: createOp),
-            run: createOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Create2,   ## 0xf5, Create using keccak256
      forks: VmOpConstantinopleAndLater,
      name: "create2",
      info: "Behaves identically to CREATE, except using keccak256",
-     exec: (prep: VmOpIgnore,
+     exec: create2Op)]
-            run: create2Op,
-            post: VmOpIgnore))]
 
 # ------------------------------------------------------------------------------
 # End

nimbus/evm/interpreter/op_handlers/oph_defs.nim

@@ -28,20 +28,12 @@ type
                               ## back via argument descriptor ``k``
     proc(k: var VmCtx): EvmResultVoid {.nimcall, gcsafe, raises:[].}
 
-
-  VmOpHanders* = tuple        ## three step op code execution, typically
-                              ## only the ``run`` entry is activated
-    prep: VmOpFn
-    run:  VmOpFn
-    post: VmOpFn
-
-
   VmOpExec* = tuple           ## op code handler entry
     opCode: Op                ## index back-reference
     forks: set[EVMFork]       ## forks applicable for this operation
     name: string              ## handler name
     info: string              ## handter info, explainer
-    exec: VmOpHanders
+    exec: VmOpFn
 
 # ------------------------------------------------------------------------------
 # Public

nimbus/evm/interpreter/op_handlers/oph_envinfo.nim

@@ -253,163 +253,142 @@ const
      forks: VmOpAllForks,
      name: "address",
      info: "Get address of currently executing account",
-     exec: (prep: VmOpIgnore,
+     exec: VmOpFn addressOp),
-            run:  VmOpFn addressOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Balance,         ## 0x31, Balance
      forks: VmOpAllForks - VmOpBerlinAndLater,
      name: "balance",
      info: "Get balance of the given account",
-     exec: (prep: VmOpIgnore,
+     exec: balanceOp),
-            run:  balanceOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Balance,         ## 0x31, Balance for Berlin and later
      forks: VmOpBerlinAndLater,
      name: "balanceEIP2929",
      info: "EIP2929: Get balance of the given account",
-     exec: (prep: VmOpIgnore,
+     exec: balanceEIP2929Op),
-            run:  balanceEIP2929Op,
+
-            post: VmOpIgnore)),
 
     (opCode: Origin,          ## 0x32, Origination address
      forks: VmOpAllForks,
      name: "origin",
      info: "Get execution origination address",
-     exec: (prep: VmOpIgnore,
+     exec: originOp),
-            run:  originOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Caller,          ## 0x33, Caller address
      forks: VmOpAllForks,
      name: "caller",
      info: "Get caller address",
-     exec: (prep: VmOpIgnore,
+     exec: callerOp),
-            run:  callerOp,
+
-            post: VmOpIgnore)),
 
     (opCode: CallValue,       ## 0x34, Execution deposited value
      forks: VmOpAllForks,
      name: "callValue",
      info: "Get deposited value by the instruction/transaction " &
            "responsible for this execution",
-     exec: (prep: VmOpIgnore,
+     exec: callValueOp),
-            run:  callValueOp,
+
-            post: VmOpIgnore)),
 
     (opCode: CallDataLoad,    ## 0x35, Input data
      forks: VmOpAllForks,
      name: "callDataLoad",
      info: "Get input data of current environment",
-     exec: (prep: VmOpIgnore,
+     exec: callDataLoadOp),
-            run:  callDataLoadOp,
+
-            post: VmOpIgnore)),
 
     (opCode: CallDataSize,    ## 0x36, Size of input data
      forks: VmOpAllForks,
      name: "callDataSize",
      info: "Get size of input data in current environment",
-     exec: (prep: VmOpIgnore,
+     exec: callDataSizeOp),
-            run:  callDataSizeOp,
+
-            post: VmOpIgnore)),
 
     (opCode: CallDataCopy,    ## 0x37, Copy input data to memory.
      forks: VmOpAllForks,
      name: "callDataCopy",
      info: "Copy input data in current environment to memory",
-     exec: (prep: VmOpIgnore,
+     exec: callDataCopyOp),
-            run:  callDataCopyOp,
+
-            post: VmOpIgnore)),
 
     (opCode: CodeSize,       ## 0x38, Size of code
      forks: VmOpAllForks,
      name: "codeSize",
      info: "Get size of code running in current environment",
-     exec: (prep: VmOpIgnore,
+     exec: codeSizeOp),
-            run:  codeSizeOp,
+
-            post: VmOpIgnore)),
 
     (opCode: CodeCopy,       ## 0x39, Copy code to memory.
      forks: VmOpAllForks,
      name: "codeCopy",
      info: "Copy code running in current environment to memory",
-     exec: (prep: VmOpIgnore,
+     exec: codeCopyOp),
-            run:  codeCopyOp,
+
-            post: VmOpIgnore)),
 
     (opCode: GasPrice,       ## 0x3a, Gas price
      forks: VmOpAllForks,
      name: "gasPrice",
      info: "Get price of gas in current environment",
-     exec: (prep: VmOpIgnore,
+     exec: gasPriceOp),
-            run:  gasPriceOp,
+
-            post: VmOpIgnore)),
 
     (opCode: ExtCodeSize,    ## 0x3b, Account code size
      forks: VmOpAllForks - VmOpBerlinAndLater,
      name: "extCodeSize",
      info: "Get size of an account's code",
-     exec: (prep: VmOpIgnore,
+     exec: extCodeSizeOp),
-            run:  extCodeSizeOp,
+
-            post: VmOpIgnore)),
 
     (opCode: ExtCodeSize,    ## 0x3b, Account code size for Berlin and later
      forks: VmOpBerlinAndLater,
      name: "extCodeSizeEIP2929",
      info: "EIP2929: Get size of an account's code",
-     exec: (prep: VmOpIgnore,
+     exec: extCodeSizeEIP2929Op),
-            run:  extCodeSizeEIP2929Op,
+
-            post: VmOpIgnore)),
 
     (opCode: ExtCodeCopy,    ## 0x3c, Account code copy to memory.
      forks: VmOpAllForks - VmOpBerlinAndLater,
      name: "extCodeCopy",
      info: "Copy an account's code to memory",
-     exec: (prep: VmOpIgnore,
+     exec: extCodeCopyOp),
-            run:  extCodeCopyOp,
+
-            post: VmOpIgnore)),
 
     (opCode: ExtCodeCopy,    ## 0x3c, Account Code-copy for Berlin and later
      forks: VmOpBerlinAndLater,
      name: "extCodeCopyEIP2929",
      info: "EIP2929: Copy an account's code to memory",
-     exec: (prep: VmOpIgnore,
+     exec: extCodeCopyEIP2929Op),
-            run:  extCodeCopyEIP2929Op,
+
-            post: VmOpIgnore)),
 
     (opCode: ReturnDataSize, ## 0x3d, Previous call output data size
      forks: VmOpByzantiumAndLater,
      name: "returnDataSize",
      info: "Get size of output data from the previous call " &
            "from the current environment",
-     exec: (prep: VmOpIgnore,
+     exec: returnDataSizeOp),
-            run:  returnDataSizeOp,
+
-            post: VmOpIgnore)),
 
     (opCode: ReturnDataCopy, ## 0x3e, Previous call output data copy to memory
      forks: VmOpByzantiumAndLater,
      name: "returnDataCopy",
      info: "Copy output data from the previous call to memory",
-     exec: (prep: VmOpIgnore,
+     exec: returnDataCopyOp),
-            run:  returnDataCopyOp,
+
-            post: VmOpIgnore)),
 
     (opCode: ExtCodeHash,    ## 0x3f, Contract hash
      forks: VmOpConstantinopleAndLater - VmOpBerlinAndLater,
      name: "extCodeHash",
      info: "Returns the keccak256 hash of a contract’s code",
-     exec: (prep: VmOpIgnore,
+     exec: extCodeHashOp),
-            run:  extCodeHashOp,
+
-            post: VmOpIgnore)),
 
     (opCode: ExtCodeHash,    ## 0x3f, Contract hash for berlin and later
      forks: VmOpBerlinAndLater,
      name: "extCodeHashEIP2929",
      info: "EIP2929: Returns the keccak256 hash of a contract’s code",
-     exec: (prep: VmOpIgnore,
+     exec: extCodeHashEIP2929Op)]
-            run:  extCodeHashEIP2929Op,
-            post: VmOpIgnore))]
 
 # ------------------------------------------------------------------------------
 # End

nimbus/evm/interpreter/op_handlers/oph_gen_handlers.nim

@@ -99,10 +99,7 @@ macro genOphList*(runHandler: static[OphNumToTextFn];
                   "info".asText(n.handlerInfo),
                   nnkExprColonExpr.newTree(
                     newIdentNode("exec"),
-                    nnkPar.newTree(
+                    newIdentNode(n.runHandler)))
-                      "prep".asIdent("VmOpIgnore"),
-                      "run".asIdent(n.runHandler),
-                      "post".asIdent("VmOpIgnore"))))
 
   # => const <varName>*: seq[VmOpExec] = @[ <records> ]
   result = nnkStmtList.newTree(

nimbus/evm/interpreter/op_handlers/oph_hash.nim

@@ -62,9 +62,7 @@ const
      forks: VmOpAllForks,
      name: "sha3",
      info: "Compute Keccak-256 hash",
-     exec: (prep: VmOpIgnore,
+     exec: sha3Op)]
-            run:  sha3Op,
-            post: VmOpIgnore))]
 
 # ------------------------------------------------------------------------------
 # End

nimbus/evm/interpreter/op_handlers/oph_memory.nim

@@ -324,164 +324,143 @@ const
      forks: VmOpAllForks,
      name: "pop",
      info: "Remove item from stack",
-     exec: (prep: VmOpIgnore,
+     exec: VmOpFn popOp),
-            run:  VmOpFn popOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Mload,     ## 0x51, Load word from memory
      forks: VmOpAllForks,
      name: "mload",
      info: "Load word from memory",
-     exec: (prep: VmOpIgnore,
+     exec: mloadOp),
-            run:  mloadOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Mstore,    ## 0x52, Save word to memory
      forks: VmOpAllForks,
      name: "mstore",
      info: "Save word to memory",
-     exec: (prep: VmOpIgnore,
+     exec: mstoreOp),
-            run:  mstoreOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Mstore8,   ## 0x53, Save byte to memory
      forks: VmOpAllForks,
      name: "mstore8",
      info: "Save byte to memory",
-     exec: (prep: VmOpIgnore,
+     exec: mstore8Op),
-            run:  mstore8Op,
+
-            post: VmOpIgnore)),
 
     (opCode: Sload,     ## 0x54, Load word from storage
      forks: VmOpAllForks - VmOpBerlinAndLater,
      name: "sload",
      info: "Load word from storage",
-     exec: (prep: VmOpIgnore,
+     exec: sloadOp),
-            run:  sloadOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Sload,     ## 0x54, sload for Berlin and later
      forks: VmOpBerlinAndLater,
      name: "sloadEIP2929",
      info: "EIP2929: sload for Berlin and later",
-     exec: (prep: VmOpIgnore,
+     exec: sloadEIP2929Op),
-            run:  sloadEIP2929Op,
+
-            post: VmOpIgnore)),
 
     (opCode: Sstore,    ## 0x55, Save word
      forks: VmOpAllForks - VmOpConstantinopleAndLater,
      name: "sstore",
      info: "Save word to storage",
-     exec: (prep: VmOpIgnore,
+     exec: sstoreOp),
-            run:  sstoreOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Sstore,    ## 0x55, sstore for Constantinople and later
      forks: VmOpConstantinopleAndLater - VmOpPetersburgAndLater,
      name: "sstoreEIP1283",
      info: "EIP1283: sstore for Constantinople and later",
-     exec: (prep: VmOpIgnore,
+     exec: sstoreEIP1283Op),
-            run:  sstoreEIP1283Op,
+
-            post: VmOpIgnore)),
 
     (opCode: Sstore,    ## 0x55, sstore for Petersburg and later
      forks: VmOpPetersburgAndLater - VmOpIstanbulAndLater,
      name: "sstore",
      info: "sstore for Constantinople and later",
-     exec: (prep: VmOpIgnore,
+     exec: sstoreOp),
-            run:  sstoreOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Sstore,    ##  0x55, sstore for Istanbul and later
      forks: VmOpIstanbulAndLater - VmOpBerlinAndLater,
      name: "sstoreEIP2200",
      info: "EIP2200: sstore for Istanbul and later",
-     exec: (prep: VmOpIgnore,
+     exec: sstoreEIP2200Op),
-            run:  sstoreEIP2200Op,
+
-            post: VmOpIgnore)),
 
     (opCode: Sstore,    ##  0x55, sstore for Berlin and later
      forks: VmOpBerlinAndLater,
      name: "sstoreEIP2929",
      info: "EIP2929: sstore for Istanbul and later",
-     exec: (prep: VmOpIgnore,
+     exec: sstoreEIP2929Op),
-            run:  sstoreEIP2929Op,
+
-            post: VmOpIgnore)),
 
     (opCode: Jump,      ## 0x56, Jump
      forks: VmOpAllForks,
      name: "jump",
      info: "Alter the program counter",
-     exec: (prep: VmOpIgnore,
+     exec: jumpOp),
-            run:  jumpOp,
+
-            post: VmOpIgnore)),
 
     (opCode: JumpI,     ## 0x57, Conditional jump
      forks: VmOpAllForks,
      name: "jumpI",
      info: "Conditionally alter the program counter",
-     exec: (prep: VmOpIgnore,
+     exec: jumpIOp),
-            run:  jumpIOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Pc,        ## 0x58, Program counter prior to instruction
      forks: VmOpAllForks,
      name: "pc",
      info: "Get the value of the program counter prior to the increment "&
            "corresponding to this instruction",
-     exec: (prep: VmOpIgnore,
+     exec: pcOp),
-            run:  pcOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Msize,     ## 0x59, Memory size
      forks: VmOpAllForks,
      name: "msize",
      info: "Get the size of active memory in bytes",
-     exec: (prep: VmOpIgnore,
+     exec: msizeOp),
-            run:  msizeOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Gas,       ##  0x5a, Get available gas
      forks: VmOpAllForks,
      name: "gas",
      info: "Get the amount of available gas, including the corresponding "&
            "reduction for the cost of this instruction",
-     exec: (prep: VmOpIgnore,
+     exec: gasOp),
-            run:  gasOp,
+
-            post: VmOpIgnore)),
 
     (opCode: JumpDest,  ## 0x5b, Mark jump target. This operation has no effect
                         ##       on machine state during execution
      forks: VmOpAllForks,
      name: "jumpDest",
      info: "Mark a valid destination for jumps",
-     exec: (prep: VmOpIgnore,
+     exec: jumpDestOp),
-            run:  jumpDestOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Tload,     ## 0x5c, Load word from transient storage.
      forks: VmOpCancunAndLater,
      name: "tLoad",
      info: "Load word from transient storage",
-     exec: (prep: VmOpIgnore,
+     exec: tloadOp),
-            run:  tloadOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Tstore,     ## 0x5d, Save word to transient storage.
      forks: VmOpCancunAndLater,
      name: "tStore",
      info: "Save word to transient storage",
-     exec: (prep: VmOpIgnore,
+     exec: tstoreOp),
-            run:  tstoreOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Mcopy,     ## 0x5e, Copy memory
      forks: VmOpCancunAndLater,
      name: "MCopy",
      info: "Copy memory",
-     exec: (prep: VmOpIgnore,
+     exec: mCopyOp)]
-            run:  mCopyOp,
-            post: VmOpIgnore))]
 
 # ------------------------------------------------------------------------------
 # End

nimbus/evm/interpreter/op_handlers/oph_push.nim

@@ -76,9 +76,7 @@ const
      forks: VmOpShanghaiAndLater,
      name: "Push0",
      info: "Push 0 on the stack",
-     exec: (prep: VmOpIgnore,
+     exec: push0Op)]
-            run:  push0Op,
-            post: VmOpIgnore))]
 
 # ------------------------------------------------------------------------------
 # End

nimbus/evm/interpreter/op_handlers/oph_sysops.nim

@@ -164,58 +164,50 @@ const
      forks: VmOpAllForks,
      name: "returnOp",
      info: "Halt execution returning output data",
-     exec: (prep: VmOpIgnore,
+     exec: returnOp),
-            run: returnOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Revert,       ## 0xfd, Halt and revert state changes
      forks: VmOpByzantiumAndLater,
      name: "revert",
      info: "Halt execution reverting state changes but returning data " &
            "and remaining gas",
-     exec: (prep: VmOpIgnore,
+     exec: revertOp),
-            run: revertOp,
+
-            post: VmOpIgnore)),
 
     (opCode: Invalid,      ## 0xfe, invalid instruction.
      forks: VmOpAllForks,
      name: "invalidInstruction",
      info: "Designated invalid instruction",
-     exec: (prep: VmOpIgnore,
+     exec: invalidOp),
-            run: invalidOp,
+
-            post: VmOpIgnore)),
 
     (opCode: SelfDestruct, ## 0xff, Halt execution, prep for later deletion
      forks: VmOpAllForks - VmOpTangerineAndLater,
      name: "selfDestruct",
      info: "Halt execution and register account for later deletion",
-     exec: (prep: VmOpIgnore,
+     exec: selfDestructOp),
-            run:  selfDestructOp,
+
-            post: VmOpIgnore)),
 
     (opCode: SelfDestruct, ## 0xff, EIP150: self destruct, Tangerine
      forks: VmOpTangerineAndLater - VmOpSpuriousAndLater,
      name: "selfDestructEIP150",
      info: "EIP150: Halt execution and register account for later deletion",
-     exec: (prep: VmOpIgnore,
+     exec: selfDestructEIP150Op),
-            run:  selfDestructEIP150Op,
+
-            post: VmOpIgnore)),
 
     (opCode: SelfDestruct, ## 0xff, EIP161: self destruct, Spurious and later
      forks: VmOpSpuriousAndLater - VmOpBerlinAndLater,
      name: "selfDestructEIP161",
      info: "EIP161: Halt execution and register account for later deletion",
-     exec: (prep: VmOpIgnore,
+     exec: selfDestructEIP161Op),
-            run:  selfDestructEIP161Op,
+
-            post: VmOpIgnore)),
 
     (opCode: SelfDestruct, ## 0xff, EIP2929: self destruct, Berlin and later
      forks: VmOpBerlinAndLater,
      name: "selfDestructEIP2929",
      info: "EIP2929: Halt execution and register account for later deletion",
-     exec: (prep: VmOpIgnore,
+     exec: selfDestructEIP2929Op)]
-            run:  selfDestructEIP2929Op,
-            post: VmOpIgnore))]
 
 # ------------------------------------------------------------------------------
 # End