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

Group gas counting into block of instructions called cost-block.

Browse source 
[#79942174]
This commit is contained in:
Paweł Bylica 2014-10-10 14:12:38 +02:00
parent e42217d5bc
commit cfb226ba5f
3 changed files with 45 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
evmcc/Compiler.cpp
View file

@ -178,8 +178,7 @@ std::unique_ptr<llvm::Module> Compiler::compile(const dev::bytes& bytecode)
{ {
auto inst = static_cast<Instruction>(bytecode[currentPC]); auto inst = static_cast<Instruction>(bytecode[currentPC]);
// Disable for now gasMeter.check(inst);
//gasMeter.check(inst);
switch (inst) switch (inst)
{ {

41
evmcc/GasMeter.cpp
View file

@ -49,6 +49,33 @@ uint64_t getStepCost(dev::eth::Instruction inst) // TODO: Add this function to F
} }
} }
bool isCommitTrigger(Instruction _inst)
{
switch (_inst)
{
case Instruction::STOP:
case Instruction::CALLDATACOPY:
case Instruction::CODECOPY:
case Instruction::MLOAD:
case Instruction::MSTORE:
case Instruction::MSTORE8:
case Instruction::SSTORE:
case Instruction::JUMP:
case Instruction::JUMPI:
case Instruction::JUMPDEST:
case Instruction::GAS:
case Instruction::CREATE:
case Instruction::CALL:
case Instruction::CALLCODE:
case Instruction::RETURN:
case Instruction::SUICIDE:
return true;
default:
return false;
}
}
} }
GasMeter::GasMeter(llvm::IRBuilder<>& _builder, llvm::Module* _module): GasMeter::GasMeter(llvm::IRBuilder<>& _builder, llvm::Module* _module):
@ -72,8 +99,20 @@ GasMeter::GasMeter(llvm::IRBuilder<>& _builder, llvm::Module* _module):
void GasMeter::check(Instruction _inst) void GasMeter::check(Instruction _inst)
{ {
if (!m_checkCall)
{
m_checkCall = m_builder.CreateCall(m_gasCheckFunc, m_builder.getIntN(256, 0));
}
auto stepCost = getStepCost(_inst); auto stepCost = getStepCost(_inst);
m_builder.CreateCall(m_gasCheckFunc, m_builder.getIntN(256, stepCost)); m_blockCost += stepCost;
auto isTrigger = isCommitTrigger(_inst);
if (isTrigger)
{
m_checkCall->setArgOperand(0, m_builder.getIntN(256, m_blockCost));
m_checkCall = nullptr;
}
} }
} }

4
evmcc/GasMeter.h
View file

@ -19,7 +19,11 @@ public:
void check(dev::eth::Instruction _inst); void check(dev::eth::Instruction _inst);
private: private:
/// Cumulative gas cost of a block of instructions
/// @TODO Handle overflow
uint64_t m_blockCost = 0;
llvm::IRBuilder<>& m_builder; llvm::IRBuilder<>& m_builder;
llvm::CallInst* m_checkCall;
llvm::GlobalVariable* m_gas; llvm::GlobalVariable* m_gas;
llvm::Function* m_gasCheckFunc; llvm::Function* m_gasCheckFunc;
}; };