From f31f3bcfc5e6d2e52287891dbcc77527f895a8ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <pawel.bylica@imapp.pl>
Date: Fri, 17 Oct 2014 11:59:12 +0200
Subject: [PATCH] Using gas provided by test engine and fix for creating fake
 ExtVMFace.

---
 evmcc/evmcc.cpp               | 3 ++-
 libevmjit/ExecutionEngine.cpp | 9 ++++-----
 libevmjit/ExecutionEngine.h   | 2 +-
 libevmjit/VM.cpp              | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/evmcc/evmcc.cpp b/evmcc/evmcc.cpp
index 600980d441..9cf7314193 100644
--- a/evmcc/evmcc.cpp
+++ b/evmcc/evmcc.cpp
@@ -112,7 +112,8 @@ int main(int argc, char** argv)
 		auto engine = eth::jit::ExecutionEngine();
 		auto module = eth::jit::Compiler().compile({bytecode.data(), bytecode.size()});
 		module->dump();
-		auto result = engine.run(std::move(module));
+		u256 gas = 10000;
+		auto result = engine.run(std::move(module), gas);
 		return result;
 	}
 
diff --git a/libevmjit/ExecutionEngine.cpp b/libevmjit/ExecutionEngine.cpp
index 252cf7aff0..5390d82dd3 100644
--- a/libevmjit/ExecutionEngine.cpp
+++ b/libevmjit/ExecutionEngine.cpp
@@ -36,7 +36,7 @@ ExecutionEngine::ExecutionEngine()
 extern "C" { EXPORT std::jmp_buf* rt_jmpBuf; }
 
 
-int ExecutionEngine::run(std::unique_ptr<llvm::Module> _module, ExtVMFace* _ext)
+int ExecutionEngine::run(std::unique_ptr<llvm::Module> _module, u256& _gas, ExtVMFace* _ext)
 {
 	auto module = _module.get(); // Keep ownership of the module in _module
 
@@ -83,7 +83,7 @@ int ExecutionEngine::run(std::unique_ptr<llvm::Module> _module, ExtVMFace* _ext)
 	// Create fake ExtVM interface
 	if (!_ext)
 	{
-		auto _ext = new ExtVMFace;
+		_ext = new ExtVMFace;
 		_ext->myAddress = Address(1122334455667788);
 		_ext->caller = Address(0xfacefacefaceface);
 		_ext->origin = Address(101010101010101010);
@@ -102,8 +102,7 @@ int ExecutionEngine::run(std::unique_ptr<llvm::Module> _module, ExtVMFace* _ext)
 	}
 
 	// Init runtime
-	uint64_t gas = 100;
-	Runtime runtime(gas, *_ext);
+	Runtime runtime(_gas, *_ext);
 
 	auto entryFunc = module->getFunction("main");
 	if (!entryFunc)
@@ -124,7 +123,7 @@ int ExecutionEngine::run(std::unique_ptr<llvm::Module> _module, ExtVMFace* _ext)
 	else
 		returnCode = static_cast<ReturnCode>(r);
 
-	gas = static_cast<decltype(gas)>(Runtime::getGas());
+	_gas = Runtime::getGas();
 
 	if (returnCode == ReturnCode::Return)
 	{
diff --git a/libevmjit/ExecutionEngine.h b/libevmjit/ExecutionEngine.h
index 12ca66302b..15a4e6ef72 100644
--- a/libevmjit/ExecutionEngine.h
+++ b/libevmjit/ExecutionEngine.h
@@ -18,7 +18,7 @@ class ExecutionEngine
 public:
 	ExecutionEngine();
 
-	int run(std::unique_ptr<llvm::Module> module, ExtVMFace* _ext = nullptr);
+	int run(std::unique_ptr<llvm::Module> module, u256& _gas, ExtVMFace* _ext = nullptr);
 
 	bytes returnData;
 };
diff --git a/libevmjit/VM.cpp b/libevmjit/VM.cpp
index b4139f8bfb..9e06fb6d0e 100644
--- a/libevmjit/VM.cpp
+++ b/libevmjit/VM.cpp
@@ -19,7 +19,7 @@ bytes VM::go(ExtVMFace& _ext)
 	module->dump();
 
 	ExecutionEngine engine;
-	auto exitCode = engine.run(std::move(module), &_ext);
+	auto exitCode = engine.run(std::move(module), m_gas, &_ext);
 
 	switch (exitCode)
 	{