cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2374 from chfast/pr/smartvm

Browse Source 
Smart VM
This commit is contained in:
Gav Wood 2015-07-05 14:19:06 -04:00
commit e1dabe556b
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
TestHelper.cpp
View File

@ -235,7 +235,7 @@ void ImportTest::importState(json_spirit::mObject& _o, State& _state)
} }
void ImportTest::importTransaction(json_spirit::mObject& _o) void ImportTest::importTransaction(json_spirit::mObject& _o)
{ {
if (_o.count("secretKey") > 0) if (_o.count("secretKey") > 0)
{ {
assert(_o.count("nonce") > 0); assert(_o.count("nonce") > 0);
@ -728,10 +728,20 @@ Options::Options()
for (auto i = 0; i < argc; ++i) for (auto i = 0; i < argc; ++i)
{ {
auto arg = std::string{argv[i]}; auto arg = std::string{argv[i]};
if (arg == "--jit") if (arg == "--vm" && i + 1 < argc)
eth::VMFactory::setKind(eth::VMKind::JIT); {
else if (arg == "--vm=smart") string vmKind = argv[++i];
eth::VMFactory::setKind(eth::VMKind::Smart); if (vmKind == "interpreter")
VMFactory::setKind(VMKind::Interpreter);
else if (vmKind == "jit")
VMFactory::setKind(VMKind::JIT);
else if (vmKind == "smart")
VMFactory::setKind(VMKind::Smart);
else
cerr << "Unknown VM kind: " << vmKind << endl;
}
else if (arg == "--jit") // TODO: Remove deprecated option "--jit"
VMFactory::setKind(VMKind::JIT);
else if (arg == "--vmtrace") else if (arg == "--vmtrace")
vmtrace = true; vmtrace = true;
else if (arg == "--filltests") else if (arg == "--filltests")