SmartVM: initial implementation

This commit is contained in:
Paweł Bylica 2015-05-06 13:18:52 +02:00
parent fce1a7f82e
commit b9a722223a
2 changed files with 3 additions and 5 deletions

View File

@ -288,7 +288,7 @@ void ImportTest::checkExpectedState(State const& _stateExpect, State const& _sta
{ {
addressOptions = _expectedStateOptions.at(a.first); addressOptions = _expectedStateOptions.at(a.first);
} }
catch(std::out_of_range) catch(std::out_of_range const&)
{ {
BOOST_ERROR("expectedStateOptions map does not match expectedState in checkExpectedState!"); BOOST_ERROR("expectedStateOptions map does not match expectedState in checkExpectedState!");
break; break;
@ -707,10 +707,9 @@ Options::Options()
{ {
auto arg = std::string{argv[i]}; auto arg = std::string{argv[i]};
if (arg == "--jit") if (arg == "--jit")
{
jit = true;
eth::VMFactory::setKind(eth::VMKind::JIT); eth::VMFactory::setKind(eth::VMKind::JIT);
} else if (arg == "--vm=smart")
eth::VMFactory::setKind(eth::VMKind::Smart);
else if (arg == "--vmtrace") else if (arg == "--vmtrace")
vmtrace = true; vmtrace = true;
else if (arg == "--filltests") else if (arg == "--filltests")

View File

@ -179,7 +179,6 @@ void checkAddresses(mapType& _expectedAddrs, mapType& _resultAddrs)
class Options class Options
{ {
public: public:
bool jit = false; ///< Use JIT
bool vmtrace = false; ///< Create EVM execution tracer // TODO: Link with log verbosity? bool vmtrace = false; ///< Create EVM execution tracer // TODO: Link with log verbosity?
bool fillTests = false; ///< Create JSON test files from execution results bool fillTests = false; ///< Create JSON test files from execution results
bool stats = false; ///< Execution time stats bool stats = false; ///< Execution time stats