provide vm_opcode_values as import/export wrapper
details: moved original vm/interpreter/opcode_values.nim => vm/interpreter/nvm_opcode_values.nim
This commit is contained in:
parent
cf63b9b03f
commit
99568c9b46
|
@ -8,7 +8,7 @@
|
|||
import
|
||||
chronicles, strformat, strutils, sequtils, parseutils, sets, macros,
|
||||
eth/common,
|
||||
vm/interpreter/opcode_values
|
||||
vm/interpreter/nvm_opcode_values
|
||||
|
||||
logScope:
|
||||
topics = "vm code_stream"
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
import
|
||||
math, eth/common/eth_types,
|
||||
vm/interpreter/utils/[macros_gen_opcodes, utils_numeric],
|
||||
vm/interpreter/[opcode_values, nvm_forks], errors
|
||||
vm/interpreter/[nvm_opcode_values, nvm_forks], errors
|
||||
|
||||
when defined(evmc_enabled):
|
||||
import evmc/evmc
|
||||
|
|
|
@ -9,7 +9,7 @@ import
|
|||
strformat, times, sets, sequtils, options,
|
||||
chronicles, stint, nimcrypto, stew/ranges/ptr_arith, eth/common,
|
||||
vm/interpreter/utils/[macros_procs_opcodes, utils_numeric],
|
||||
vm/interpreter/[gas_meter, nvm_gas_costs, opcode_values, nvm_forks],
|
||||
vm/interpreter/[gas_meter, nvm_gas_costs, nvm_opcode_values, nvm_forks],
|
||||
vm/[nvm_memory, stack, code_stream, nvm_computation, nvm_state, nvm_types],
|
||||
errors, constants,
|
||||
db/[db_chain, accounts_cache]
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
import
|
||||
macros, strformat, stint, eth/common,
|
||||
vm/[nvm_computation, stack, code_stream, nvm_memory],
|
||||
vm/nvm_types, errors, vm/interpreter/[gas_meter, opcode_values],
|
||||
vm/nvm_types, errors, vm/interpreter/[gas_meter, nvm_opcode_values],
|
||||
vm/interpreter/utils/utils_numeric
|
||||
|
||||
when defined(evmc_enabled):
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
import
|
||||
tables, macros,
|
||||
chronicles,
|
||||
vm/interpreter/[opcode_values, opcodes_impl, nvm_forks, nvm_gas_costs, gas_meter, utils/macros_gen_opcodes],
|
||||
vm/interpreter/[nvm_opcode_values, opcodes_impl, nvm_forks, nvm_gas_costs, gas_meter, utils/macros_gen_opcodes],
|
||||
vm/code_stream, vm/nvm_types, errors, nvm_precompiles, vm/stack,
|
||||
terminal # Those are only needed for logging
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ import
|
|||
chronicles, strformat, macros, options, times,
|
||||
sets, eth/[common, keys],
|
||||
constants, errors,
|
||||
vm/interpreter/[opcode_values, gas_meter, nvm_gas_costs, nvm_forks],
|
||||
vm/interpreter/[nvm_opcode_values, gas_meter, nvm_gas_costs, nvm_forks],
|
||||
vm/[code_stream, nvm_memory, nvm_message, stack, nvm_types, nvm_state],
|
||||
db/[accounts_cache, db_chain],
|
||||
utils/header, nvm_precompiles,
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
# at your option. This file may not be copied, modified, or distributed except according to those terms.
|
||||
|
||||
import
|
||||
vm/interpreter/[opcode_values, gas_meter, nvm_forks]
|
||||
vm/interpreter/[nvm_opcode_values, gas_meter, nvm_forks]
|
||||
|
||||
import # Used in vm_types. Beware of recursive dependencies
|
||||
vm/[code_stream, nvm_computation, stack, nvm_message]
|
||||
|
||||
export
|
||||
opcode_values, gas_meter,
|
||||
nvm_opcode_values, gas_meter,
|
||||
nvm_forks
|
||||
|
||||
export
|
||||
|
|
|
@ -12,7 +12,7 @@ import
|
|||
tables, eth/common,
|
||||
options, json, sets,
|
||||
vm/[nvm_memory, stack, code_stream],
|
||||
vm/interpreter/[nvm_gas_costs, opcode_values, nvm_forks],
|
||||
vm/interpreter/[nvm_gas_costs, nvm_opcode_values, nvm_forks],
|
||||
# TODO - will be hidden at a lower layer
|
||||
db/[db_chain, accounts_cache]
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ import
|
|||
chronicles, nimcrypto, eth/common, stint,
|
||||
vm/[nvm_types, nvm_memory, stack], db/accounts_cache,
|
||||
eth/trie/hexary,
|
||||
vm/interpreter/opcode_values
|
||||
vm/interpreter/nvm_opcode_values
|
||||
|
||||
logScope:
|
||||
topics = "vm opcode"
|
||||
|
|
|
@ -0,0 +1,19 @@
|
|||
# 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.
|
||||
|
||||
# At the moment, this header file interface is only used for testing, so it
|
||||
# might be worth merging it into a vm_internals.nim (or so) header file.
|
||||
import
|
||||
./vm/interpreter/nvm_opcode_values as vmo
|
||||
|
||||
export
|
||||
vmo.Op
|
||||
|
||||
# End
|
|
@ -1,7 +1,7 @@
|
|||
import
|
||||
macrocache, strutils, unittest2,
|
||||
stew/byteutils, chronicles, eth/common,
|
||||
../nimbus/vm/interpreter/opcode_values,
|
||||
../nimbus/vm_opcode_values,
|
||||
stew/shims/macros, ../nimbus/config
|
||||
|
||||
import
|
||||
|
@ -11,7 +11,7 @@ import
|
|||
../nimbus/[vm_computation, vm_state_transactions, vm_forks,
|
||||
vm_message, vm_memory, vm_state, vm_types]
|
||||
|
||||
export opcode_values, byteutils
|
||||
export vm_opcode_values, byteutils
|
||||
{.experimental: "dynamicBindSym".}
|
||||
|
||||
# backported from Nim 0.19.9
|
||||
|
|
Loading…
Reference in New Issue