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

Refactor updateReference

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-06-23 01:00:14 +01:00
parent 5cf2332d6d
commit 58fca7215c
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libjulia/backends/evm/EVMAssembly.cpp
View File

@ -148,10 +148,8 @@ void EVMAssembly::appendReturnsub(int _returns, int _stackDiffAfter)
eth::LinkerObject EVMAssembly::finalize() eth::LinkerObject EVMAssembly::finalize()
{ {
size_t bytecodeSize = m_bytecode.size(); size_t bytecodeSize = m_bytecode.size();
solAssert(uint64_t(bytecodeSize) < (uint64_t(1) << (8 * assemblySizeReferenceSize)), "Bytecode too big.");
for (auto const& ref: m_assemblySizePositions) for (auto const& ref: m_assemblySizePositions)
for (size_t i = 0; i < assemblySizeReferenceSize; i++) updateReference(ref, assemblySizeReferenceSize, u256(bytecodeSize));
m_bytecode[ref + i] = byte((bytecodeSize >> (8 * (assemblySizeReferenceSize - i - 1))) & 0xff);
for (auto const& ref: m_labelReferences) for (auto const& ref: m_labelReferences)
{ {
@ -159,10 +157,7 @@ eth::LinkerObject EVMAssembly::finalize()
solAssert(m_labelPositions.count(ref.second), ""); solAssert(m_labelPositions.count(ref.second), "");
size_t labelPos = m_labelPositions.at(ref.second); size_t labelPos = m_labelPositions.at(ref.second);
solAssert(labelPos != size_t(-1), "Undefined but allocated label used."); solAssert(labelPos != size_t(-1), "Undefined but allocated label used.");
solAssert(m_bytecode.size() >= 4 && referencePos <= m_bytecode.size() - 4, ""); updateReference(referencePos, labelReferenceSize, u256(labelPos));
solAssert(uint64_t(labelPos) < (uint64_t(1) << (8 * labelReferenceSize)), "");
for (size_t i = 0; i < labelReferenceSize; i++)
m_bytecode[referencePos + i] = byte((labelPos >> (8 * (labelReferenceSize - i - 1))) & 0xff);
} }
eth::LinkerObject obj; eth::LinkerObject obj;
@ -189,3 +184,11 @@ void EVMAssembly::appendAssemblySize()
m_assemblySizePositions.push_back(m_bytecode.size()); m_assemblySizePositions.push_back(m_bytecode.size());
m_bytecode += bytes(assemblySizeReferenceSize); m_bytecode += bytes(assemblySizeReferenceSize);
} }
void EVMAssembly::updateReference(size_t pos, size_t size, u256 value)
{
solAssert(m_bytecode.size() >= size && pos <= m_bytecode.size() - size, "");
solAssert(value < (u256(1) << (8 * size)), "");
for (size_t i = 0; i < size; i++)
m_bytecode[pos + i] = byte((value >> (8 * (size - i - 1))) & 0xff);
}

1
libjulia/backends/evm/EVMAssembly.h
View File

@ -79,6 +79,7 @@ public:
private: private:
void setLabelToCurrentPosition(AbstractAssembly::LabelID _labelId); void setLabelToCurrentPosition(AbstractAssembly::LabelID _labelId);
void appendLabelReferenceInternal(AbstractAssembly::LabelID _labelId); void appendLabelReferenceInternal(AbstractAssembly::LabelID _labelId);
void updateReference(size_t pos, size_t size, u256 value);
bool m_evm15 = false; ///< if true, switch to evm1.5 mode bool m_evm15 = false; ///< if true, switch to evm1.5 mode
LabelID m_nextLabelId = 0; LabelID m_nextLabelId = 0;