Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade EVMC to version 7.0.0 #204

Merged
merged 1 commit into from
Nov 12, 2019
Merged

Upgrade EVMC to version 7.0.0 #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion evmc
Open in desktop
Submodule evmc updated 37 files
+1 −1 .bumpversion.cfg
+158 −122 CHANGELOG.md
+1 −1 CMakeLists.txt
+18 −1 README.md
+9 −15 bindings/go/evmc/evmc.go
+12 −30 bindings/go/evmc/host.go
+1 −1 bindings/rust/evmc-declare-tests/Cargo.toml
+1 −1 bindings/rust/evmc-declare-tests/src/lib.rs
+1 −1 bindings/rust/evmc-declare/Cargo.toml
+14 −8 bindings/rust/evmc-declare/src/lib.rs
+1 −1 bindings/rust/evmc-sys/Cargo.toml
+1 −0 bindings/rust/evmc-sys/build.rs
+1 −1 bindings/rust/evmc-vm/Cargo.toml
+7 −6 bindings/rust/evmc-vm/src/container.rs
+63 −99 bindings/rust/evmc-vm/src/lib.rs
+1 −1 circle.yml
+2 −2 cmake/Hunter/init.cmake
+1 −1 examples/CMakeLists.txt
+7 −2 examples/example-rust-vm/src/lib.rs
+3 −2 examples/example.c
+8 −2 examples/example_host.cpp
+2 −0 examples/example_host.h
+9 −3 examples/example_precompiles_vm/CMakeLists.txt
+6 −6 examples/example_precompiles_vm/example_precompiles_vm.cpp
+21 −0 examples/example_precompiles_vm/example_precompiles_vm.h
+7 −5 examples/example_vm/CMakeLists.txt
+7 −6 examples/example_vm/example_vm.c
+11 −19 include/evmc/evmc.h
+196 −120 include/evmc/evmc.hpp
+3 −2 include/evmc/helpers.h
+4 −9 include/evmc/loader.h
+3 −11 lib/loader/loader.c
+10 −1 test/unittests/CMakeLists.txt
+101 −4 test/unittests/test_cpp.cpp
+37 −5 test/unittests/test_loader.cpp
+2 −2 test/vmtester/CMakeLists.txt
+6 −5 test/vmtester/tests.cpp
2 changes: 1 addition & 1 deletion lib/evmone/analysis.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ struct execution_state
const uint8_t* code = nullptr;
size_t code_size = 0;

evmc::HostContext host{nullptr};
evmc::HostContext host;

evmc_revision rev = {};

Expand Down
6 changes: 3 additions & 3 deletions lib/evmone/execution.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

namespace evmone
{
evmc_result execute(evmc_vm* /*unused*/, evmc_host_context* ctx, evmc_revision rev,
const evmc_message* msg, const uint8_t* code, size_t code_size) noexcept
evmc_result execute(evmc_vm* /*unused*/, const evmc_host_interface* host, evmc_host_context* ctx,
evmc_revision rev, const evmc_message* msg, const uint8_t* code, size_t code_size) noexcept
{
auto analysis = analyze(rev, code, code_size);

Expand All @@ -18,7 +18,7 @@ evmc_result execute(evmc_vm* /*unused*/, evmc_host_context* ctx, evmc_revision r
state->msg = msg;
state->code = code;
state->code_size = code_size;
state->host = evmc::HostContext{ctx};
state->host = evmc::HostContext{*host, ctx};
state->gas_left = msg->gas;
state->rev = rev;

Expand Down
4 changes: 2 additions & 2 deletions lib/evmone/execution.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@

namespace evmone
{
evmc_result execute(evmc_vm* vm, evmc_host_context* ctx, evmc_revision rev, const evmc_message* msg,
const uint8_t* code, size_t code_size) noexcept;
evmc_result execute(evmc_vm* vm, const evmc_host_interface* host, evmc_host_context* ctx,
evmc_revision rev, const evmc_message* msg, const uint8_t* code, size_t code_size) noexcept;
} // namespace evmone
3 changes: 1 addition & 2 deletions test/bench/bench.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ inline evmc::result execute(bytes_view code, bytes_view input) noexcept
msg.gas = gas_limit;
msg.input_data = input.data();
msg.input_size = input.size();
auto null_ctx = evmc_host_context{};
return vm.execute(null_ctx, EVMC_CONSTANTINOPLE, msg, code.data(), code.size());
return vm.execute(EVMC_CONSTANTINOPLE, msg, code.data(), code.size());
}

void execute(State& state, bytes_view code, bytes_view input) noexcept
Expand Down