cerc-io/solidity
15
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

PoC-7: JUMPDEST implemented.

Browse Source
This commit is contained in:
Gav Wood 2014-10-07 18:43:01 +02:00
parent f61c323244
commit 92d9a107d7
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Assembly.cpp
View File

@ -149,6 +149,17 @@ ostream& dev::eth::operator<<(ostream& _out, AssemblyItemsConstRef _i)
ostream& Assembly::streamOut(ostream& _out, string const& _prefix) const ostream& Assembly::streamOut(ostream& _out, string const& _prefix) const
{ {
_out << _prefix << ".pre:" << endl;
for (AssemblyItem const& i: m_items)
switch (i.m_type)
{
case PushTag:
_out << _prefix << " PUSH [tag" << i.m_data << "]" << endl;
_out << _prefix << " JUMPDEST" << endl;
break;
default:;
}
_out << _prefix << ".code:" << endl; _out << _prefix << ".code:" << endl;
for (AssemblyItem const& i: m_items) for (AssemblyItem const& i: m_items)
switch (i.m_type) switch (i.m_type)
@ -353,9 +364,11 @@ bytes Assembly::assemble() const
ret.reserve(totalBytes); ret.reserve(totalBytes);
vector<unsigned> tagPos(m_usedTags); vector<unsigned> tagPos(m_usedTags);
map<unsigned, unsigned> tagRef; map<unsigned, unsigned> tagRef;
map<unsigned, unsigned> pretagRef;
multimap<h256, unsigned> dataRef; multimap<h256, unsigned> dataRef;
unsigned bytesPerTag = dev::bytesRequired(totalBytes); unsigned bytesPerTag = dev::bytesRequired(totalBytes);
byte tagPush = (byte)Instruction::PUSH1 - 1 + bytesPerTag; byte tagPush = (byte)Instruction::PUSH1 - 1 + bytesPerTag;
bytes preret;
for (auto const& i: m_subs) for (auto const& i: m_subs)
m_data[i.first] = i.second.assemble(); m_data[i.first] = i.second.assemble();
@ -393,6 +406,11 @@ bytes Assembly::assemble() const
ret.push_back(tagPush); ret.push_back(tagPush);
tagRef[ret.size()] = (unsigned)i.m_data; tagRef[ret.size()] = (unsigned)i.m_data;
ret.resize(ret.size() + bytesPerTag); ret.resize(ret.size() + bytesPerTag);
preret.push_back(tagPush);
pretagRef[preret.size()] = (unsigned)i.m_data;
preret.resize(preret.size() + bytesPerTag);
preret.push_back((byte)Instruction::JUMPDEST);
break; break;
} }
case PushData: case PushSub: case PushData: case PushSub:
@ -424,6 +442,12 @@ bytes Assembly::assemble() const
toBigEndian(tagPos[i.second], r); toBigEndian(tagPos[i.second], r);
} }
for (auto const& i: pretagRef)
{
bytesRef r(preret.data() + i.first, bytesPerTag);
toBigEndian(tagPos[i.second], r);
}
if (m_data.size()) if (m_data.size())
{ {
ret.push_back(0); ret.push_back(0);
@ -442,5 +466,5 @@ bytes Assembly::assemble() const
} }
} }
} }
return ret; return preret + ret;
} }