forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-21 04:06:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Give back an amount of gas not used by CALL instructions

Browse source 
[#79942174]
This commit is contained in:
Paweł Bylica 2014-10-14 14:29:19 +02:00
parent fb87a0b2ab
commit 01ca987093
5 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
evmcc/Compiler.cpp
View file

@ -786,6 +786,7 @@ std::unique_ptr<llvm::Module> Compiler::compile(const dev::bytes& bytecode)
gasMeter.commitCostBlock(gas); gasMeter.commitCostBlock(gas);
auto ret = ext.call(gas, receiveAddress, value, inOff, inSize, outOff, outSize); auto ret = ext.call(gas, receiveAddress, value, inOff, inSize, outOff, outSize);
gasMeter.giveBack(gas);
stack.push(ret); stack.push(ret);
break; break;
} }

7
evmcc/Ext.cpp
View file

@ -165,7 +165,7 @@ Value* Ext::create(llvm::Value* _endowment, llvm::Value* _initOff, llvm::Value*
return address; return address;
} }
llvm::Value* Ext::call(llvm::Value* _gas, llvm::Value* _receiveAddress, llvm::Value* _value, llvm::Value* _inOff, llvm::Value* _inSize, llvm::Value* _outOff, llvm::Value* _outSize) llvm::Value* Ext::call(llvm::Value*& _gas, llvm::Value* _receiveAddress, llvm::Value* _value, llvm::Value* _inOff, llvm::Value* _inSize, llvm::Value* _outOff, llvm::Value* _outSize)
{ {
m_builder.CreateStore(_gas, m_args[0]); m_builder.CreateStore(_gas, m_args[0]);
auto receiveAddress = bswap(_receiveAddress); // to BE auto receiveAddress = bswap(_receiveAddress); // to BE
@ -177,6 +177,7 @@ llvm::Value* Ext::call(llvm::Value* _gas, llvm::Value* _receiveAddress, llvm::Va
m_builder.CreateStore(_outSize, m_arg7); m_builder.CreateStore(_outSize, m_arg7);
llvm::Value* args[] = {m_args[0], m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_args[1]}; llvm::Value* args[] = {m_args[0], m_arg2, m_arg3, m_arg4, m_arg5, m_arg6, m_arg7, m_args[1]};
m_builder.CreateCall(m_call, args); m_builder.CreateCall(m_call, args);
_gas = m_builder.CreateLoad(m_args[0]); // Return gas
return m_builder.CreateLoad(m_args[1]); return m_builder.CreateLoad(m_args[1]);
} }
@ -284,10 +285,10 @@ EXPORT void ext_call(i256* _gas, h256* _receiveAddress, i256* _value, i256* _inO
auto value = llvm2eth(*_value); auto value = llvm2eth(*_value);
auto ret = false; auto ret = false;
auto gas = llvm2eth(*_gas);
if (ext.balance(ext.myAddress) >= value) if (ext.balance(ext.myAddress) >= value)
{ {
ext.subBalance(value); ext.subBalance(value);
auto gas = llvm2eth(*_gas);
auto receiveAddress = dev::right160(*_receiveAddress); auto receiveAddress = dev::right160(*_receiveAddress);
auto inOff = static_cast<size_t>(llvm2eth(*_inOff)); auto inOff = static_cast<size_t>(llvm2eth(*_inOff));
auto inSize = static_cast<size_t>(llvm2eth(*_inSize)); auto inSize = static_cast<size_t>(llvm2eth(*_inSize));
@ -299,7 +300,7 @@ EXPORT void ext_call(i256* _gas, h256* _receiveAddress, i256* _value, i256* _inO
auto ret = ext.call(receiveAddress, value, inRef, &gas, outRef, onOp, {}, receiveAddress); auto ret = ext.call(receiveAddress, value, inRef, &gas, outRef, onOp, {}, receiveAddress);
} }
// m_gas += gas; // TODO: Handle gas *_gas = eth2llvm(gas);
_ret->a = ret ? 1 : 0; _ret->a = ret ? 1 : 0;
} }

2
evmcc/Ext.h
View file

@ -36,7 +36,7 @@ public:
void suicide(llvm::Value* _address); void suicide(llvm::Value* _address);
llvm::Value* calldataload(llvm::Value* _index); llvm::Value* calldataload(llvm::Value* _index);
llvm::Value* create(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* call(llvm::Value*& _gas, llvm::Value* _receiveAddress, llvm::Value* _value, llvm::Value* _inOff, llvm::Value* _inSize, llvm::Value* _outOff, llvm::Value* _outSize);
llvm::Value* sha3(llvm::Value* _inOff, llvm::Value* _inSize); llvm::Value* sha3(llvm::Value* _inOff, llvm::Value* _inSize);
llvm::Value* exp(llvm::Value* _left, llvm::Value* _right); llvm::Value* exp(llvm::Value* _left, llvm::Value* _right);

7
evmcc/GasMeter.cpp
View file

@ -108,6 +108,13 @@ void GasMeter::count(Instruction _inst)
commitCostBlock(); commitCostBlock();
} }
void GasMeter::giveBack(llvm::Value* _gas)
{
llvm::Value* gasCounter = m_builder.CreateLoad(m_gas, "gas");
gasCounter = m_builder.CreateAdd(gasCounter, _gas);
m_builder.CreateStore(gasCounter, m_gas);
}
void GasMeter::commitCostBlock(llvm::Value* _additionalCost) void GasMeter::commitCostBlock(llvm::Value* _additionalCost)
{ {
assert(!_additionalCost || m_checkCall); // _additionalCost => m_checkCall; Must be inside cost-block assert(!_additionalCost || m_checkCall); // _additionalCost => m_checkCall; Must be inside cost-block

3
evmcc/GasMeter.h
View file

@ -23,6 +23,9 @@ public:
/// @param _additionalCost adds additional cost to cost-block before commit /// @param _additionalCost adds additional cost to cost-block before commit
void commitCostBlock(llvm::Value* _additionalCost = nullptr); void commitCostBlock(llvm::Value* _additionalCost = nullptr);
/// Give back an amount of gas not used by a call
void giveBack(llvm::Value* _gas);
/// Generate code that checks the cost of additional memory used by program /// Generate code that checks the cost of additional memory used by program
void checkMemory(llvm::Value* _additionalMemoryInWords, llvm::IRBuilder<>& _builder); void checkMemory(llvm::Value* _additionalMemoryInWords, llvm::IRBuilder<>& _builder);