Refactor interpreter dispatch (#65)
* move forks constants, rename errors
* Move vm/utils to vm/interpreter/utils
* initial opcodes refactoring
* Add refactored Comparison & Bitwise Logic Operations
* Add sha3 and address, simplify macro, support pop 0
* balance, origin, caller, callValue
* fix gas copy opcodes gas costs, add callDataLoad/Size/Copy, CodeSize/Copy and gas price opcode
* Update with 30s, 40s, 50s opcodes + impl of balance + stack improvement
* add push, dup, swap, log, create and call operations
* finish opcode implementation
* Add the new dispatching logic
* Pass the opcode test
* Make test_vm_json compile
* halt execution without exceptions for Return, Revert, selfdestruct (fix #62)
* Properly catch and recover from EVM exceptions (stack underflow ...)
* Fix byte op
* Fix jump regressions
* Update for latest devel, don't import old dispatch code as quasiBoolean macro is broken by latest devel
* Fix sha3 regression on empty memory slice and until end of range slice
* Fix padding / range error on expXY_success (gas computation left)
* update logging procs
* Add tracing - expXY_success is not a regression, sload stub was accidentally passing the test
* Reuse the same stub as OO implementation
* Delete previous opcode implementation
* Delete object oriented fork code
* Delete exceptions that were used as control flows
* delete base.nim :fire:, yet another OO remnants
* Delete opcode table
* Enable omputed gotos and compile-time gas fees
* Revert const gasCosts -> generates SIGSEGV
* inline push, swap and dup opcodes
* loggers are now template again, why does this pass new tests?
* Trigger CI rebuild after rocksdb fix https://github.com/status-im/nim-rocksdb/pull/5
* Address review comment on "push" + VMTests in debug mode (not release)
* Address review comment: don't tag fork by default, make opcode impl grepable
* Static compilation fixes after rebasing
* fix the initialization of the VM database
* add a missing import
* Deactivate balance and sload test following #59
* Reactivate stack check (deactivated in #59, necessary to pass tests)
* Merge remaining opcodes implementation from #59
* Merge callDataLoad and codeCopy fixes, todo simplify see #67
2018-07-06 07:52:31 +00:00
|
|
|
# Nimbus
|
|
|
|
|
# Copyright (c) 2018 Status Research & Development GmbH
|
|
|
|
|
# Licensed under either of
|
|
|
|
|
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
|
|
|
|
|
# * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
|
|
|
|
|
# at your option. This file may not be copied, modified, or distributed except according to those terms.
|
|
|
|
|
|
|
|
|
|
import
|
|
|
|
|
tables, macros,
|
2018-08-23 03:38:00 +00:00
|
|
|
chronicles,
|
Refactor interpreter dispatch (#65)
* move forks constants, rename errors
* Move vm/utils to vm/interpreter/utils
* initial opcodes refactoring
* Add refactored Comparison & Bitwise Logic Operations
* Add sha3 and address, simplify macro, support pop 0
* balance, origin, caller, callValue
* fix gas copy opcodes gas costs, add callDataLoad/Size/Copy, CodeSize/Copy and gas price opcode
* Update with 30s, 40s, 50s opcodes + impl of balance + stack improvement
* add push, dup, swap, log, create and call operations
* finish opcode implementation
* Add the new dispatching logic
* Pass the opcode test
* Make test_vm_json compile
* halt execution without exceptions for Return, Revert, selfdestruct (fix #62)
* Properly catch and recover from EVM exceptions (stack underflow ...)
* Fix byte op
* Fix jump regressions
* Update for latest devel, don't import old dispatch code as quasiBoolean macro is broken by latest devel
* Fix sha3 regression on empty memory slice and until end of range slice
* Fix padding / range error on expXY_success (gas computation left)
* update logging procs
* Add tracing - expXY_success is not a regression, sload stub was accidentally passing the test
* Reuse the same stub as OO implementation
* Delete previous opcode implementation
* Delete object oriented fork code
* Delete exceptions that were used as control flows
* delete base.nim :fire:, yet another OO remnants
* Delete opcode table
* Enable omputed gotos and compile-time gas fees
* Revert const gasCosts -> generates SIGSEGV
* inline push, swap and dup opcodes
* loggers are now template again, why does this pass new tests?
* Trigger CI rebuild after rocksdb fix https://github.com/status-im/nim-rocksdb/pull/5
* Address review comment on "push" + VMTests in debug mode (not release)
* Address review comment: don't tag fork by default, make opcode impl grepable
* Static compilation fixes after rebasing
* fix the initialization of the VM database
* add a missing import
* Deactivate balance and sload test following #59
* Reactivate stack check (deactivated in #59, necessary to pass tests)
* Merge remaining opcodes implementation from #59
* Merge callDataLoad and codeCopy fixes, todo simplify see #67
2018-07-06 07:52:31 +00:00
|
|
|
./interpreter/[opcode_values, opcodes_impl, vm_forks, gas_costs, gas_meter, utils/macros_gen_opcodes],
|
|
|
|
|
./code_stream,
|
2018-10-12 15:16:14 +00:00
|
|
|
../vm_types, ../errors, precompiles,
|
2018-10-28 12:11:19 +00:00
|
|
|
./stack, ./computation, ./transaction_tracer, terminal # Those are only needed for logging
|
Refactor interpreter dispatch (#65)
* move forks constants, rename errors
* Move vm/utils to vm/interpreter/utils
* initial opcodes refactoring
* Add refactored Comparison & Bitwise Logic Operations
* Add sha3 and address, simplify macro, support pop 0
* balance, origin, caller, callValue
* fix gas copy opcodes gas costs, add callDataLoad/Size/Copy, CodeSize/Copy and gas price opcode
* Update with 30s, 40s, 50s opcodes + impl of balance + stack improvement
* add push, dup, swap, log, create and call operations
* finish opcode implementation
* Add the new dispatching logic
* Pass the opcode test
* Make test_vm_json compile
* halt execution without exceptions for Return, Revert, selfdestruct (fix #62)
* Properly catch and recover from EVM exceptions (stack underflow ...)
* Fix byte op
* Fix jump regressions
* Update for latest devel, don't import old dispatch code as quasiBoolean macro is broken by latest devel
* Fix sha3 regression on empty memory slice and until end of range slice
* Fix padding / range error on expXY_success (gas computation left)
* update logging procs
* Add tracing - expXY_success is not a regression, sload stub was accidentally passing the test
* Reuse the same stub as OO implementation
* Delete previous opcode implementation
* Delete object oriented fork code
* Delete exceptions that were used as control flows
* delete base.nim :fire:, yet another OO remnants
* Delete opcode table
* Enable omputed gotos and compile-time gas fees
* Revert const gasCosts -> generates SIGSEGV
* inline push, swap and dup opcodes
* loggers are now template again, why does this pass new tests?
* Trigger CI rebuild after rocksdb fix https://github.com/status-im/nim-rocksdb/pull/5
* Address review comment on "push" + VMTests in debug mode (not release)
* Address review comment: don't tag fork by default, make opcode impl grepable
* Static compilation fixes after rebasing
* fix the initialization of the VM database
* add a missing import
* Deactivate balance and sload test following #59
* Reactivate stack check (deactivated in #59, necessary to pass tests)
* Merge remaining opcodes implementation from #59
* Merge callDataLoad and codeCopy fixes, todo simplify see #67
2018-07-06 07:52:31 +00:00
|
|
|
|
|
|
|
|
func invalidInstruction*(computation: var BaseComputation) {.inline.} =
|
|
|
|
|
raise newException(ValueError, "Invalid instruction, received an opcode not implemented in the current fork.")
|
|
|
|
|
|
|
|
|
|
let FrontierOpDispatch {.compileTime.}: array[Op, NimNode] = block:
|
|
|
|
|
fill_enum_table_holes(Op, newIdentNode"invalidInstruction"):
|
|
|
|
|
[
|
|
|
|
|
Stop: newIdentNode "toBeReplacedByBreak",
|
|
|
|
|
Add: newIdentNode "add",
|
|
|
|
|
Mul: newIdentNode "mul",
|
|
|
|
|
Sub: newIdentNode "sub",
|
|
|
|
|
Div: newIdentNode "divide",
|
|
|
|
|
Sdiv: newIdentNode "sdiv",
|
|
|
|
|
Mod: newIdentNode "modulo",
|
|
|
|
|
Smod: newIdentNode "smod",
|
|
|
|
|
Addmod: newIdentNode "addmod",
|
|
|
|
|
Mulmod: newIdentNode "mulmod",
|
|
|
|
|
Exp: newIdentNode "exp",
|
|
|
|
|
SignExtend: newIdentNode "signExtend",
|
|
|
|
|
|
|
|
|
|
# 10s: Comparison & Bitwise Logic Operations
|
|
|
|
|
Lt: newIdentNode "lt",
|
|
|
|
|
Gt: newIdentNode "gt",
|
|
|
|
|
Slt: newIdentNode "slt",
|
|
|
|
|
Sgt: newIdentNode "sgt",
|
|
|
|
|
Eq: newIdentNode "eq",
|
|
|
|
|
IsZero: newIdentNode "isZero",
|
|
|
|
|
And: newIdentNode "andOp",
|
|
|
|
|
Or: newIdentNode "orOp",
|
|
|
|
|
Xor: newIdentNode "xorOp",
|
|
|
|
|
Not: newIdentNode "notOp",
|
|
|
|
|
Byte: newIdentNode "byteOp",
|
|
|
|
|
|
|
|
|
|
# 20s: SHA3
|
|
|
|
|
Sha3: newIdentNode "sha3",
|
|
|
|
|
|
|
|
|
|
# 30s: Environmental Information
|
|
|
|
|
Address: newIdentNode "address",
|
|
|
|
|
Balance: newIdentNode "balance",
|
|
|
|
|
Origin: newIdentNode "origin",
|
|
|
|
|
Caller: newIdentNode "caller",
|
|
|
|
|
CallValue: newIdentNode "callValue",
|
|
|
|
|
CallDataLoad: newIdentNode "callDataLoad",
|
|
|
|
|
CallDataSize: newIdentNode "callDataSize",
|
|
|
|
|
CallDataCopy: newIdentNode "callDataCopy",
|
|
|
|
|
CodeSize: newIdentNode "codeSize",
|
|
|
|
|
CodeCopy: newIdentNode "codeCopy",
|
|
|
|
|
GasPrice: newIdentNode "gasPrice",
|
|
|
|
|
ExtCodeSize: newIdentNode "extCodeSize",
|
|
|
|
|
ExtCodeCopy: newIdentNode "extCodeCopy",
|
|
|
|
|
# ReturnDataSize: introduced in Byzantium
|
|
|
|
|
# ReturnDataCopy: introduced in Byzantium
|
|
|
|
|
|
|
|
|
|
# 40s: Block Information
|
|
|
|
|
Blockhash: newIdentNode "blockhash",
|
|
|
|
|
Coinbase: newIdentNode "coinbase",
|
|
|
|
|
Timestamp: newIdentNode "timestamp",
|
|
|
|
|
Number: newIdentNode "blockNumber",
|
|
|
|
|
Difficulty: newIdentNode "difficulty",
|
|
|
|
|
GasLimit: newIdentNode "gasLimit",
|
|
|
|
|
|
|
|
|
|
# 50s: Stack, Memory, Storage and Flow Operations
|
|
|
|
|
Pop: newIdentNode "pop",
|
|
|
|
|
Mload: newIdentNode "mload",
|
|
|
|
|
Mstore: newIdentNode "mstore",
|
|
|
|
|
Mstore8: newIdentNode "mstore8",
|
|
|
|
|
Sload: newIdentNode "sload",
|
|
|
|
|
Sstore: newIdentNode "sstore",
|
|
|
|
|
Jump: newIdentNode "jump",
|
|
|
|
|
JumpI: newIdentNode "jumpI",
|
|
|
|
|
Pc: newIdentNode "pc",
|
|
|
|
|
Msize: newIdentNode "msize",
|
|
|
|
|
Gas: newIdentNode "gas",
|
|
|
|
|
JumpDest: newIdentNode "jumpDest",
|
|
|
|
|
|
|
|
|
|
# 60s & 70s: Push Operations.
|
|
|
|
|
Push1: newIdentNode "push1",
|
|
|
|
|
Push2: newIdentNode "push2",
|
|
|
|
|
Push3: newIdentNode "push3",
|
|
|
|
|
Push4: newIdentNode "push4",
|
|
|
|
|
Push5: newIdentNode "push5",
|
|
|
|
|
Push6: newIdentNode "push6",
|
|
|
|
|
Push7: newIdentNode "push7",
|
|
|
|
|
Push8: newIdentNode "push8",
|
|
|
|
|
Push9: newIdentNode "push9",
|
|
|
|
|
Push10: newIdentNode "push10",
|
|
|
|
|
Push11: newIdentNode "push11",
|
|
|
|
|
Push12: newIdentNode "push12",
|
|
|
|
|
Push13: newIdentNode "push13",
|
|
|
|
|
Push14: newIdentNode "push14",
|
|
|
|
|
Push15: newIdentNode "push15",
|
|
|
|
|
Push16: newIdentNode "push16",
|
|
|
|
|
Push17: newIdentNode "push17",
|
|
|
|
|
Push18: newIdentNode "push18",
|
|
|
|
|
Push19: newIdentNode "push19",
|
|
|
|
|
Push20: newIdentNode "push20",
|
|
|
|
|
Push21: newIdentNode "push21",
|
|
|
|
|
Push22: newIdentNode "push22",
|
|
|
|
|
Push23: newIdentNode "push23",
|
|
|
|
|
Push24: newIdentNode "push24",
|
|
|
|
|
Push25: newIdentNode "push25",
|
|
|
|
|
Push26: newIdentNode "push26",
|
|
|
|
|
Push27: newIdentNode "push27",
|
|
|
|
|
Push28: newIdentNode "push28",
|
|
|
|
|
Push29: newIdentNode "push29",
|
|
|
|
|
Push30: newIdentNode "push30",
|
|
|
|
|
Push31: newIdentNode "push31",
|
|
|
|
|
Push32: newIdentNode "push32",
|
|
|
|
|
|
|
|
|
|
# 80s: Duplication Operations
|
|
|
|
|
Dup1: newIdentNode "dup1",
|
|
|
|
|
Dup2: newIdentNode "dup2",
|
|
|
|
|
Dup3: newIdentNode "dup3",
|
|
|
|
|
Dup4: newIdentNode "dup4",
|
|
|
|
|
Dup5: newIdentNode "dup5",
|
|
|
|
|
Dup6: newIdentNode "dup6",
|
|
|
|
|
Dup7: newIdentNode "dup7",
|
|
|
|
|
Dup8: newIdentNode "dup8",
|
|
|
|
|
Dup9: newIdentNode "dup9",
|
|
|
|
|
Dup10: newIdentNode "dup10",
|
|
|
|
|
Dup11: newIdentNode "dup11",
|
|
|
|
|
Dup12: newIdentNode "dup12",
|
|
|
|
|
Dup13: newIdentNode "dup13",
|
|
|
|
|
Dup14: newIdentNode "dup14",
|
|
|
|
|
Dup15: newIdentNode "dup15",
|
|
|
|
|
Dup16: newIdentNode "dup16",
|
|
|
|
|
|
|
|
|
|
# 90s: Exchange Operations
|
|
|
|
|
Swap1: newIdentNode "swap1",
|
|
|
|
|
Swap2: newIdentNode "swap2",
|
|
|
|
|
Swap3: newIdentNode "swap3",
|
|
|
|
|
Swap4: newIdentNode "swap4",
|
|
|
|
|
Swap5: newIdentNode "swap5",
|
|
|
|
|
Swap6: newIdentNode "swap6",
|
|
|
|
|
Swap7: newIdentNode "swap7",
|
|
|
|
|
Swap8: newIdentNode "swap8",
|
|
|
|
|
Swap9: newIdentNode "swap9",
|
|
|
|
|
Swap10: newIdentNode "swap10",
|
|
|
|
|
Swap11: newIdentNode "swap11",
|
|
|
|
|
Swap12: newIdentNode "swap12",
|
|
|
|
|
Swap13: newIdentNode "swap13",
|
|
|
|
|
Swap14: newIdentNode "swap14",
|
|
|
|
|
Swap15: newIdentNode "swap15",
|
|
|
|
|
Swap16: newIdentNode "swap16",
|
|
|
|
|
|
|
|
|
|
# a0s: Logging Operations
|
|
|
|
|
Log0: newIdentNode "log0",
|
|
|
|
|
Log1: newIdentNode "log1",
|
|
|
|
|
Log2: newIdentNode "log2",
|
|
|
|
|
Log3: newIdentNode "log3",
|
|
|
|
|
Log4: newIdentNode "log4",
|
|
|
|
|
|
|
|
|
|
# f0s: System operations
|
|
|
|
|
Create: newIdentNode "create",
|
|
|
|
|
Call: newIdentNode "call",
|
|
|
|
|
CallCode: newIdentNode "callCode",
|
|
|
|
|
Return: newIdentNode "returnOp",
|
|
|
|
|
DelegateCall: newIdentNode "delegateCall",
|
|
|
|
|
# StaticCall: introduced in Byzantium
|
|
|
|
|
# Revert: introduced in Byzantium
|
|
|
|
|
# Invalid: newIdentNode "invalid",
|
|
|
|
|
SelfDestruct: newIdentNode "selfDestruct"
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
proc opTableToCaseStmt(opTable: array[Op, NimNode], computation: NimNode): NimNode =
|
|
|
|
|
|
|
|
|
|
let instr = genSym(nskVar)
|
|
|
|
|
result = nnkCaseStmt.newTree(instr)
|
|
|
|
|
|
|
|
|
|
# Add a branch for each (opcode, proc) pair
|
|
|
|
|
# We dispatch to the next instruction at the end of each branch
|
|
|
|
|
for op, opImpl in opTable.pairs:
|
|
|
|
|
let branchStmt = block:
|
|
|
|
|
if op == Stop:
|
|
|
|
|
quote do: break
|
|
|
|
|
else:
|
|
|
|
|
let asOp = quote do: Op(`op`) # TODO: unfortunately when passing to runtime, ops are transformed into int
|
|
|
|
|
if BaseGasCosts[op].kind == GckFixed:
|
|
|
|
|
quote do:
|
2018-10-28 12:11:19 +00:00
|
|
|
if `computation`.tracingEnabled:
|
|
|
|
|
`computation`.tracer.traceOpCodeStarted(`computation`, $`asOp`)
|
Refactor interpreter dispatch (#65)
* move forks constants, rename errors
* Move vm/utils to vm/interpreter/utils
* initial opcodes refactoring
* Add refactored Comparison & Bitwise Logic Operations
* Add sha3 and address, simplify macro, support pop 0
* balance, origin, caller, callValue
* fix gas copy opcodes gas costs, add callDataLoad/Size/Copy, CodeSize/Copy and gas price opcode
* Update with 30s, 40s, 50s opcodes + impl of balance + stack improvement
* add push, dup, swap, log, create and call operations
* finish opcode implementation
* Add the new dispatching logic
* Pass the opcode test
* Make test_vm_json compile
* halt execution without exceptions for Return, Revert, selfdestruct (fix #62)
* Properly catch and recover from EVM exceptions (stack underflow ...)
* Fix byte op
* Fix jump regressions
* Update for latest devel, don't import old dispatch code as quasiBoolean macro is broken by latest devel
* Fix sha3 regression on empty memory slice and until end of range slice
* Fix padding / range error on expXY_success (gas computation left)
* update logging procs
* Add tracing - expXY_success is not a regression, sload stub was accidentally passing the test
* Reuse the same stub as OO implementation
* Delete previous opcode implementation
* Delete object oriented fork code
* Delete exceptions that were used as control flows
* delete base.nim :fire:, yet another OO remnants
* Delete opcode table
* Enable omputed gotos and compile-time gas fees
* Revert const gasCosts -> generates SIGSEGV
* inline push, swap and dup opcodes
* loggers are now template again, why does this pass new tests?
* Trigger CI rebuild after rocksdb fix https://github.com/status-im/nim-rocksdb/pull/5
* Address review comment on "push" + VMTests in debug mode (not release)
* Address review comment: don't tag fork by default, make opcode impl grepable
* Static compilation fixes after rebasing
* fix the initialization of the VM database
* add a missing import
* Deactivate balance and sload test following #59
* Reactivate stack check (deactivated in #59, necessary to pass tests)
* Merge remaining opcodes implementation from #59
* Merge callDataLoad and codeCopy fixes, todo simplify see #67
2018-07-06 07:52:31 +00:00
|
|
|
`computation`.gasMeter.consumeGas(`computation`.gasCosts[`asOp`].cost, reason = $`asOp`)
|
|
|
|
|
`opImpl`(`computation`)
|
2018-10-28 12:11:19 +00:00
|
|
|
if `computation`.tracingEnabled:
|
|
|
|
|
`computation`.tracer.traceOpCodeEnded(`computation`)
|
Refactor interpreter dispatch (#65)
* move forks constants, rename errors
* Move vm/utils to vm/interpreter/utils
* initial opcodes refactoring
* Add refactored Comparison & Bitwise Logic Operations
* Add sha3 and address, simplify macro, support pop 0
* balance, origin, caller, callValue
* fix gas copy opcodes gas costs, add callDataLoad/Size/Copy, CodeSize/Copy and gas price opcode
* Update with 30s, 40s, 50s opcodes + impl of balance + stack improvement
* add push, dup, swap, log, create and call operations
* finish opcode implementation
* Add the new dispatching logic
* Pass the opcode test
* Make test_vm_json compile
* halt execution without exceptions for Return, Revert, selfdestruct (fix #62)
* Properly catch and recover from EVM exceptions (stack underflow ...)
* Fix byte op
* Fix jump regressions
* Update for latest devel, don't import old dispatch code as quasiBoolean macro is broken by latest devel
* Fix sha3 regression on empty memory slice and until end of range slice
* Fix padding / range error on expXY_success (gas computation left)
* update logging procs
* Add tracing - expXY_success is not a regression, sload stub was accidentally passing the test
* Reuse the same stub as OO implementation
* Delete previous opcode implementation
* Delete object oriented fork code
* Delete exceptions that were used as control flows
* delete base.nim :fire:, yet another OO remnants
* Delete opcode table
* Enable omputed gotos and compile-time gas fees
* Revert const gasCosts -> generates SIGSEGV
* inline push, swap and dup opcodes
* loggers are now template again, why does this pass new tests?
* Trigger CI rebuild after rocksdb fix https://github.com/status-im/nim-rocksdb/pull/5
* Address review comment on "push" + VMTests in debug mode (not release)
* Address review comment: don't tag fork by default, make opcode impl grepable
* Static compilation fixes after rebasing
* fix the initialization of the VM database
* add a missing import
* Deactivate balance and sload test following #59
* Reactivate stack check (deactivated in #59, necessary to pass tests)
* Merge remaining opcodes implementation from #59
* Merge callDataLoad and codeCopy fixes, todo simplify see #67
2018-07-06 07:52:31 +00:00
|
|
|
`instr` = `computation`.code.next()
|
|
|
|
|
else:
|
|
|
|
|
quote do:
|
2018-10-28 12:11:19 +00:00
|
|
|
if `computation`.tracingEnabled:
|
|
|
|
|
`computation`.tracer.traceOpCodeStarted(`computation`, $`asOp`)
|
Refactor interpreter dispatch (#65)
* move forks constants, rename errors
* Move vm/utils to vm/interpreter/utils
* initial opcodes refactoring
* Add refactored Comparison & Bitwise Logic Operations
* Add sha3 and address, simplify macro, support pop 0
* balance, origin, caller, callValue
* fix gas copy opcodes gas costs, add callDataLoad/Size/Copy, CodeSize/Copy and gas price opcode
* Update with 30s, 40s, 50s opcodes + impl of balance + stack improvement
* add push, dup, swap, log, create and call operations
* finish opcode implementation
* Add the new dispatching logic
* Pass the opcode test
* Make test_vm_json compile
* halt execution without exceptions for Return, Revert, selfdestruct (fix #62)
* Properly catch and recover from EVM exceptions (stack underflow ...)
* Fix byte op
* Fix jump regressions
* Update for latest devel, don't import old dispatch code as quasiBoolean macro is broken by latest devel
* Fix sha3 regression on empty memory slice and until end of range slice
* Fix padding / range error on expXY_success (gas computation left)
* update logging procs
* Add tracing - expXY_success is not a regression, sload stub was accidentally passing the test
* Reuse the same stub as OO implementation
* Delete previous opcode implementation
* Delete object oriented fork code
* Delete exceptions that were used as control flows
* delete base.nim :fire:, yet another OO remnants
* Delete opcode table
* Enable omputed gotos and compile-time gas fees
* Revert const gasCosts -> generates SIGSEGV
* inline push, swap and dup opcodes
* loggers are now template again, why does this pass new tests?
* Trigger CI rebuild after rocksdb fix https://github.com/status-im/nim-rocksdb/pull/5
* Address review comment on "push" + VMTests in debug mode (not release)
* Address review comment: don't tag fork by default, make opcode impl grepable
* Static compilation fixes after rebasing
* fix the initialization of the VM database
* add a missing import
* Deactivate balance and sload test following #59
* Reactivate stack check (deactivated in #59, necessary to pass tests)
* Merge remaining opcodes implementation from #59
* Merge callDataLoad and codeCopy fixes, todo simplify see #67
2018-07-06 07:52:31 +00:00
|
|
|
`opImpl`(`computation`)
|
2018-10-28 12:11:19 +00:00
|
|
|
if `computation`.tracingEnabled:
|
|
|
|
|
`computation`.tracer.traceOpCodeEnded(`computation`)
|
Refactor interpreter dispatch (#65)
* move forks constants, rename errors
* Move vm/utils to vm/interpreter/utils
* initial opcodes refactoring
* Add refactored Comparison & Bitwise Logic Operations
* Add sha3 and address, simplify macro, support pop 0
* balance, origin, caller, callValue
* fix gas copy opcodes gas costs, add callDataLoad/Size/Copy, CodeSize/Copy and gas price opcode
* Update with 30s, 40s, 50s opcodes + impl of balance + stack improvement
* add push, dup, swap, log, create and call operations
* finish opcode implementation
* Add the new dispatching logic
* Pass the opcode test
* Make test_vm_json compile
* halt execution without exceptions for Return, Revert, selfdestruct (fix #62)
* Properly catch and recover from EVM exceptions (stack underflow ...)
* Fix byte op
* Fix jump regressions
* Update for latest devel, don't import old dispatch code as quasiBoolean macro is broken by latest devel
* Fix sha3 regression on empty memory slice and until end of range slice
* Fix padding / range error on expXY_success (gas computation left)
* update logging procs
* Add tracing - expXY_success is not a regression, sload stub was accidentally passing the test
* Reuse the same stub as OO implementation
* Delete previous opcode implementation
* Delete object oriented fork code
* Delete exceptions that were used as control flows
* delete base.nim :fire:, yet another OO remnants
* Delete opcode table
* Enable omputed gotos and compile-time gas fees
* Revert const gasCosts -> generates SIGSEGV
* inline push, swap and dup opcodes
* loggers are now template again, why does this pass new tests?
* Trigger CI rebuild after rocksdb fix https://github.com/status-im/nim-rocksdb/pull/5
* Address review comment on "push" + VMTests in debug mode (not release)
* Address review comment: don't tag fork by default, make opcode impl grepable
* Static compilation fixes after rebasing
* fix the initialization of the VM database
* add a missing import
* Deactivate balance and sload test following #59
* Reactivate stack check (deactivated in #59, necessary to pass tests)
* Merge remaining opcodes implementation from #59
* Merge callDataLoad and codeCopy fixes, todo simplify see #67
2018-07-06 07:52:31 +00:00
|
|
|
when `asOp` in {Return, Revert, SelfDestruct}:
|
|
|
|
|
break
|
|
|
|
|
else:
|
|
|
|
|
`instr` = `computation`.code.next()
|
|
|
|
|
|
|
|
|
|
result.add nnkOfBranch.newTree(
|
|
|
|
|
newIdentNode($op),
|
|
|
|
|
branchStmt
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
# Wrap the case statement in while true + computed goto
|
|
|
|
|
result = quote do:
|
|
|
|
|
var `instr` = `computation`.code.next()
|
|
|
|
|
while true:
|
|
|
|
|
{.computedGoto.}
|
2018-08-23 03:38:00 +00:00
|
|
|
# TODO lots of macro magic here to unravel, with chronicles...
|
|
|
|
|
# `computation`.logger.log($`computation`.stack & "\n\n", fgGreen)
|
Refactor interpreter dispatch (#65)
* move forks constants, rename errors
* Move vm/utils to vm/interpreter/utils
* initial opcodes refactoring
* Add refactored Comparison & Bitwise Logic Operations
* Add sha3 and address, simplify macro, support pop 0
* balance, origin, caller, callValue
* fix gas copy opcodes gas costs, add callDataLoad/Size/Copy, CodeSize/Copy and gas price opcode
* Update with 30s, 40s, 50s opcodes + impl of balance + stack improvement
* add push, dup, swap, log, create and call operations
* finish opcode implementation
* Add the new dispatching logic
* Pass the opcode test
* Make test_vm_json compile
* halt execution without exceptions for Return, Revert, selfdestruct (fix #62)
* Properly catch and recover from EVM exceptions (stack underflow ...)
* Fix byte op
* Fix jump regressions
* Update for latest devel, don't import old dispatch code as quasiBoolean macro is broken by latest devel
* Fix sha3 regression on empty memory slice and until end of range slice
* Fix padding / range error on expXY_success (gas computation left)
* update logging procs
* Add tracing - expXY_success is not a regression, sload stub was accidentally passing the test
* Reuse the same stub as OO implementation
* Delete previous opcode implementation
* Delete object oriented fork code
* Delete exceptions that were used as control flows
* delete base.nim :fire:, yet another OO remnants
* Delete opcode table
* Enable omputed gotos and compile-time gas fees
* Revert const gasCosts -> generates SIGSEGV
* inline push, swap and dup opcodes
* loggers are now template again, why does this pass new tests?
* Trigger CI rebuild after rocksdb fix https://github.com/status-im/nim-rocksdb/pull/5
* Address review comment on "push" + VMTests in debug mode (not release)
* Address review comment: don't tag fork by default, make opcode impl grepable
* Static compilation fixes after rebasing
* fix the initialization of the VM database
* add a missing import
* Deactivate balance and sload test following #59
* Reactivate stack check (deactivated in #59, necessary to pass tests)
* Merge remaining opcodes implementation from #59
* Merge callDataLoad and codeCopy fixes, todo simplify see #67
2018-07-06 07:52:31 +00:00
|
|
|
`result`
|
|
|
|
|
|
|
|
|
|
macro genFrontierDispatch(computation: BaseComputation): untyped =
|
|
|
|
|
result = opTableToCaseStmt(FrontierOpDispatch, computation)
|
|
|
|
|
|
|
|
|
|
proc frontierVM(computation: var BaseComputation) =
|
2018-10-12 15:16:14 +00:00
|
|
|
if not computation.execPrecompiles:
|
|
|
|
|
genFrontierDispatch(computation)
|
Refactor interpreter dispatch (#65)
* move forks constants, rename errors
* Move vm/utils to vm/interpreter/utils
* initial opcodes refactoring
* Add refactored Comparison & Bitwise Logic Operations
* Add sha3 and address, simplify macro, support pop 0
* balance, origin, caller, callValue
* fix gas copy opcodes gas costs, add callDataLoad/Size/Copy, CodeSize/Copy and gas price opcode
* Update with 30s, 40s, 50s opcodes + impl of balance + stack improvement
* add push, dup, swap, log, create and call operations
* finish opcode implementation
* Add the new dispatching logic
* Pass the opcode test
* Make test_vm_json compile
* halt execution without exceptions for Return, Revert, selfdestruct (fix #62)
* Properly catch and recover from EVM exceptions (stack underflow ...)
* Fix byte op
* Fix jump regressions
* Update for latest devel, don't import old dispatch code as quasiBoolean macro is broken by latest devel
* Fix sha3 regression on empty memory slice and until end of range slice
* Fix padding / range error on expXY_success (gas computation left)
* update logging procs
* Add tracing - expXY_success is not a regression, sload stub was accidentally passing the test
* Reuse the same stub as OO implementation
* Delete previous opcode implementation
* Delete object oriented fork code
* Delete exceptions that were used as control flows
* delete base.nim :fire:, yet another OO remnants
* Delete opcode table
* Enable omputed gotos and compile-time gas fees
* Revert const gasCosts -> generates SIGSEGV
* inline push, swap and dup opcodes
* loggers are now template again, why does this pass new tests?
* Trigger CI rebuild after rocksdb fix https://github.com/status-im/nim-rocksdb/pull/5
* Address review comment on "push" + VMTests in debug mode (not release)
* Address review comment: don't tag fork by default, make opcode impl grepable
* Static compilation fixes after rebasing
* fix the initialization of the VM database
* add a missing import
* Deactivate balance and sload test following #59
* Reactivate stack check (deactivated in #59, necessary to pass tests)
* Merge remaining opcodes implementation from #59
* Merge callDataLoad and codeCopy fixes, todo simplify see #67
2018-07-06 07:52:31 +00:00
|
|
|
|
2018-09-18 12:10:30 +00:00
|
|
|
proc updateOpcodeExec*(computation: var BaseComputation, fork: Fork) =
|
|
|
|
|
case fork
|
|
|
|
|
of FkFrontier:
|
|
|
|
|
computation.opCodeExec = frontierVM
|
|
|
|
|
computation.frontierVM()
|
|
|
|
|
else:
|
|
|
|
|
raise newException(VMError, "Unknown or not implemented fork: " & $fork)
|
|
|
|
|
|
|
|
|
|
proc updateOpcodeExec*(computation: var BaseComputation) =
|
|
|
|
|
let fork = computation.vmState.blockHeader.blockNumber.toFork
|
|
|
|
|
computation.updateOpcodeExec(fork)
|
|
|
|
|
|
Refactor interpreter dispatch (#65)
* move forks constants, rename errors
* Move vm/utils to vm/interpreter/utils
* initial opcodes refactoring
* Add refactored Comparison & Bitwise Logic Operations
* Add sha3 and address, simplify macro, support pop 0
* balance, origin, caller, callValue
* fix gas copy opcodes gas costs, add callDataLoad/Size/Copy, CodeSize/Copy and gas price opcode
* Update with 30s, 40s, 50s opcodes + impl of balance + stack improvement
* add push, dup, swap, log, create and call operations
* finish opcode implementation
* Add the new dispatching logic
* Pass the opcode test
* Make test_vm_json compile
* halt execution without exceptions for Return, Revert, selfdestruct (fix #62)
* Properly catch and recover from EVM exceptions (stack underflow ...)
* Fix byte op
* Fix jump regressions
* Update for latest devel, don't import old dispatch code as quasiBoolean macro is broken by latest devel
* Fix sha3 regression on empty memory slice and until end of range slice
* Fix padding / range error on expXY_success (gas computation left)
* update logging procs
* Add tracing - expXY_success is not a regression, sload stub was accidentally passing the test
* Reuse the same stub as OO implementation
* Delete previous opcode implementation
* Delete object oriented fork code
* Delete exceptions that were used as control flows
* delete base.nim :fire:, yet another OO remnants
* Delete opcode table
* Enable omputed gotos and compile-time gas fees
* Revert const gasCosts -> generates SIGSEGV
* inline push, swap and dup opcodes
* loggers are now template again, why does this pass new tests?
* Trigger CI rebuild after rocksdb fix https://github.com/status-im/nim-rocksdb/pull/5
* Address review comment on "push" + VMTests in debug mode (not release)
* Address review comment: don't tag fork by default, make opcode impl grepable
* Static compilation fixes after rebasing
* fix the initialization of the VM database
* add a missing import
* Deactivate balance and sload test following #59
* Reactivate stack check (deactivated in #59, necessary to pass tests)
* Merge remaining opcodes implementation from #59
* Merge callDataLoad and codeCopy fixes, todo simplify see #67
2018-07-06 07:52:31 +00:00
|
|
|
proc executeOpcodes*(computation: var BaseComputation) =
|
2018-09-18 12:10:30 +00:00
|
|
|
# TODO: Optimise getting fork and updating opCodeExec only when necessary
|
Refactor interpreter dispatch (#65)
* move forks constants, rename errors
* Move vm/utils to vm/interpreter/utils
* initial opcodes refactoring
* Add refactored Comparison & Bitwise Logic Operations
* Add sha3 and address, simplify macro, support pop 0
* balance, origin, caller, callValue
* fix gas copy opcodes gas costs, add callDataLoad/Size/Copy, CodeSize/Copy and gas price opcode
* Update with 30s, 40s, 50s opcodes + impl of balance + stack improvement
* add push, dup, swap, log, create and call operations
* finish opcode implementation
* Add the new dispatching logic
* Pass the opcode test
* Make test_vm_json compile
* halt execution without exceptions for Return, Revert, selfdestruct (fix #62)
* Properly catch and recover from EVM exceptions (stack underflow ...)
* Fix byte op
* Fix jump regressions
* Update for latest devel, don't import old dispatch code as quasiBoolean macro is broken by latest devel
* Fix sha3 regression on empty memory slice and until end of range slice
* Fix padding / range error on expXY_success (gas computation left)
* update logging procs
* Add tracing - expXY_success is not a regression, sload stub was accidentally passing the test
* Reuse the same stub as OO implementation
* Delete previous opcode implementation
* Delete object oriented fork code
* Delete exceptions that were used as control flows
* delete base.nim :fire:, yet another OO remnants
* Delete opcode table
* Enable omputed gotos and compile-time gas fees
* Revert const gasCosts -> generates SIGSEGV
* inline push, swap and dup opcodes
* loggers are now template again, why does this pass new tests?
* Trigger CI rebuild after rocksdb fix https://github.com/status-im/nim-rocksdb/pull/5
* Address review comment on "push" + VMTests in debug mode (not release)
* Address review comment: don't tag fork by default, make opcode impl grepable
* Static compilation fixes after rebasing
* fix the initialization of the VM database
* add a missing import
* Deactivate balance and sload test following #59
* Reactivate stack check (deactivated in #59, necessary to pass tests)
* Merge remaining opcodes implementation from #59
* Merge callDataLoad and codeCopy fixes, todo simplify see #67
2018-07-06 07:52:31 +00:00
|
|
|
let fork = computation.vmState.blockHeader.blockNumber.toFork
|
|
|
|
|
try:
|
2018-09-18 12:10:30 +00:00
|
|
|
computation.updateOpcodeExec(fork)
|
Refactor interpreter dispatch (#65)
* move forks constants, rename errors
* Move vm/utils to vm/interpreter/utils
* initial opcodes refactoring
* Add refactored Comparison & Bitwise Logic Operations
* Add sha3 and address, simplify macro, support pop 0
* balance, origin, caller, callValue
* fix gas copy opcodes gas costs, add callDataLoad/Size/Copy, CodeSize/Copy and gas price opcode
* Update with 30s, 40s, 50s opcodes + impl of balance + stack improvement
* add push, dup, swap, log, create and call operations
* finish opcode implementation
* Add the new dispatching logic
* Pass the opcode test
* Make test_vm_json compile
* halt execution without exceptions for Return, Revert, selfdestruct (fix #62)
* Properly catch and recover from EVM exceptions (stack underflow ...)
* Fix byte op
* Fix jump regressions
* Update for latest devel, don't import old dispatch code as quasiBoolean macro is broken by latest devel
* Fix sha3 regression on empty memory slice and until end of range slice
* Fix padding / range error on expXY_success (gas computation left)
* update logging procs
* Add tracing - expXY_success is not a regression, sload stub was accidentally passing the test
* Reuse the same stub as OO implementation
* Delete previous opcode implementation
* Delete object oriented fork code
* Delete exceptions that were used as control flows
* delete base.nim :fire:, yet another OO remnants
* Delete opcode table
* Enable omputed gotos and compile-time gas fees
* Revert const gasCosts -> generates SIGSEGV
* inline push, swap and dup opcodes
* loggers are now template again, why does this pass new tests?
* Trigger CI rebuild after rocksdb fix https://github.com/status-im/nim-rocksdb/pull/5
* Address review comment on "push" + VMTests in debug mode (not release)
* Address review comment: don't tag fork by default, make opcode impl grepable
* Static compilation fixes after rebasing
* fix the initialization of the VM database
* add a missing import
* Deactivate balance and sload test following #59
* Reactivate stack check (deactivated in #59, necessary to pass tests)
* Merge remaining opcodes implementation from #59
* Merge callDataLoad and codeCopy fixes, todo simplify see #67
2018-07-06 07:52:31 +00:00
|
|
|
except VMError:
|
|
|
|
|
computation.error = Error(info: getCurrentExceptionMsg())
|
