Revert "params: core, core/vm, miner: 64bit gas instructions (#3514)"

This reverts commit 8b57c49490.

core/vm/jump_table.go

@@ -17,7 +17,6 @@
 package vm
 
 import (
-	"errors"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/params"
@@ -25,13 +24,11 @@ import (
 
 type (
 	executionFunc       func(pc *uint64, env *EVM, contract *Contract, memory *Memory, stack *Stack) ([]byte, error)
-	gasFunc             func(params.GasTable, *EVM, *Contract, *Stack, *Memory, uint64) (uint64, error) // last parameter is the requested memory size as a uint64
+	gasFunc             func(params.GasTable, *EVM, *Contract, *Stack, *Memory, *big.Int) *big.Int
 	stackValidationFunc func(*Stack) error
 	memorySizeFunc      func(*Stack) *big.Int
 )
 
-var errGasUintOverflow = errors.New("gas uint64 overflow")
-
 type operation struct {
 	// op is the operation function
 	execute executionFunc
@@ -55,142 +52,149 @@ var defaultJumpTable = NewJumpTable()
 
 func NewJumpTable() [256]operation {
 	return [256]operation{
+		STOP: {
+			execute:       opStop,
+			gasCost:       constGasFunc(new(big.Int)),
+			validateStack: makeStackFunc(0, 0),
+			halts:         true,
+			valid:         true,
+		},
 		ADD: {
 			execute:       opAdd,
 			gasCost:       constGasFunc(GasFastestStep),
-			validateStack: makeStackFunc(2, 1),
-			valid:         true,
-		},
-		SUB: {
-			execute:       opSub,
-			gasCost:       constGasFunc(GasFastestStep),
-			validateStack: makeStackFunc(2, 1),
+			validateStack: makeStackFunc(2, -1),
 			valid:         true,
 		},
 		MUL: {
 			execute:       opMul,
 			gasCost:       constGasFunc(GasFastStep),
-			validateStack: makeStackFunc(2, 1),
+			validateStack: makeStackFunc(2, -1),
+			valid:         true,
+		},
+		SUB: {
+			execute:       opSub,
+			gasCost:       constGasFunc(GasFastestStep),
+			validateStack: makeStackFunc(2, -1),
 			valid:         true,
 		},
 		DIV: {
 			execute:       opDiv,
 			gasCost:       constGasFunc(GasFastStep),
-			validateStack: makeStackFunc(2, 1),
+			validateStack: makeStackFunc(2, -1),
 			valid:         true,
 		},
 		SDIV: {
 			execute:       opSdiv,
 			gasCost:       constGasFunc(GasFastStep),
-			validateStack: makeStackFunc(2, 1),
+			validateStack: makeStackFunc(2, -1),
 			valid:         true,
 		},
 		MOD: {
 			execute:       opMod,
 			gasCost:       constGasFunc(GasFastStep),
-			validateStack: makeStackFunc(2, 1),
+			validateStack: makeStackFunc(2, -1),
 			valid:         true,
 		},
 		SMOD: {
 			execute:       opSmod,
 			gasCost:       constGasFunc(GasFastStep),
-			validateStack: makeStackFunc(2, 1),
-			valid:         true,
-		},
-		EXP: {
-			execute:       opExp,
-			gasCost:       gasExp,
-			validateStack: makeStackFunc(2, 1),
-			valid:         true,
-		},
-		SIGNEXTEND: {
-			execute:       opSignExtend,
-			gasCost:       constGasFunc(GasFastStep),
-			validateStack: makeStackFunc(2, 1),
-			valid:         true,
-		},
-		NOT: {
-			execute:       opNot,
-			gasCost:       constGasFunc(GasFastestStep),
-			validateStack: makeStackFunc(1, 1),
-			valid:         true,
-		},
-		LT: {
-			execute:       opLt,
-			gasCost:       constGasFunc(GasFastestStep),
-			validateStack: makeStackFunc(2, 1),
-			valid:         true,
-		},
-		GT: {
-			execute:       opGt,
-			gasCost:       constGasFunc(GasFastestStep),
-			validateStack: makeStackFunc(2, 1),
-			valid:         true,
-		},
-		SLT: {
-			execute:       opSlt,
-			gasCost:       constGasFunc(GasFastestStep),
-			validateStack: makeStackFunc(2, 1),
-			valid:         true,
-		},
-		SGT: {
-			execute:       opSgt,
-			gasCost:       constGasFunc(GasFastestStep),
-			validateStack: makeStackFunc(2, 1),
-			valid:         true,
-		},
-		EQ: {
-			execute:       opEq,
-			gasCost:       constGasFunc(GasFastestStep),
-			validateStack: makeStackFunc(2, 1),
-			valid:         true,
-		},
-		ISZERO: {
-			execute:       opIszero,
-			gasCost:       constGasFunc(GasFastestStep),
-			validateStack: makeStackFunc(1, 1),
-			valid:         true,
-		},
-		AND: {
-			execute:       opAnd,
-			gasCost:       constGasFunc(GasFastestStep),
-			validateStack: makeStackFunc(2, 1),
-			valid:         true,
-		},
-		OR: {
-			execute:       opOr,
-			gasCost:       constGasFunc(GasFastestStep),
-			validateStack: makeStackFunc(2, 1),
-			valid:         true,
-		},
-		XOR: {
-			execute:       opXor,
-			gasCost:       constGasFunc(GasFastestStep),
-			validateStack: makeStackFunc(2, 1),
-			valid:         true,
-		},
-		BYTE: {
-			execute:       opByte,
-			gasCost:       constGasFunc(GasFastestStep),
-			validateStack: makeStackFunc(2, 1),
+			validateStack: makeStackFunc(2, -1),
 			valid:         true,
 		},
 		ADDMOD: {
 			execute:       opAddmod,
 			gasCost:       constGasFunc(GasMidStep),
-			validateStack: makeStackFunc(3, 1),
+			validateStack: makeStackFunc(3, -2),
 			valid:         true,
 		},
 		MULMOD: {
 			execute:       opMulmod,
 			gasCost:       constGasFunc(GasMidStep),
-			validateStack: makeStackFunc(3, 1),
+			validateStack: makeStackFunc(3, -2),
+			valid:         true,
+		},
+		EXP: {
+			execute:       opExp,
+			gasCost:       gasExp,
+			validateStack: makeStackFunc(2, -1),
+			valid:         true,
+		},
+		SIGNEXTEND: {
+			execute:       opSignExtend,
+			gasCost:       constGasFunc(GasFastStep),
+			validateStack: makeStackFunc(2, -1),
+			valid:         true,
+		},
+		LT: {
+			execute:       opLt,
+			gasCost:       constGasFunc(GasFastestStep),
+			validateStack: makeStackFunc(2, -1),
+			valid:         true,
+		},
+		GT: {
+			execute:       opGt,
+			gasCost:       constGasFunc(GasFastestStep),
+			validateStack: makeStackFunc(2, -1),
+			valid:         true,
+		},
+		SLT: {
+			execute:       opSlt,
+			gasCost:       constGasFunc(GasFastestStep),
+			validateStack: makeStackFunc(2, -1),
+			valid:         true,
+		},
+		SGT: {
+			execute:       opSgt,
+			gasCost:       constGasFunc(GasFastestStep),
+			validateStack: makeStackFunc(2, -1),
+			valid:         true,
+		},
+		EQ: {
+			execute:       opEq,
+			gasCost:       constGasFunc(GasFastestStep),
+			validateStack: makeStackFunc(2, -1),
+			valid:         true,
+		},
+		ISZERO: {
+			execute:       opIszero,
+			gasCost:       constGasFunc(GasFastestStep),
+			validateStack: makeStackFunc(1, 0),
+			valid:         true,
+		},
+		AND: {
+			execute:       opAnd,
+			gasCost:       constGasFunc(GasFastestStep),
+			validateStack: makeStackFunc(2, -1),
+			valid:         true,
+		},
+		XOR: {
+			execute:       opXor,
+			gasCost:       constGasFunc(GasFastestStep),
+			validateStack: makeStackFunc(2, -1),
+			valid:         true,
+		},
+		OR: {
+			execute:       opOr,
+			gasCost:       constGasFunc(GasFastestStep),
+			validateStack: makeStackFunc(2, -1),
+			valid:         true,
+		},
+		NOT: {
+			execute:       opNot,
+			gasCost:       constGasFunc(GasFastestStep),
+			validateStack: makeStackFunc(1, 0),
+			valid:         true,
+		},
+		BYTE: {
+			execute:       opByte,
+			gasCost:       constGasFunc(GasFastestStep),
+			validateStack: makeStackFunc(2, -1),
 			valid:         true,
 		},
 		SHA3: {
 			execute:       opSha3,
 			gasCost:       gasSha3,
-			validateStack: makeStackFunc(2, 1),
+			validateStack: makeStackFunc(2, -1),
 			memorySize:    memorySha3,
 			valid:         true,
 		},
@@ -203,7 +207,7 @@ func NewJumpTable() [256]operation {
 		BALANCE: {
 			execute:       opBalance,
 			gasCost:       gasBalance,
-			validateStack: makeStackFunc(0, 1),
+			validateStack: makeStackFunc(1, 0),
 			valid:         true,
 		},
 		ORIGIN: {
@@ -227,7 +231,7 @@ func NewJumpTable() [256]operation {
 		CALLDATALOAD: {
 			execute:       opCalldataLoad,
 			gasCost:       constGasFunc(GasFastestStep),
-			validateStack: makeStackFunc(1, 1),
+			validateStack: makeStackFunc(1, 0),
 			valid:         true,
 		},
 		CALLDATASIZE: {
@@ -239,7 +243,7 @@ func NewJumpTable() [256]operation {
 		CALLDATACOPY: {
 			execute:       opCalldataCopy,
 			gasCost:       gasCalldataCopy,
-			validateStack: makeStackFunc(3, 1),
+			validateStack: makeStackFunc(3, -3),
 			memorySize:    memoryCalldataCopy,
 			valid:         true,
 		},
@@ -249,36 +253,36 @@ func NewJumpTable() [256]operation {
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		EXTCODESIZE: {
-			execute:       opExtCodeSize,
-			gasCost:       gasExtCodeSize,
-			validateStack: makeStackFunc(1, 1),
-			valid:         true,
-		},
 		CODECOPY: {
 			execute:       opCodeCopy,
 			gasCost:       gasCodeCopy,
-			validateStack: makeStackFunc(3, 0),
+			validateStack: makeStackFunc(3, -3),
 			memorySize:    memoryCodeCopy,
 			valid:         true,
 		},
-		EXTCODECOPY: {
-			execute:       opExtCodeCopy,
-			gasCost:       gasExtCodeCopy,
-			validateStack: makeStackFunc(4, 0),
-			memorySize:    memoryExtCodeCopy,
-			valid:         true,
-		},
 		GASPRICE: {
 			execute:       opGasprice,
 			gasCost:       constGasFunc(GasQuickStep),
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
+		EXTCODESIZE: {
+			execute:       opExtCodeSize,
+			gasCost:       gasExtCodeSize,
+			validateStack: makeStackFunc(1, 0),
+			valid:         true,
+		},
+		EXTCODECOPY: {
+			execute:       opExtCodeCopy,
+			gasCost:       gasExtCodeCopy,
+			validateStack: makeStackFunc(4, -4),
+			memorySize:    memoryExtCodeCopy,
+			valid:         true,
+		},
 		BLOCKHASH: {
 			execute:       opBlockhash,
 			gasCost:       constGasFunc(GasExtStep),
-			validateStack: makeStackFunc(1, 1),
+			validateStack: makeStackFunc(1, 0),
 			valid:         true,
 		},
 		COINBASE: {
@@ -314,20 +318,20 @@ func NewJumpTable() [256]operation {
 		POP: {
 			execute:       opPop,
 			gasCost:       constGasFunc(GasQuickStep),
-			validateStack: makeStackFunc(1, 0),
+			validateStack: makeStackFunc(1, -1),
 			valid:         true,
 		},
 		MLOAD: {
 			execute:       opMload,
 			gasCost:       gasMLoad,
-			validateStack: makeStackFunc(1, 1),
+			validateStack: makeStackFunc(1, 0),
 			memorySize:    memoryMLoad,
 			valid:         true,
 		},
 		MSTORE: {
 			execute:       opMstore,
 			gasCost:       gasMStore,
-			validateStack: makeStackFunc(2, 0),
+			validateStack: makeStackFunc(2, -2),
 			memorySize:    memoryMStore,
 			valid:         true,
 		},
@@ -335,26 +339,34 @@ func NewJumpTable() [256]operation {
 			execute:       opMstore8,
 			gasCost:       gasMStore8,
 			memorySize:    memoryMStore8,
-			validateStack: makeStackFunc(2, 0),
+			validateStack: makeStackFunc(2, -2),
 
 			valid: true,
 		},
 		SLOAD: {
 			execute:       opSload,
 			gasCost:       gasSLoad,
-			validateStack: makeStackFunc(1, 1),
+			validateStack: makeStackFunc(1, 0),
 			valid:         true,
 		},
 		SSTORE: {
 			execute:       opSstore,
 			gasCost:       gasSStore,
-			validateStack: makeStackFunc(2, 0),
+			validateStack: makeStackFunc(2, -2),
 			valid:         true,
 		},
-		JUMPDEST: {
-			execute:       opJumpdest,
-			gasCost:       constGasFunc(params.JumpdestGas),
-			validateStack: makeStackFunc(0, 0),
+		JUMP: {
+			execute:       opJump,
+			gasCost:       constGasFunc(GasMidStep),
+			validateStack: makeStackFunc(1, -1),
+			jumps:         true,
+			valid:         true,
+		},
+		JUMPI: {
+			execute:       opJumpi,
+			gasCost:       constGasFunc(GasSlowStep),
+			validateStack: makeStackFunc(2, -2),
+			jumps:         true,
 			valid:         true,
 		},
 		PC: {
@@ -375,199 +387,10 @@ func NewJumpTable() [256]operation {
 			validateStack: makeStackFunc(0, 1),
 			valid:         true,
 		},
-		CREATE: {
-			execute:       opCreate,
-			gasCost:       gasCreate,
-			validateStack: makeStackFunc(3, 1),
-			memorySize:    memoryCreate,
-			valid:         true,
-		},
-		CALL: {
-			execute:       opCall,
-			gasCost:       gasCall,
-			validateStack: makeStackFunc(7, 1),
-			memorySize:    memoryCall,
-			valid:         true,
-		},
-		CALLCODE: {
-			execute:       opCallCode,
-			gasCost:       gasCallCode,
-			validateStack: makeStackFunc(7, 1),
-			memorySize:    memoryCall,
-			valid:         true,
-		},
-		DELEGATECALL: {
-			execute:       opDelegateCall,
-			gasCost:       gasDelegateCall,
-			validateStack: makeStackFunc(6, 1),
-			memorySize:    memoryDelegateCall,
-			valid:         true,
-		},
-		RETURN: {
-			execute:       opReturn,
-			gasCost:       gasReturn,
-			validateStack: makeStackFunc(2, 0),
-			memorySize:    memoryReturn,
-			halts:         true,
-			valid:         true,
-		},
-		SUICIDE: {
-			execute:       opSuicide,
-			gasCost:       gasSuicide,
-			validateStack: makeStackFunc(1, 0),
-			halts:         true,
-			valid:         true,
-		},
-		JUMP: {
-			execute:       opJump,
-			gasCost:       constGasFunc(GasMidStep),
-			validateStack: makeStackFunc(1, 0),
-			jumps:         true,
-			valid:         true,
-		},
-		JUMPI: {
-			execute:       opJumpi,
-			gasCost:       constGasFunc(GasSlowStep),
-			validateStack: makeStackFunc(2, 0),
-			jumps:         true,
-			valid:         true,
-		},
-		STOP: {
-			execute:       opStop,
-			gasCost:       constGasFunc(0),
+		JUMPDEST: {
+			execute:       opJumpdest,
+			gasCost:       constGasFunc(params.JumpdestGas),
 			validateStack: makeStackFunc(0, 0),
-			halts:         true,
-			valid:         true,
-		},
-		LOG0: {
-			execute:       makeLog(0),
-			gasCost:       makeGasLog(0),
-			validateStack: makeStackFunc(2, 0),
-			memorySize:    memoryLog,
-			valid:         true,
-		},
-		LOG1: {
-			execute:       makeLog(1),
-			gasCost:       makeGasLog(1),
-			validateStack: makeStackFunc(3, 0),
-			memorySize:    memoryLog,
-			valid:         true,
-		},
-		LOG2: {
-			execute:       makeLog(2),
-			gasCost:       makeGasLog(2),
-			validateStack: makeStackFunc(4, 0),
-			memorySize:    memoryLog,
-			valid:         true,
-		},
-		LOG3: {
-			execute:       makeLog(3),
-			gasCost:       makeGasLog(3),
-			validateStack: makeStackFunc(5, 0),
-			memorySize:    memoryLog,
-			valid:         true,
-		},
-		LOG4: {
-			execute:       makeLog(4),
-			gasCost:       makeGasLog(4),
-			validateStack: makeStackFunc(6, 0),
-			memorySize:    memoryLog,
-			valid:         true,
-		},
-		SWAP1: {
-			execute:       makeSwap(1),
-			gasCost:       gasSwap,
-			validateStack: makeStackFunc(2, 0),
-			valid:         true,
-		},
-		SWAP2: {
-			execute:       makeSwap(2),
-			gasCost:       gasSwap,
-			validateStack: makeStackFunc(3, 0),
-			valid:         true,
-		},
-		SWAP3: {
-			execute:       makeSwap(3),
-			gasCost:       gasSwap,
-			validateStack: makeStackFunc(4, 0),
-			valid:         true,
-		},
-		SWAP4: {
-			execute:       makeSwap(4),
-			gasCost:       gasSwap,
-			validateStack: makeStackFunc(5, 0),
-			valid:         true,
-		},
-		SWAP5: {
-			execute:       makeSwap(5),
-			gasCost:       gasSwap,
-			validateStack: makeStackFunc(6, 0),
-			valid:         true,
-		},
-		SWAP6: {
-			execute:       makeSwap(6),
-			gasCost:       gasSwap,
-			validateStack: makeStackFunc(7, 0),
-			valid:         true,
-		},
-		SWAP7: {
-			execute:       makeSwap(7),
-			gasCost:       gasSwap,
-			validateStack: makeStackFunc(8, 0),
-			valid:         true,
-		},
-		SWAP8: {
-			execute:       makeSwap(8),
-			gasCost:       gasSwap,
-			validateStack: makeStackFunc(9, 0),
-			valid:         true,
-		},
-		SWAP9: {
-			execute:       makeSwap(9),
-			gasCost:       gasSwap,
-			validateStack: makeStackFunc(10, 0),
-			valid:         true,
-		},
-		SWAP10: {
-			execute:       makeSwap(10),
-			gasCost:       gasSwap,
-			validateStack: makeStackFunc(11, 0),
-			valid:         true,
-		},
-		SWAP11: {
-			execute:       makeSwap(11),
-			gasCost:       gasSwap,
-			validateStack: makeStackFunc(12, 0),
-			valid:         true,
-		},
-		SWAP12: {
-			execute:       makeSwap(12),
-			gasCost:       gasSwap,
-			validateStack: makeStackFunc(13, 0),
-			valid:         true,
-		},
-		SWAP13: {
-			execute:       makeSwap(13),
-			gasCost:       gasSwap,
-			validateStack: makeStackFunc(14, 0),
-			valid:         true,
-		},
-		SWAP14: {
-			execute:       makeSwap(14),
-			gasCost:       gasSwap,
-			validateStack: makeStackFunc(15, 0),
-			valid:         true,
-		},
-		SWAP15: {
-			execute:       makeSwap(15),
-			gasCost:       gasSwap,
-			validateStack: makeStackFunc(16, 0),
-			valid:         true,
-		},
-		SWAP16: {
-			execute:       makeSwap(16),
-			gasCost:       gasSwap,
-			validateStack: makeStackFunc(17, 0),
 			valid:         true,
 		},
 		PUSH1: {
@@ -765,97 +588,271 @@ func NewJumpTable() [256]operation {
 		DUP1: {
 			execute:       makeDup(1),
 			gasCost:       gasDup,
-			validateStack: makeStackFunc(1, 1),
+			validateStack: makeDupStackFunc(1),
 			valid:         true,
 		},
 		DUP2: {
 			execute:       makeDup(2),
 			gasCost:       gasDup,
-			validateStack: makeStackFunc(2, 1),
+			validateStack: makeDupStackFunc(2),
 			valid:         true,
 		},
 		DUP3: {
 			execute:       makeDup(3),
 			gasCost:       gasDup,
-			validateStack: makeStackFunc(3, 1),
+			validateStack: makeDupStackFunc(3),
 			valid:         true,
 		},
 		DUP4: {
 			execute:       makeDup(4),
 			gasCost:       gasDup,
-			validateStack: makeStackFunc(4, 1),
+			validateStack: makeDupStackFunc(4),
 			valid:         true,
 		},
 		DUP5: {
 			execute:       makeDup(5),
 			gasCost:       gasDup,
-			validateStack: makeStackFunc(5, 1),
+			validateStack: makeDupStackFunc(5),
 			valid:         true,
 		},
 		DUP6: {
 			execute:       makeDup(6),
 			gasCost:       gasDup,
-			validateStack: makeStackFunc(6, 1),
+			validateStack: makeDupStackFunc(6),
 			valid:         true,
 		},
 		DUP7: {
 			execute:       makeDup(7),
 			gasCost:       gasDup,
-			validateStack: makeStackFunc(7, 1),
+			validateStack: makeDupStackFunc(7),
 			valid:         true,
 		},
 		DUP8: {
 			execute:       makeDup(8),
 			gasCost:       gasDup,
-			validateStack: makeStackFunc(8, 1),
+			validateStack: makeDupStackFunc(8),
 			valid:         true,
 		},
 		DUP9: {
 			execute:       makeDup(9),
 			gasCost:       gasDup,
-			validateStack: makeStackFunc(9, 1),
+			validateStack: makeDupStackFunc(9),
 			valid:         true,
 		},
 		DUP10: {
 			execute:       makeDup(10),
 			gasCost:       gasDup,
-			validateStack: makeStackFunc(10, 1),
+			validateStack: makeDupStackFunc(10),
 			valid:         true,
 		},
 		DUP11: {
 			execute:       makeDup(11),
 			gasCost:       gasDup,
-			validateStack: makeStackFunc(11, 1),
+			validateStack: makeDupStackFunc(11),
 			valid:         true,
 		},
 		DUP12: {
 			execute:       makeDup(12),
 			gasCost:       gasDup,
-			validateStack: makeStackFunc(12, 1),
+			validateStack: makeDupStackFunc(12),
 			valid:         true,
 		},
 		DUP13: {
 			execute:       makeDup(13),
 			gasCost:       gasDup,
-			validateStack: makeStackFunc(13, 1),
+			validateStack: makeDupStackFunc(13),
 			valid:         true,
 		},
 		DUP14: {
 			execute:       makeDup(14),
 			gasCost:       gasDup,
-			validateStack: makeStackFunc(14, 1),
+			validateStack: makeDupStackFunc(14),
 			valid:         true,
 		},
 		DUP15: {
 			execute:       makeDup(15),
 			gasCost:       gasDup,
-			validateStack: makeStackFunc(15, 1),
+			validateStack: makeDupStackFunc(15),
 			valid:         true,
 		},
 		DUP16: {
 			execute:       makeDup(16),
 			gasCost:       gasDup,
-			validateStack: makeStackFunc(16, 1),
+			validateStack: makeDupStackFunc(16),
+			valid:         true,
+		},
+		SWAP1: {
+			execute:       makeSwap(1),
+			gasCost:       gasSwap,
+			validateStack: makeSwapStackFunc(2),
+			valid:         true,
+		},
+		SWAP2: {
+			execute:       makeSwap(2),
+			gasCost:       gasSwap,
+			validateStack: makeSwapStackFunc(3),
+			valid:         true,
+		},
+		SWAP3: {
+			execute:       makeSwap(3),
+			gasCost:       gasSwap,
+			validateStack: makeSwapStackFunc(4),
+			valid:         true,
+		},
+		SWAP4: {
+			execute:       makeSwap(4),
+			gasCost:       gasSwap,
+			validateStack: makeSwapStackFunc(5),
+			valid:         true,
+		},
+		SWAP5: {
+			execute:       makeSwap(5),
+			gasCost:       gasSwap,
+			validateStack: makeSwapStackFunc(6),
+			valid:         true,
+		},
+		SWAP6: {
+			execute:       makeSwap(6),
+			gasCost:       gasSwap,
+			validateStack: makeSwapStackFunc(7),
+			valid:         true,
+		},
+		SWAP7: {
+			execute:       makeSwap(7),
+			gasCost:       gasSwap,
+			validateStack: makeSwapStackFunc(8),
+			valid:         true,
+		},
+		SWAP8: {
+			execute:       makeSwap(8),
+			gasCost:       gasSwap,
+			validateStack: makeSwapStackFunc(9),
+			valid:         true,
+		},
+		SWAP9: {
+			execute:       makeSwap(9),
+			gasCost:       gasSwap,
+			validateStack: makeSwapStackFunc(10),
+			valid:         true,
+		},
+		SWAP10: {
+			execute:       makeSwap(10),
+			gasCost:       gasSwap,
+			validateStack: makeSwapStackFunc(11),
+			valid:         true,
+		},
+		SWAP11: {
+			execute:       makeSwap(11),
+			gasCost:       gasSwap,
+			validateStack: makeSwapStackFunc(12),
+			valid:         true,
+		},
+		SWAP12: {
+			execute:       makeSwap(12),
+			gasCost:       gasSwap,
+			validateStack: makeSwapStackFunc(13),
+			valid:         true,
+		},
+		SWAP13: {
+			execute:       makeSwap(13),
+			gasCost:       gasSwap,
+			validateStack: makeSwapStackFunc(14),
+			valid:         true,
+		},
+		SWAP14: {
+			execute:       makeSwap(14),
+			gasCost:       gasSwap,
+			validateStack: makeSwapStackFunc(15),
+			valid:         true,
+		},
+		SWAP15: {
+			execute:       makeSwap(15),
+			gasCost:       gasSwap,
+			validateStack: makeSwapStackFunc(16),
+			valid:         true,
+		},
+		SWAP16: {
+			execute:       makeSwap(16),
+			gasCost:       gasSwap,
+			validateStack: makeSwapStackFunc(17),
+			valid:         true,
+		},
+		LOG0: {
+			execute:       makeLog(0),
+			gasCost:       makeGasLog(0),
+			validateStack: makeStackFunc(2, -2),
+			memorySize:    memoryLog,
+			valid:         true,
+		},
+		LOG1: {
+			execute:       makeLog(1),
+			gasCost:       makeGasLog(1),
+			validateStack: makeStackFunc(3, -3),
+			memorySize:    memoryLog,
+			valid:         true,
+		},
+		LOG2: {
+			execute:       makeLog(2),
+			gasCost:       makeGasLog(2),
+			validateStack: makeStackFunc(4, -4),
+			memorySize:    memoryLog,
+			valid:         true,
+		},
+		LOG3: {
+			execute:       makeLog(3),
+			gasCost:       makeGasLog(3),
+			validateStack: makeStackFunc(5, -5),
+			memorySize:    memoryLog,
+			valid:         true,
+		},
+		LOG4: {
+			execute:       makeLog(4),
+			gasCost:       makeGasLog(4),
+			validateStack: makeStackFunc(6, -6),
+			memorySize:    memoryLog,
+			valid:         true,
+		},
+		CREATE: {
+			execute:       opCreate,
+			gasCost:       gasCreate,
+			validateStack: makeStackFunc(3, -2),
+			memorySize:    memoryCreate,
+			valid:         true,
+		},
+		CALL: {
+			execute:       opCall,
+			gasCost:       gasCall,
+			validateStack: makeStackFunc(7, -6),
+			memorySize:    memoryCall,
+			valid:         true,
+		},
+		CALLCODE: {
+			execute:       opCallCode,
+			gasCost:       gasCallCode,
+			validateStack: makeStackFunc(7, -6),
+			memorySize:    memoryCall,
+			valid:         true,
+		},
+		RETURN: {
+			execute:       opReturn,
+			gasCost:       gasReturn,
+			validateStack: makeStackFunc(2, -2),
+			memorySize:    memoryReturn,
+			halts:         true,
+			valid:         true,
+		},
+		DELEGATECALL: {
+			execute:       opDelegateCall,
+			gasCost:       gasDelegateCall,
+			validateStack: makeStackFunc(6, -5),
+			memorySize:    memoryDelegateCall,
+			valid:         true,
+		},
+		SELFDESTRUCT: {
+			execute:       opSuicide,
+			gasCost:       gasSuicide,
+			validateStack: makeStackFunc(1, -1),
+			halts:         true,
 			valid:         true,
 		},
 	}