diff options
| author | Yoichi Hirai <i@yoichihirai.com> | 2017-04-19 00:11:25 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-19 00:11:25 +0800 |
| commit | 3cacea74c9589b70fffd0ec620c21043742ceb26 (patch) | |
| tree | 87fa14312d1209d97c375228c7c5d05148aa5faf /libevmasm/Assembly.cpp | |
| parent | 937397ed9c9f65007fd5c7f4da2e360e74463a5e (diff) | |
| parent | 8ebea783f4b32c6ff4bb3771a28127676aeb9bad (diff) | |
| download | dexon-solidity-3cacea74c9589b70fffd0ec620c21043742ceb26.tar dexon-solidity-3cacea74c9589b70fffd0ec620c21043742ceb26.tar.gz dexon-solidity-3cacea74c9589b70fffd0ec620c21043742ceb26.tar.bz2 dexon-solidity-3cacea74c9589b70fffd0ec620c21043742ceb26.tar.lz dexon-solidity-3cacea74c9589b70fffd0ec620c21043742ceb26.tar.xz dexon-solidity-3cacea74c9589b70fffd0ec620c21043742ceb26.tar.zst dexon-solidity-3cacea74c9589b70fffd0ec620c21043742ceb26.zip | |
Merge pull request #2117 from ethereum/implementAsmOut
Implement missing assembly output functions and do not use PushString for assembly.
Diffstat (limited to 'libevmasm/Assembly.cpp')
| -rw-r--r-- | libevmasm/Assembly.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp index f12e8aa8..ea061a30 100644 --- a/libevmasm/Assembly.cpp +++ b/libevmasm/Assembly.cpp @@ -205,7 +205,8 @@ ostream& Assembly::streamAsm(ostream& _out, string const& _prefix, StringMap con { _out << _prefix << "stop" << endl; for (auto const& i: m_data) - assertThrow(u256(i.first) < m_subs.size(), AssemblyException, "Data not yet implemented."); + if (u256(i.first) >= m_subs.size()) + _out << _prefix << "data_" << toHex(u256(i.first)) << " " << toHex(i.second) << endl; for (size_t i = 0; i < m_subs.size(); ++i) { |