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

Fixed counter modification when appending assemblies.

Browse Source
This commit is contained in:
chriseth 2015-06-25 18:41:26 +02:00
parent 66a85f0229
commit 0f06fd8c2f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assembly.cpp
View File

@ -41,7 +41,7 @@ void Assembly::append(Assembly const& _a)
if (i.type() == Tag || i.type() == PushTag) if (i.type() == Tag || i.type() == PushTag)
i.setData(i.data() + m_usedTags); i.setData(i.data() + m_usedTags);
else if (i.type() == PushSub || i.type() == PushSubSize) else if (i.type() == PushSub || i.type() == PushSubSize)
i.setData(i.data() + m_usedTags); i.setData(i.data() + m_subs.size());
append(i); append(i);
} }
m_deposit = newDeposit; m_deposit = newDeposit;
@ -136,10 +136,10 @@ ostream& Assembly::streamAsm(ostream& _out, string const& _prefix, StringMap con
_out << " PUSH [tag" << dec << i.data() << "]"; _out << " PUSH [tag" << dec << i.data() << "]";
break; break;
case PushSub: case PushSub:
_out << " PUSH [$" << h256(i.data()).abridged() << "]"; _out << " PUSH [$" << h256(i.data()).abridgedMiddle() << "]";
break; break;
case PushSubSize: case PushSubSize:
_out << " PUSH #[$" << h256(i.data()).abridged() << "]"; _out << " PUSH #[$" << h256(i.data()).abridgedMiddle() << "]";
break; break;
case PushProgramSize: case PushProgramSize:
_out << " PUSHSIZE"; _out << " PUSHSIZE";

4
AssemblyItem.cpp
View File

@ -110,10 +110,10 @@ ostream& dev::eth::operator<<(ostream& _out, AssemblyItem const& _item)
_out << " PushData " << hex << (unsigned)_item.data(); _out << " PushData " << hex << (unsigned)_item.data();
break; break;
case PushSub: case PushSub:
_out << " PushSub " << hex << h256(_item.data()).abridged(); _out << " PushSub " << hex << h256(_item.data()).abridgedMiddle();
break; break;
case PushSubSize: case PushSubSize:
_out << " PushSubSize " << hex << h256(_item.data()).abridged(); _out << " PushSubSize " << hex << h256(_item.data()).abridgedMiddle();
break; break;
case PushProgramSize: case PushProgramSize:
_out << " PushProgramSize"; _out << " PushProgramSize";