Pass gas counter to env_create as int64*

evmjit/libevmjit-cpp/Env.cpp

@@ -46,16 +46,15 @@ extern "C"
 		*o_hash = _env->blockhash(llvm2eth(*_number));
 	}
 
-	EXPORT void env_create(ExtVMFace* _env, i256* io_gas, i256* _endowment, byte* _initBeg, uint64_t _initSize, h256* o_address)
+	EXPORT void env_create(ExtVMFace* _env, int64_t* io_gas, i256* _endowment, byte* _initBeg, uint64_t _initSize, h256* o_address)
 	{
 		auto endowment = llvm2eth(*_endowment);
 		if (_env->balance(_env->myAddress) >= endowment && _env->depth < 1024)
 		{
 			_env->subBalance(endowment);
-			auto gas = llvm2eth(*io_gas);
-			OnOpFunc onOp {}; // TODO: Handle that thing
-			h256 address(_env->create(endowment, gas, {_initBeg, _initSize}, onOp), h256::AlignRight);
-			*io_gas = eth2llvm(gas);
+			u256 gas = *io_gas;
+			h256 address(_env->create(endowment, gas, {_initBeg, _initSize}, {}), h256::AlignRight);
+			*io_gas = static_cast<int64_t>(gas);
 			*o_address = address;
 		}
 		else

evmjit/libevmjit/Compiler.cpp

@@ -740,10 +740,7 @@ void Compiler::compileBasicBlock(BasicBlock& _basicBlock, RuntimeManager& _runti
 			_memory.require(initOff, initSize);
 
 			_gasMeter.commitCostBlock();
-
-			auto gas = _runtimeManager.getGas();
-			auto address = _ext.create(gas, endowment, initOff, initSize);
-			_runtimeManager.setGas(gas);
+			auto address = _ext.create(endowment, initOff, initSize);
 			stack.push(address);
 			break;
 		}

evmjit/libevmjit/Ext.cpp

@@ -41,7 +41,7 @@ std::array<FuncDesc, sizeOf<EnvFunc>::value> const& getEnvFuncDescs()
 		FuncDesc{"env_sstore",  getFunctionType(Type::Void, {Type::EnvPtr, Type::WordPtr, Type::WordPtr})},
 		FuncDesc{"env_sha3", getFunctionType(Type::Void, {Type::BytePtr, Type::Size, Type::WordPtr})},
 		FuncDesc{"env_balance", getFunctionType(Type::Void, {Type::EnvPtr, Type::WordPtr, Type::WordPtr})},
-		FuncDesc{"env_create", getFunctionType(Type::Void, {Type::EnvPtr, Type::WordPtr, Type::WordPtr, Type::BytePtr, Type::Size, Type::WordPtr})},
+		FuncDesc{"env_create", getFunctionType(Type::Void, {Type::EnvPtr, Type::GasPtr, Type::WordPtr, Type::BytePtr, Type::Size, Type::WordPtr})},
 		FuncDesc{"env_call", getFunctionType(Type::Bool, {Type::EnvPtr, Type::WordPtr, Type::WordPtr, Type::WordPtr, Type::BytePtr, Type::Size, Type::BytePtr, Type::Size, Type::WordPtr})},
 		FuncDesc{"env_log", getFunctionType(Type::Void, {Type::EnvPtr, Type::BytePtr, Type::Size, Type::WordPtr, Type::WordPtr, Type::WordPtr, Type::WordPtr})},
 		FuncDesc{"env_blockhash", getFunctionType(Type::Void, {Type::EnvPtr, Type::WordPtr, Type::WordPtr})},
@@ -126,16 +126,12 @@ llvm::Value* Ext::blockhash(llvm::Value* _number)
 	return Endianness::toNative(getBuilder(), hash);
 }
 
-llvm::Value* Ext::create(llvm::Value*& _gas, llvm::Value* _endowment, llvm::Value* _initOff, llvm::Value* _initSize)
+llvm::Value* Ext::create(llvm::Value* _endowment, llvm::Value* _initOff, llvm::Value* _initSize)
 {
-	auto gas256 = m_builder.CreateZExt(_gas, Type::Word, "gas256");
-	auto gas = byPtr(gas256);
 	auto ret = getArgAlloca();
 	auto begin = m_memoryMan.getBytePtr(_initOff);
 	auto size = m_builder.CreateTrunc(_initSize, Type::Size, "size");
-	createCall(EnvFunc::create, {getRuntimeManager().getEnvPtr(), gas, byPtr(_endowment), begin, size, ret});
-	gas256 = m_builder.CreateLoad(gas); // Return gas
-	_gas = m_builder.CreateTrunc(gas256, Type::Gas);
+	createCall(EnvFunc::create, {getRuntimeManager().getEnvPtr(), getRuntimeManager().getGasPtr(), byPtr(_endowment), begin, size, ret});
 	llvm::Value* address = m_builder.CreateLoad(ret);
 	address = Endianness::toNative(m_builder, address);
 	return address;

evmjit/libevmjit/Ext.h

@@ -50,7 +50,7 @@ public:
 
 	llvm::Value* balance(llvm::Value* _address);
 	llvm::Value* calldataload(llvm::Value* _index);
-	llvm::Value* create(llvm::Value*& _gas, llvm::Value* _endowment, llvm::Value* _initOff, llvm::Value* _initSize);
+	llvm::Value* create(llvm::Value* _endowment, llvm::Value* _initOff, llvm::Value* _initSize);
 	llvm::Value* call(llvm::Value*& _gas, llvm::Value* _receiveAddress, llvm::Value* _value, llvm::Value* _inOff, llvm::Value* _inSize, llvm::Value* _outOff, llvm::Value* _outSize, llvm::Value* _codeAddress);
 	llvm::Value* blockhash(llvm::Value* _number);
 

evmjit/libevmjit/RuntimeManager.cpp

@@ -221,6 +221,11 @@ llvm::Value* RuntimeManager::getGas()
 	return gas;
 }
 
+llvm::Value* RuntimeManager::getGasPtr()
+{
+	return getPtr(RuntimeData::Gas);
+}
+
 void RuntimeManager::setGas(llvm::Value* _gas)
 {
 	assert(_gas->getType() == Type::Gas);

evmjit/libevmjit/RuntimeManager.h

@@ -23,7 +23,8 @@ public:
 
 	llvm::Value* get(RuntimeData::Index _index);
 	llvm::Value* get(Instruction _inst);
-	llvm::Value* getGas();	// TODO: Remove
+	llvm::Value* getGas();
+	llvm::Value* getGasPtr();
 	llvm::Value* getCallData();
 	llvm::Value* getCode();
 	llvm::Value* getCodeSize();

evmjit/libevmjit/Type.cpp

@@ -18,6 +18,7 @@ llvm::IntegerType* Type::lowPrecision;
 llvm::IntegerType* Type::Bool;
 llvm::IntegerType* Type::Size;
 llvm::IntegerType* Type::Gas;
+llvm::PointerType* Type::GasPtr;
 llvm::IntegerType* Type::Byte;
 llvm::PointerType* Type::BytePtr;
 llvm::Type* Type::Void;
@@ -38,6 +39,7 @@ void Type::init(llvm::LLVMContext& _context)
 		Bool = llvm::Type::getInt1Ty(_context);
 		Size = llvm::Type::getInt64Ty(_context);
 		Gas = Size;
+		GasPtr = Gas->getPointerTo();
 		Byte = llvm::Type::getInt8Ty(_context);
 		BytePtr = Byte->getPointerTo();
 		Void = llvm::Type::getVoidTy(_context);

evmjit/libevmjit/Type.h

@@ -24,6 +24,7 @@ struct Type
 	static llvm::IntegerType* Bool;
 	static llvm::IntegerType* Size;
 	static llvm::IntegerType* Gas;
+	static llvm::PointerType* GasPtr;
 
 	static llvm::IntegerType* Byte;
 	static llvm::PointerType* BytePtr;