status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-02-03 15:55:47 +00:00
Code Issues Projects Releases Wiki Activity

only import evmc files when 'evmc_enabled' defined

Browse Source
This commit is contained in:
andri lim 2020-01-17 21:54:28 +07:00 committed by zah
parent 4aa209113a
commit c459879647
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nimbus/vm/computation.nim
View File

@ -12,7 +12,10 @@ import
./interpreter/[opcode_values, gas_meter, gas_costs, vm_forks], ./interpreter/[opcode_values, gas_meter, gas_costs, vm_forks],
./code_stream, ./memory, ./message, ./stack, ../db/[state_db, db_chain], ./code_stream, ./memory, ./message, ./stack, ../db/[state_db, db_chain],
../utils/header, stew/[byteutils, ranges], precompiles, ../utils/header, stew/[byteutils, ranges], precompiles,
transaction_tracer, evmc/evmc, evmc_helpers, evmc_api transaction_tracer
when defined(evmc_enabled):
import evmc/evmc, evmc_helpers, evmc_api
logScope: logScope:
topics = "vm computation" topics = "vm computation"
@ -379,4 +382,6 @@ proc prepareTracer*(c: Computation) =
c.vmState.tracer.prepare(c.msg.depth) c.vmState.tracer.prepare(c.msg.depth)
include interpreter_dispatch include interpreter_dispatch
include evmc_host
when defined(evmc_enabled):
include evmc_host

5
nimbus/vm/interpreter/opcodes_impl.nim
View File

@ -12,7 +12,10 @@ import
./gas_meter, ./gas_costs, ./opcode_values, ./vm_forks, ./gas_meter, ./gas_costs, ./opcode_values, ./vm_forks,
../memory, ../message, ../stack, ../code_stream, ../computation, ../memory, ../message, ../stack, ../code_stream, ../computation,
../../vm_state, ../../errors, ../../constants, ../../vm_types, ../../vm_state, ../../errors, ../../constants, ../../vm_types,
../../db/[db_chain, state_db], ../../utils, ../evmc_api, ../evmc_helpers ../../db/[db_chain, state_db], ../../utils
when defined(evmc_enabled):
import ../evmc_api, ../evmc_helpers
logScope: logScope:
topics = "opcode impl" topics = "opcode impl"

6
nimbus/vm/interpreter/utils/macros_procs_opcodes.nim
View File

@ -13,8 +13,10 @@ import
../../computation, ../../stack, ../../code_stream, ../../computation, ../../stack, ../../code_stream,
../../../vm_types, ../../memory, ../../../vm_types, ../../memory,
../../../errors, ../../message, ../../interpreter/[gas_meter, opcode_values], ../../../errors, ../../message, ../../interpreter/[gas_meter, opcode_values],
../../interpreter/utils/utils_numeric, ../../interpreter/utils/utils_numeric
../../evmc_api, evmc/evmc
when defined(evmc_enabled):
import ../../evmc_api, evmc/evmc
proc pop(tree: var NimNode): NimNode = proc pop(tree: var NimNode): NimNode =
## Returns the last value of a NimNode and remove it ## Returns the last value of a NimNode and remove it

5
nimbus/vm_types.nim
View File

@ -8,10 +8,13 @@
import import
tables, eth/common, eth/trie/db, tables, eth/common, eth/trie/db,
options, json, sets, options, json, sets,
./vm/[memory, stack, code_stream, evmc_api], ./vm/[memory, stack, code_stream],
./vm/interpreter/[gas_costs, opcode_values, vm_forks], # TODO - will be hidden at a lower layer ./vm/interpreter/[gas_costs, opcode_values, vm_forks], # TODO - will be hidden at a lower layer
./db/[db_chain, state_db] ./db/[db_chain, state_db]
when defined(evmc_enabled):
import ./vm/evmc_api
type type
BaseVMState* = ref object of RootObj BaseVMState* = ref object of RootObj
prevHeaders* : seq[BlockHeader] prevHeaders* : seq[BlockHeader]