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

Merge branch 'develop' into develop-evmcc

Browse source 
Conflicts:
	libevm/FeeStructure.cpp
	test/vm.cpp
This commit is contained in:
Paweł Bylica 2014-10-21 14:44:09 +02:00
parent c7eac0d23c
commit 8ba533fd32
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libevmjit/GasMeter.cpp
View file

@ -30,26 +30,26 @@ uint64_t getStepCost(Instruction inst) // TODO: Add this function to FeeSructure
return 0; return 0;
case Instruction::SSTORE: case Instruction::SSTORE:
return static_cast<uint64_t>(FeeStructure::c_sstoreGas); return static_cast<uint64_t>(c_sstoreGas);
case Instruction::SLOAD: case Instruction::SLOAD:
return static_cast<uint64_t>(FeeStructure::c_sloadGas); return static_cast<uint64_t>(c_sloadGas);
case Instruction::SHA3: case Instruction::SHA3:
return static_cast<uint64_t>(FeeStructure::c_sha3Gas); return static_cast<uint64_t>(c_sha3Gas);
case Instruction::BALANCE: case Instruction::BALANCE:
return static_cast<uint64_t>(FeeStructure::c_sha3Gas); return static_cast<uint64_t>(c_sha3Gas);
case Instruction::CALL: case Instruction::CALL:
case Instruction::CALLCODE: case Instruction::CALLCODE:
return static_cast<uint64_t>(FeeStructure::c_callGas); return static_cast<uint64_t>(c_callGas);
case Instruction::CREATE: case Instruction::CREATE:
return static_cast<uint64_t>(FeeStructure::c_createGas); return static_cast<uint64_t>(c_createGas);
default: // Assumes instruction code is valid default: // Assumes instruction code is valid
return static_cast<uint64_t>(FeeStructure::c_stepGas); return static_cast<uint64_t>(c_stepGas);
} }
} }
@ -134,7 +134,7 @@ void GasMeter::countSStore(Ext& _ext, llvm::Value* _index, llvm::Value* _newValu
{ {
assert(!m_checkCall); // Everything should've been commited before assert(!m_checkCall); // Everything should've been commited before
static const auto sstoreCost = static_cast<uint64_t>(FeeStructure::c_sstoreGas); static const auto sstoreCost = static_cast<uint64_t>(c_sstoreGas);
// [ADD] if oldValue == 0 and newValue != 0 => 2*cost // [ADD] if oldValue == 0 and newValue != 0 => 2*cost
// [DEL] if oldValue != 0 and newValue == 0 => 0 // [DEL] if oldValue != 0 and newValue == 0 => 0
@ -187,7 +187,7 @@ void GasMeter::commitCostBlock(llvm::Value* _additionalCost)
void GasMeter::checkMemory(llvm::Value* _additionalMemoryInWords, llvm::IRBuilder<>& _builder) void GasMeter::checkMemory(llvm::Value* _additionalMemoryInWords, llvm::IRBuilder<>& _builder)
{ {
// Memory uses other builder, but that can be changes later // Memory uses other builder, but that can be changes later
auto cost = _builder.CreateMul(_additionalMemoryInWords, Constant::get(static_cast<uint64_t>(FeeStructure::c_memoryGas)), "memcost"); auto cost = _builder.CreateMul(_additionalMemoryInWords, Constant::get(static_cast<uint64_t>(c_memoryGas)), "memcost");
_builder.CreateCall(m_gasCheckFunc, cost); _builder.CreateCall(m_gasCheckFunc, cost);
} }