From b09ebfe2f2d7d4131fa8e926042772ca0ede8eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Thu, 8 Jan 2015 15:07:54 +0100 Subject: [PATCH] Add option to use JIT in mining (reverted from commit 0a3edb98a36a4c2882f8505aeee30506eac7a0b4) --- eth/main.cpp | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/eth/main.cpp b/eth/main.cpp index a0a605193..dae61e114 100644 --- a/eth/main.cpp +++ b/eth/main.cpp @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #if ETH_READLINE @@ -122,11 +121,7 @@ void help() << " -u,--public-ip Force public ip to given (default; auto)." << endl << " -v,--verbosity <0 - 9> Set the log verbosity from 0 to 9 (Default: 8)." << endl << " -x,--peers Attempt to connect to given number of peers (Default: 5)." << endl - << " -V,--version Show the version and exit." << endl -#if ETH_EVMJIT - << " --jit Use EVM JIT (default: off)." << endl -#endif - ; + << " -V,--version Show the version and exit." << endl; exit(0); } @@ -198,7 +193,6 @@ int main(int argc, char** argv) bool upnp = true; bool useLocal = false; bool forceMining = false; - bool jit = false; string clientName; // Init defaults @@ -301,15 +295,6 @@ int main(int argc, char** argv) return -1; } } - else if (arg == "--jit") - { -#if ETH_EVMJIT - jit = true; -#else - cerr << "EVM JIT not enabled" << endl; - return -1; -#endif - } else if (arg == "-h" || arg == "--help") help(); else if (arg == "-V" || arg == "--version") @@ -323,10 +308,9 @@ int main(int argc, char** argv) cout << credits(); - VMFactory::setKind(jit ? VMKind::JIT : VMKind::Interpreter); NetworkPreferences netPrefs(listenPort, publicIP, upnp, useLocal); dev::WebThreeDirect web3( - "Ethereum(++)/" + clientName + "v" + dev::Version + "/" DEV_QUOTED(ETH_BUILD_TYPE) "/" DEV_QUOTED(ETH_BUILD_PLATFORM) + (jit ? "/JIT" : ""), + "Ethereum(++)/" + clientName + "v" + dev::Version + "/" DEV_QUOTED(ETH_BUILD_TYPE) "/" DEV_QUOTED(ETH_BUILD_PLATFORM), dbPath, false, mode == NodeMode::Full ? set{"eth", "shh"} : set(),