cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dumb implementation of EOF1 support in libevasm

Browse Source
This commit is contained in:
Alex Beregszaszi 2021-04-23 18:40:59 +01:00 committed by Rodrigo Q. Saramago
parent 591df04211
commit ada477e7bd
No known key found for this signature in database
GPG Key ID: 9B36B2525704A359
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libevmasm/Assembly.cpp
View File

@ -539,7 +539,7 @@ LinkerObject const& Assembly::assemble() const
unsigned bytesPerTag = numberEncodingSize(bytesRequiredForCode);
uint8_t tagPush = static_cast<uint8_t>(pushInstruction(bytesPerTag));
unsigned bytesRequiredIncludingData = bytesRequiredForCode + 1 + static_cast<unsigned>(m_auxiliaryData.size());
unsigned bytesRequiredIncludingData = /*eof1*/10 + bytesRequiredForCode + 1 + static_cast<unsigned>(m_auxiliaryData.size());
for (auto const& sub: m_subs)
bytesRequiredIncludingData += static_cast<unsigned>(sub->assemble().bytecode.size());
@ -547,6 +547,20 @@ LinkerObject const& Assembly::assemble() const
uint8_t dataRefPush = static_cast<uint8_t>(pushInstruction(bytesPerDataRef));
ret.bytecode.reserve(bytesRequiredIncludingData);
// Insert EOF1 header.
ret.bytecode.push_back(0xef);
ret.bytecode.push_back(0x00);
ret.bytecode.push_back(0x01); // version 1
ret.bytecode.push_back(0x01); // kind=code
auto eofCodeLength = ret.bytecode.size();
ret.bytecode.push_back(0x00); // length of code
ret.bytecode.push_back(0x00);
ret.bytecode.push_back(0x02); // kind=data
auto eofDataLength = ret.bytecode.size();
ret.bytecode.push_back(0x00); // length of data
ret.bytecode.push_back(0x00);
ret.bytecode.push_back(0x00); // terminator
for (AssemblyItem const& i: m_items)
{
// store position of the invalid jump destination
@ -679,6 +693,14 @@ LinkerObject const& Assembly::assemble() const
// Append an INVALID here to help tests find miscompilation.
ret.bytecode.push_back(static_cast<uint8_t>(Instruction::INVALID));
auto const dataStart = ret.bytecode.size();
auto const codeLength = dataStart - /*eof1*/10;
ret.bytecode[eofCodeLength] = (codeLength >> 8) & 0xff;
ret.bytecode[eofCodeLength + 1] = codeLength & 0xff;
//-- Data section --
for (auto const& [subIdPath, bytecodeOffset]: subRef)
{
bytesRef r(ret.bytecode.data() + bytecodeOffset, bytesPerDataRef);
@ -742,6 +764,12 @@ LinkerObject const& Assembly::assemble() const
bytesRef r(ret.bytecode.data() + pos, bytesPerDataRef);
toBigEndian(ret.bytecode.size(), r);
}
auto const dataLength = ret.bytecode.size() - dataStart;
ret.bytecode[eofDataLength] = (dataLength >> 8) & 0xff;
ret.bytecode[eofDataLength + 1] = dataLength & 0xff;
return ret;
}