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/GasMeter.cpp | |
| parent | ccbd3ff63feb696025c18211c3c93bab47f755b0 (diff) | |
| download | dexon-solidity-858c41260d4cec26ba38ea3bd2ef71dcede63f7c.tar.gz dexon-solidity-858c41260d4cec26ba38ea3bd2ef71dcede63f7c.tar.zst dexon-solidity-858c41260d4cec26ba38ea3bd2ef71dcede63f7c.zip | |
rename namespace for instruction.h/cpp in libevmasm
Diffstat (limited to 'libevmasm/GasMeter.cpp')
| -rw-r--r-- | libevmasm/GasMeter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libevmasm/GasMeter.cpp b/libevmasm/GasMeter.cpp index 93583169..d57fc351 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(eth::Instruction::ADD, { + gas += memoryGas(classes.find(solidity::Instruction::ADD, { m_state->relativeStackElement(0), classes.find(AssemblyItem(32)) })); break; case Instruction::MSTORE8: - gas += memoryGas(classes.find(eth::Instruction::ADD, { + gas += memoryGas(classes.find(solidity::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(eth::Instruction::ADD, { + return memoryGas(classes.find(solidity::Instruction::ADD, { m_state->relativeStackElement(_stackPosOffset), m_state->relativeStackElement(_stackPosSize) })); @@ -209,7 +209,7 @@ u256 GasMeter::runGas(Instruction _instruction, EVMSchedule const& _es) if (_instruction == Instruction::JUMPDEST) return 1; - int tier = instructionInfo(_instruction).gasPriceTier; + int tier = getInstructionInfo(_instruction).gasPriceTier; assertThrow(tier != InvalidTier, OptimizerException, "Invalid gas tier."); return _es.tierStepGas[tier]; } |