diff options
| author | chriseth <chris@ethereum.org> | 2016-12-02 18:23:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-02 18:23:45 +0800 |
| commit | 3a01a87afe3468421f31aa5097796dcc88e37e26 (patch) | |
| tree | 9069fcc823ca4b27b6add0c7278f1086923eb36e /libevmasm/Assembly.cpp | |
| parent | 55a719a79c1ab5b78ea6e1bcb4f27a888494a538 (diff) | |
| parent | 5098e1eb15678859d1bd5e9172184d6525e03863 (diff) | |
| download | dexon-solidity-3a01a87afe3468421f31aa5097796dcc88e37e26.tar dexon-solidity-3a01a87afe3468421f31aa5097796dcc88e37e26.tar.gz dexon-solidity-3a01a87afe3468421f31aa5097796dcc88e37e26.tar.bz2 dexon-solidity-3a01a87afe3468421f31aa5097796dcc88e37e26.tar.lz dexon-solidity-3a01a87afe3468421f31aa5097796dcc88e37e26.tar.xz dexon-solidity-3a01a87afe3468421f31aa5097796dcc88e37e26.tar.zst dexon-solidity-3a01a87afe3468421f31aa5097796dcc88e37e26.zip | |
Merge pull request #1386 from ethereum/metadataOut
Metadata stamp
Diffstat (limited to 'libevmasm/Assembly.cpp')
| -rw-r--r-- | libevmasm/Assembly.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp index b040917d..a9ca24dc 100644 --- a/libevmasm/Assembly.cpp +++ b/libevmasm/Assembly.cpp @@ -432,7 +432,7 @@ LinkerObject const& Assembly::assemble() const unsigned bytesPerTag = dev::bytesRequired(bytesRequiredForCode); byte tagPush = (byte)Instruction::PUSH1 - 1 + bytesPerTag; - unsigned bytesRequiredIncludingData = bytesRequiredForCode + 1; + unsigned bytesRequiredIncludingData = bytesRequiredForCode + 1 + m_auxiliaryData.size(); for (auto const& sub: m_subs) bytesRequiredIncludingData += sub->assemble().bytecode.size(); @@ -525,8 +525,10 @@ LinkerObject const& Assembly::assemble() const } } - if (!dataRef.empty() && !subRef.empty()) + if (!m_subs.empty() || !m_data.empty() || !m_auxiliaryData.empty()) + // Append a STOP just to be sure. ret.bytecode.push_back(0); + for (size_t i = 0; i < m_subs.size(); ++i) { auto references = subRef.equal_range(i); @@ -568,6 +570,9 @@ LinkerObject const& Assembly::assemble() const } ret.bytecode += dataItem.second; } + + ret.bytecode += m_auxiliaryData; + for (unsigned pos: sizeRef) { bytesRef r(ret.bytecode.data() + pos, bytesPerDataRef); |