From 4d715e9055f4c7ba7ef86a540dc2e3fbe0fca3a0 Mon Sep 17 00:00:00 2001 From: chriseth Date: Tue, 11 Apr 2017 19:53:55 +0200 Subject: Implement missing assembly output functions and do not use PushString for assembly. --- libevmasm/AssemblyItem.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'libevmasm/AssemblyItem.cpp') diff --git a/libevmasm/AssemblyItem.cpp b/libevmasm/AssemblyItem.cpp index 26d9fded..55130f28 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; + size_t tag; + 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())) + ")"; -- cgit From 8ebea783f4b32c6ff4bb3771a28127676aeb9bad Mon Sep 17 00:00:00 2001 From: chriseth Date: Wed, 12 Apr 2017 16:30:27 +0200 Subject: Initialize local variables. --- libevmasm/AssemblyItem.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libevmasm/AssemblyItem.cpp') diff --git a/libevmasm/AssemblyItem.cpp b/libevmasm/AssemblyItem.cpp index 55130f28..e69b5932 100644 --- a/libevmasm/AssemblyItem.cpp +++ b/libevmasm/AssemblyItem.cpp @@ -163,8 +163,8 @@ string AssemblyItem::toAssemblyText() const break; case PushTag: { - size_t sub; - size_t tag; + size_t sub{0}; + size_t tag{0}; tie(sub, tag) = splitForeignPushTag(); if (sub == size_t(-1)) text = string("tag_") + to_string(tag); -- cgit