diff options
| author | chriseth <chris@ethereum.org> | 2017-06-15 14:39:11 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-15 14:39:11 +0800 |
| commit | 71fea1e370dfb2d9cb812bcd40b2f8a63ed1d5e0 (patch) | |
| tree | 7da1d2982ae3343ae8842bbf32b3aeaea99c8018 /libevmasm | |
| parent | 42b61171d981ceccd5f79af5508db92b4f2ad54b (diff) | |
| parent | 66881bd675ad483ae0bba813c79257fbc30ee941 (diff) | |
| download | dexon-solidity-71fea1e370dfb2d9cb812bcd40b2f8a63ed1d5e0.tar dexon-solidity-71fea1e370dfb2d9cb812bcd40b2f8a63ed1d5e0.tar.gz dexon-solidity-71fea1e370dfb2d9cb812bcd40b2f8a63ed1d5e0.tar.bz2 dexon-solidity-71fea1e370dfb2d9cb812bcd40b2f8a63ed1d5e0.tar.lz dexon-solidity-71fea1e370dfb2d9cb812bcd40b2f8a63ed1d5e0.tar.xz dexon-solidity-71fea1e370dfb2d9cb812bcd40b2f8a63ed1d5e0.tar.zst dexon-solidity-71fea1e370dfb2d9cb812bcd40b2f8a63ed1d5e0.zip | |
Merge pull request #2396 from ethereum/asm-aux
Display auxiliary data in assembly
Diffstat (limited to 'libevmasm')
| -rw-r--r-- | libevmasm/Assembly.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp index ea061a30..f2a292b0 100644 --- a/libevmasm/Assembly.cpp +++ b/libevmasm/Assembly.cpp @@ -216,6 +216,9 @@ ostream& Assembly::streamAsm(ostream& _out, string const& _prefix, StringMap con } } + if (m_auxiliaryData.size() > 0) + _out << endl << _prefix << "auxdata: 0x" << toHex(m_auxiliaryData) << endl; + return _out; } @@ -315,8 +318,13 @@ Json::Value Assembly::streamAsmJson(ostream& _out, StringMap const& _sourceCodes data[hexStr.str()] = m_subs[i]->stream(_out, "", _sourceCodes, true); } root[".data"] = data; - _out << root; } + + if (m_auxiliaryData.size() > 0) + root[".auxdata"] = toHex(m_auxiliaryData); + + _out << root; + return root; } |