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 | |
| parent | 937397ed9c9f65007fd5c7f4da2e360e74463a5e (diff) | |
| parent | 8ebea783f4b32c6ff4bb3771a28127676aeb9bad (diff) | |
| download | dexon-solidity-3cacea74c9589b70fffd0ec620c21043742ceb26.tar.gz 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.
| -rw-r--r-- | Changelog.md | 1 | ||||
| -rw-r--r-- | libevmasm/Assembly.cpp | 3 | ||||
| -rw-r--r-- | libevmasm/AssemblyItem.cpp | 17 | ||||
| -rw-r--r-- | libsolidity/inlineasm/AsmCodeGen.cpp | 2 |
4 files changed, 16 insertions, 7 deletions
diff --git a/Changelog.md b/Changelog.md index 5c991032..7142655b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ Features: Bugfixes: * Type system: Contract inheriting from base with unimplemented constructor should be abstract. + * Assembly output: Implement missing AssemblyItem types. ### 0.4.10 (2017-03-15) 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) { diff --git a/libevmasm/AssemblyItem.cpp b/libevmasm/AssemblyItem.cpp index 26d9fded..e69b5932 100644 --- a/libevmasm/AssemblyItem.cpp +++ b/libevmasm/AssemblyItem.cpp @@ -159,18 +159,25 @@ string AssemblyItem::toAssemblyText() const text = toHex(toCompactBigEndian(data(), 1), 1, HexPrefix::Add); break; case PushString: - assertThrow(false, AssemblyException, "Push string assembly output not implemented."); + text = string("data_") + toHex(data()); break; case PushTag: - assertThrow(data() < 0x10000, AssemblyException, "Sub-assembly tags not yet implemented."); - text = string("tag_") + to_string(size_t(data())); + { + size_t sub{0}; + size_t tag{0}; + tie(sub, tag) = splitForeignPushTag(); + if (sub == size_t(-1)) + text = string("tag_") + to_string(tag); + else + text = string("tag_") + to_string(sub) + "_" + to_string(tag); break; + } case Tag: - assertThrow(data() < 0x10000, AssemblyException, "Sub-assembly tags not yet implemented."); + assertThrow(data() < 0x10000, AssemblyException, "Declaration of sub-assembly tag."); text = string("tag_") + to_string(size_t(data())) + ":"; break; case PushData: - assertThrow(false, AssemblyException, "Push data not implemented."); + text = string("data_") + toHex(data()); break; case PushSub: text = string("dataOffset(sub_") + to_string(size_t(data())) + ")"; diff --git a/libsolidity/inlineasm/AsmCodeGen.cpp b/libsolidity/inlineasm/AsmCodeGen.cpp index 78a9ee27..fdfd9abe 100644 --- a/libsolidity/inlineasm/AsmCodeGen.cpp +++ b/libsolidity/inlineasm/AsmCodeGen.cpp @@ -130,7 +130,7 @@ public: else { solAssert(_literal.value.size() <= 32, ""); - m_state.assembly.append(_literal.value); + m_state.assembly.append(u256(h256(_literal.value, h256::FromBinary, h256::AlignLeft))); } } void operator()(assembly::Identifier const& _identifier) |