diff options
| author | Dimitry <winsvega@mail.ru> | 2016-04-02 20:56:43 +0800 |
|---|---|---|
| committer | Dimitry <winsvega@mail.ru> | 2016-04-02 20:56:43 +0800 |
| commit | 858c41260d4cec26ba38ea3bd2ef71dcede63f7c (patch) | |
| tree | 8dd03312a5f926f8dd95a4a7f0798c2b6624c1e3 /libevmasm/PathGasMeter.cpp | |
| parent | ccbd3ff63feb696025c18211c3c93bab47f755b0 (diff) | |
| download | dexon-solidity-858c41260d4cec26ba38ea3bd2ef71dcede63f7c.tar dexon-solidity-858c41260d4cec26ba38ea3bd2ef71dcede63f7c.tar.gz dexon-solidity-858c41260d4cec26ba38ea3bd2ef71dcede63f7c.tar.bz2 dexon-solidity-858c41260d4cec26ba38ea3bd2ef71dcede63f7c.tar.lz dexon-solidity-858c41260d4cec26ba38ea3bd2ef71dcede63f7c.tar.xz dexon-solidity-858c41260d4cec26ba38ea3bd2ef71dcede63f7c.tar.zst dexon-solidity-858c41260d4cec26ba38ea3bd2ef71dcede63f7c.zip | |
rename namespace for instruction.h/cpp in libevmasm
Diffstat (limited to 'libevmasm/PathGasMeter.cpp')
| -rw-r--r-- | libevmasm/PathGasMeter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libevmasm/PathGasMeter.cpp b/libevmasm/PathGasMeter.cpp index 8f7314f8..5988c280 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(eth::Instruction::JUMPDEST)) + if (item.type() == Tag || item == AssemblyItem(solidity::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(eth::Instruction::JUMP)) + else if (item == AssemblyItem(solidity::Instruction::JUMP)) { branchStops = true; jumpTags = state->tagsInExpression(state->relativeStackElement(0)); if (jumpTags.empty()) // unknown jump destination return GasMeter::GasConsumption::infinite(); } - else if (item == AssemblyItem(eth::Instruction::JUMPI)) + else if (item == AssemblyItem(solidity::Instruction::JUMPI)) { ExpressionClasses::Id condition = state->relativeStackElement(-1); if (classes.knownNonZero(condition) || !classes.knownZero(condition)) |