Merge commit 'c36cad84693393405ae9c5d14d8d39a3dac8643e' into pr/evmjit-v0.1

evmjit/libevmjit/ExecutionEngine.cpp

@@ -1,6 +1,7 @@
 #include "ExecutionEngine.h"
 
 #include <chrono>
+#include <cstdlib>	// env options
 
 #include <llvm/IR/Module.h>
 #include <llvm/ADT/Triple.h>
@@ -19,13 +20,6 @@
 #include "Compiler.h"
 #include "Cache.h"
 
-#if defined(NDEBUG)
-#define DEBUG_ENV_OPTION(name) false
-#else
-#include <cstdlib>
-#define DEBUG_ENV_OPTION(name) (std::getenv(#name) != nullptr)
-#endif
-
 namespace dev
 {
 namespace eth
@@ -67,13 +61,21 @@ std::string codeHash(bytes const& _code)
 	return std::to_string(hash);
 }
 
+bool getEnvOption(char const* _name, bool _default)
+{
+	auto var = std::getenv(_name);
+	if (!var)
+		return _default;
+	return std::strtol(var, nullptr, 10) != 0;
+}
+
 }
 
 ReturnCode ExecutionEngine::run(bytes const& _code, RuntimeData* _data, Env* _env)
 {
 	static std::unique_ptr<llvm::ExecutionEngine> ee;  // TODO: Use Managed Objects from LLVM?
-	static auto debugDumpModule = DEBUG_ENV_OPTION(EVMJIT_DUMP_MODULE);
-	static bool objectCacheEnabled = !DEBUG_ENV_OPTION(EVMJIT_CACHE_OFF);
+	static auto debugDumpModule = getEnvOption("EVMJIT_DUMP", false);
+	static auto objectCacheEnabled = getEnvOption("EVMJIT_CACHE", true);
 
 	auto mainFuncName = codeHash(_code);
 	EntryFuncPtr entryFuncPtr{};