cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename namespace for instruction.h/cpp in libevmasm

Browse Source
This commit is contained in:
Dimitry
2016-04-02 15:56:43 +03:00
parent ccbd3ff63f
commit 858c41260d
29 changed files with 596 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/interface/GasEstimator.cpp
+3 -3
View File
@@ -137,8 +137,8 @@ GasEstimator::GasConsumption GasEstimator::functionalEstimation(
using Id = ExpressionClasses::Id;
using Ids = vector<Id>;
Id hashValue = classes.find(u256(FixedHash<4>::Arith(FixedHash<4>(dev::sha3(_signature)))));
Id calldata = classes.find(eth::Instruction::CALLDATALOAD, Ids{classes.find(u256(0))});
classes.forceEqual(hashValue, eth::Instruction::DIV, Ids{
Id calldata = classes.find(solidity::Instruction::CALLDATALOAD, Ids{classes.find(u256(0))});
classes.forceEqual(hashValue, solidity::Instruction::DIV, Ids{
calldata,
classes.find(u256(1) << (8 * 28))
});
@@ -165,7 +165,7 @@ GasEstimator::GasConsumption GasEstimator::functionalEstimation(
AssemblyItem invalidTag(PushTag, u256(-0x10));
state->feedItem(invalidTag, true);
if (parametersSize > 0)
state->feedItem(eth::swapInstruction(parametersSize));
state->feedItem(solidity::swapInstruction(parametersSize));
return PathGasMeter(_items).estimateMax(_offset, state);
}