diff options
| author | debris <marek.kotewicz@gmail.com> | 2015-09-08 23:11:02 +0800 |
|---|---|---|
| committer | debris <marek.kotewicz@gmail.com> | 2015-09-08 23:11:02 +0800 |
| commit | 3ca3fb492d2f710f45d690db85089036bfc77b68 (patch) | |
| tree | a2a8a869585c22dcba9d5707c3d5d4bdfb722a77 /KnownState.cpp | |
| parent | aea7e04bf4fab1c3f1fc9592c03f6b8a34c41be2 (diff) | |
| download | dexon-solidity-3ca3fb492d2f710f45d690db85089036bfc77b68.tar dexon-solidity-3ca3fb492d2f710f45d690db85089036bfc77b68.tar.gz dexon-solidity-3ca3fb492d2f710f45d690db85089036bfc77b68.tar.bz2 dexon-solidity-3ca3fb492d2f710f45d690db85089036bfc77b68.tar.lz dexon-solidity-3ca3fb492d2f710f45d690db85089036bfc77b68.tar.xz dexon-solidity-3ca3fb492d2f710f45d690db85089036bfc77b68.tar.zst dexon-solidity-3ca3fb492d2f710f45d690db85089036bfc77b68.zip | |
applied changes from https://github.com/ethereum/cpp-ethereum/pull/2953
Diffstat (limited to 'KnownState.cpp')
| -rw-r--r-- | KnownState.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/KnownState.cpp b/KnownState.cpp index d62dbf17..55e860e2 100644 --- a/KnownState.cpp +++ b/KnownState.cpp @@ -107,39 +107,39 @@ KnownState::StoreOperation KnownState::feedItem(AssemblyItem const& _item, bool m_stackHeight + 1, stackElement( m_stackHeight - int(instruction) + int(Instruction::DUP1), - _item.getLocation() + _item.location() ) ); else if (SemanticInformation::isSwapInstruction(_item)) swapStackElements( m_stackHeight, m_stackHeight - 1 - int(instruction) + int(Instruction::SWAP1), - _item.getLocation() + _item.location() ); else if (instruction != Instruction::POP) { vector<Id> arguments(info.args); for (int i = 0; i < info.args; ++i) - arguments[i] = stackElement(m_stackHeight - i, _item.getLocation()); + arguments[i] = stackElement(m_stackHeight - i, _item.location()); if (_item.instruction() == Instruction::SSTORE) - op = storeInStorage(arguments[0], arguments[1], _item.getLocation()); + op = storeInStorage(arguments[0], arguments[1], _item.location()); else if (_item.instruction() == Instruction::SLOAD) setStackElement( m_stackHeight + _item.deposit(), - loadFromStorage(arguments[0], _item.getLocation()) + loadFromStorage(arguments[0], _item.location()) ); else if (_item.instruction() == Instruction::MSTORE) - op = storeInMemory(arguments[0], arguments[1], _item.getLocation()); + op = storeInMemory(arguments[0], arguments[1], _item.location()); else if (_item.instruction() == Instruction::MLOAD) setStackElement( m_stackHeight + _item.deposit(), - loadFromMemory(arguments[0], _item.getLocation()) + loadFromMemory(arguments[0], _item.location()) ); else if (_item.instruction() == Instruction::SHA3) setStackElement( m_stackHeight + _item.deposit(), - applySha3(arguments.at(0), arguments.at(1), _item.getLocation()) + applySha3(arguments.at(0), arguments.at(1), _item.location()) ); else { |