Merge branch 'release/1.7'

Author: chfast

evmc

@@ -8,12 +8,12 @@
 
 namespace
 {
-void destroy(evmc_instance* _instance)
+void destroy(evmc_vm* _instance)
 {
     (void)_instance;
 }
 
-evmc_capabilities_flagset getCapabilities(evmc_instance* _instance) noexcept
+evmc_capabilities_flagset getCapabilities(evmc_vm* _instance) noexcept
 {
     (void)_instance;
     return EVMC_CAPABILITY_EVM1;
@@ -24,7 +24,7 @@ void delete_output(const evmc_result* result)
     delete[] result->output_data;
 }
 
-evmc_result execute(evmc_instance* _instance, evmc_context* _context, evmc_revision _rev,
+evmc_result execute(evmc_vm* _instance, evmc_host_context* _context, evmc_revision _rev,
     const evmc_message* _msg, uint8_t const* _code, size_t _codeSize) noexcept
 {
     (void)_instance;
@@ -100,23 +100,17 @@ evmc_result execute(evmc_instance* _instance, evmc_context* _context, evmc_revis
 }
 }  // namespace
 
-extern "C" evmc_instance* evmc_create_interpreter() noexcept
+extern "C" evmc_vm* evmc_create_interpreter() noexcept
 {
     // TODO: Allow creating multiple instances with different configurations.
-    static evmc_instance s_instance{
-        EVMC_ABI_VERSION,
-        "interpreter",
-        aleth_version,
-        ::destroy,
-        ::execute,
-        getCapabilities,
-        nullptr,  // set_tracer
+    static evmc_vm s_vm{
+        EVMC_ABI_VERSION, "interpreter", aleth_version, ::destroy, ::execute, getCapabilities,
         nullptr,  // set_option
     };
     static bool metricsInited = dev::eth::VM::initMetrics();
     (void)metricsInited;
 
-    return &s_instance;
+    return &s_vm;
 }
 
 
@@ -176,17 +170,16 @@ uint64_t VM::decodeJumpvDest(const byte* const _code, uint64_t& _pc, byte _voff)
 //
 // set current SP to SP', adjust SP' per _removed and _added items
 //
-void VM::adjustStack(int _removed, int _added)
+void VM::adjustStack(int _required, int _change)
 {
     m_SP = m_SPP;
 
     // adjust stack and check bounds
-    m_SPP += _removed;
-    if (m_stackEnd < m_SPP)
-        throwBadStack(_removed, _added);
-    m_SPP -= _added;
+    if (m_stackEnd < m_SP + _required)
+        throwBadStack(_required, _change);
+    m_SPP -= _change;
     if (m_SPP < m_stack)
-        throwBadStack(_removed, _added);
+        throwBadStack(_required, _change);
 }
 
 uint64_t VM::gasForMem(u512 const& _size)
@@ -234,7 +227,7 @@ void VM::fetchInstruction()
 {
     m_OP = Instruction(m_code[m_PC]);
     auto const metric = (*m_metrics)[static_cast<size_t>(m_OP)];
-    adjustStack(metric.num_stack_arguments, metric.num_stack_returned_items);
+    adjustStack(metric.stack_height_required, metric.stack_height_change);
 
     // FEES...
     m_runGas = metric.gas_cost;
@@ -254,7 +247,7 @@ evmc_tx_context const& VM::getTxContext()
 //
 // interpreter entry point
 
-owning_bytes_ref VM::exec(evmc_context* _context, evmc_revision _rev, const evmc_message* _msg,
+owning_bytes_ref VM::exec(evmc_host_context* _context, evmc_revision _rev, const evmc_message* _msg,
     uint8_t const* _code, size_t _codeSize)
 {
     m_context = _context;

libaleth-interpreter/VM.cpp

@@ -51,12 +51,12 @@ class VM
 
     VM() = default;
 
-    owning_bytes_ref exec(evmc_context* _context, evmc_revision _rev, const evmc_message* _msg,
+    owning_bytes_ref exec(evmc_host_context* _context, evmc_revision _rev, const evmc_message* _msg,
         uint8_t const* _code, size_t _codeSize);
 
     uint64_t m_io_gas = 0;
 private:
-    evmc_context* m_context = nullptr;
+    evmc_host_context* m_context = nullptr;
     evmc_revision m_rev = EVMC_FRONTIER;
     std::array<evmc_instruction_metrics, 256>* m_metrics = nullptr;
     evmc_message const* m_message = nullptr;

libaleth-interpreter/VM.h

@@ -53,13 +53,13 @@ void VM::throwDisallowedStateChange()
 // throwBadStack is called from fetchInstruction() -> adjustStack()
 // its the only exception that can happen before ON_OP() log is done for an opcode case in VM.cpp
 // so the call to m_onFail is needed here
-void VM::throwBadStack(int _removed, int _added)
+void VM::throwBadStack(int _required, int _change)
 {
     bigint size = m_stackEnd - m_SPP;
-    if (size < _removed)
-        BOOST_THROW_EXCEPTION(StackUnderflow() << RequirementError((bigint)_removed, size));
+    if (size < _required)
+        BOOST_THROW_EXCEPTION(StackUnderflow() << RequirementError((bigint)_required, size));
     else
-        BOOST_THROW_EXCEPTION(OutOfStack() << RequirementError((bigint)(_added - _removed), size));
+        BOOST_THROW_EXCEPTION(OutOfStack() << RequirementError((bigint)_change, size));
 }
 
 void VM::throwRevertInstruction(owning_bytes_ref&& _output)

libaleth-interpreter/VMCalls.cpp

@@ -10,7 +10,7 @@
 extern "C" {
 #endif
 
-EVMC_EXPORT struct evmc_instance* evmc_create_interpreter() EVMC_NOEXCEPT;
+EVMC_EXPORT struct evmc_vm* evmc_create_interpreter() EVMC_NOEXCEPT;
 
 #if __cplusplus
 }

libaleth-interpreter/interpreter.h

@@ -32,9 +32,9 @@ evmc_revision toRevision(EVMSchedule const& _schedule) noexcept
 }
 }  // namespace
 
-EVMC::EVMC(evmc_instance* _instance) noexcept : evmc::vm(_instance)
+EVMC::EVMC(evmc_vm* _vm) noexcept : evmc::VM(_vm)
 {
-    assert(_instance != nullptr);
+    assert(_vm != nullptr);
     assert(is_abi_compatible());
 
     // Set the options.

libevm/EVMC.cpp

@@ -11,10 +11,10 @@ namespace dev
 namespace eth
 {
 /// The wrapper implementing the VMFace interface with a EVMC VM as a backend.
-class EVMC : public evmc::vm, public VMFace
+class EVMC : public evmc::VM, public VMFace
 {
 public:
-    explicit EVMC(evmc_instance* _instance) noexcept;
+    explicit EVMC(evmc_vm* _vm) noexcept;
 
     owning_bytes_ref exec(u256& io_gas, ExtVMFace& _ext, OnOpFunc const& _onOp) final;
 };

libevm/EVMC.h

@@ -64,8 +64,8 @@ void setVMKind(const std::string& _name)
     g_evmcDll.reset();
 
     evmc_loader_error_code ec;
-    evmc_instance *instance = evmc_load_and_create(_name.c_str(), &ec);
-    assert(ec == EVMC_LOADER_SUCCESS || instance == nullptr);
+    evmc_vm* vm = evmc_load_and_create(_name.c_str(), &ec);
+    assert(ec == EVMC_LOADER_SUCCESS || vm == nullptr);
 
     switch (ec)
     {
@@ -86,7 +86,7 @@ void setVMKind(const std::string& _name)
                 "loading " + _name + " failed"));
     }
 
-    g_evmcDll.reset(new EVMC{instance});
+    g_evmcDll.reset(new EVMC{vm});
 
     cnote << "Loaded EVMC module: " << g_evmcDll->name() << " " << g_evmcDll->version() << " ("
           << _name << ")";