diff options
Diffstat (limited to 'libevmasm')
| -rw-r--r-- | libevmasm/BlockDeduplicator.cpp | 2 | ||||
| -rw-r--r-- | libevmasm/GasMeter.cpp | 6 | ||||
| -rw-r--r-- | libevmasm/PathGasMeter.cpp | 6 | ||||
| -rw-r--r-- | libevmasm/SemanticInformation.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/libevmasm/BlockDeduplicator.cpp b/libevmasm/BlockDeduplicator.cpp index d88474a7..3bb7a797 100644 --- a/libevmasm/BlockDeduplicator.cpp +++ b/libevmasm/BlockDeduplicator.cpp @@ -106,7 +106,7 @@ BlockDeduplicator::BlockIterator& BlockDeduplicator::BlockIterator::operator++() { if (it == end) return *this; - if (SemanticInformation::altersControlFlow(*it) && *it != AssemblyItem(solidity::Instruction::JUMPI)) + if (SemanticInformation::altersControlFlow(*it) && *it != AssemblyItem(Instruction::JUMPI)) it = end; else { diff --git a/libevmasm/GasMeter.cpp b/libevmasm/GasMeter.cpp index eab3037b..40a67bb1 100644 --- a/libevmasm/GasMeter.cpp +++ b/libevmasm/GasMeter.cpp @@ -84,13 +84,13 @@ GasMeter::GasConsumption GasMeter::estimateMax(AssemblyItem const& _item) break; case Instruction::MLOAD: case Instruction::MSTORE: - gas += memoryGas(classes.find(solidity::Instruction::ADD, { + gas += memoryGas(classes.find(Instruction::ADD, { m_state->relativeStackElement(0), classes.find(AssemblyItem(32)) })); break; case Instruction::MSTORE8: - gas += memoryGas(classes.find(solidity::Instruction::ADD, { + gas += memoryGas(classes.find(Instruction::ADD, { m_state->relativeStackElement(0), classes.find(AssemblyItem(1)) })); @@ -198,7 +198,7 @@ GasMeter::GasConsumption GasMeter::memoryGas(int _stackPosOffset, int _stackPosS if (classes.knownZero(m_state->relativeStackElement(_stackPosSize))) return GasConsumption(0); else - return memoryGas(classes.find(solidity::Instruction::ADD, { + return memoryGas(classes.find(Instruction::ADD, { m_state->relativeStackElement(_stackPosOffset), m_state->relativeStackElement(_stackPosSize) })); diff --git a/libevmasm/PathGasMeter.cpp b/libevmasm/PathGasMeter.cpp index 5988c280..2113008b 100644 --- a/libevmasm/PathGasMeter.cpp +++ b/libevmasm/PathGasMeter.cpp @@ -76,7 +76,7 @@ GasMeter::GasConsumption PathGasMeter::handleQueueItem() bool branchStops = false; jumpTags.clear(); AssemblyItem const& item = m_items.at(index); - if (item.type() == Tag || item == AssemblyItem(solidity::Instruction::JUMPDEST)) + if (item.type() == Tag || item == AssemblyItem(Instruction::JUMPDEST)) { // Do not allow any backwards jump. This is quite restrictive but should work for // the simplest things. @@ -84,14 +84,14 @@ GasMeter::GasConsumption PathGasMeter::handleQueueItem() return GasMeter::GasConsumption::infinite(); path->visitedJumpdests.insert(index); } - else if (item == AssemblyItem(solidity::Instruction::JUMP)) + else if (item == AssemblyItem(Instruction::JUMP)) { branchStops = true; jumpTags = state->tagsInExpression(state->relativeStackElement(0)); if (jumpTags.empty()) // unknown jump destination return GasMeter::GasConsumption::infinite(); } - else if (item == AssemblyItem(solidity::Instruction::JUMPI)) + else if (item == AssemblyItem(Instruction::JUMPI)) { ExpressionClasses::Id condition = state->relativeStackElement(-1); if (classes.knownNonZero(condition) || !classes.knownZero(condition)) diff --git a/libevmasm/SemanticInformation.cpp b/libevmasm/SemanticInformation.cpp index 13d77876..ea579b83 100644 --- a/libevmasm/SemanticInformation.cpp +++ b/libevmasm/SemanticInformation.cpp @@ -147,7 +147,7 @@ bool SemanticInformation::isDeterministic(AssemblyItem const& _item) } } -bool SemanticInformation::invalidatesMemory(solidity::Instruction _instruction) +bool SemanticInformation::invalidatesMemory(Instruction _instruction) { switch (_instruction) { |