forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-21 20:26:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Implement VMFace with jit::VM

Browse source
This commit is contained in:
Paweł Bylica 2014-10-22 16:40:05 +02:00
parent 701d99e052
commit 48108f5433
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libevmjit/VM.cpp
View file

@ -1,7 +1,7 @@
#include "VM.h" #include "VM.h"
#include <libevm/VM.h> #include <libevm/VMFace.h>
#include "ExecutionEngine.h" #include "ExecutionEngine.h"
#include "Compiler.h" #include "Compiler.h"
@ -13,7 +13,7 @@ namespace eth
namespace jit namespace jit
{ {
bytes VM::go(ExtVMFace& _ext) bytesConstRef VM::go(ExtVMFace& _ext, OnOpFunc const& _onOp, uint64_t _steps)
{ {
auto module = Compiler().compile(_ext.code); auto module = Compiler().compile(_ext.code);
@ -30,7 +30,8 @@ bytes VM::go(ExtVMFace& _ext)
BOOST_THROW_EXCEPTION(StackTooSmall(1,0)); BOOST_THROW_EXCEPTION(StackTooSmall(1,0));
} }
return std::move(engine.returnData); m_output = std::move(engine.returnData);
return {m_output.data(), m_output.size()}; // TODO: This all bytesConstRef stuff sucks
} }
} }

14
libevmjit/VM.h
View file

@ -2,6 +2,7 @@
#pragma once #pragma once
#include <libdevcore/Common.h> #include <libdevcore/Common.h>
#include <libevm/VMFace.h>
#include <libevm/ExtVMFace.h> #include <libevm/ExtVMFace.h>
namespace dev namespace dev
@ -11,20 +12,15 @@ namespace eth
namespace jit namespace jit
{ {
class VM class VM: public VMFace
{ {
public: public:
/// Construct VM object. explicit VM(u256 _gas = 0): VMFace(_gas) {}
explicit VM(u256 _gas = 0): m_gas(_gas) {}
void reset(u256 _gas = 0) { m_gas = _gas; } virtual bytesConstRef go(ExtVMFace& _ext, OnOpFunc const& _onOp = {}, uint64_t _steps = (uint64_t)-1) final;
bytes go(ExtVMFace& _ext);
u256 gas() const { return m_gas; }
private: private:
u256 m_gas = 0; bytes m_output;
}; };
} }