diff options
| author | chriseth <chris@ethereum.org> | 2018-02-14 12:00:41 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-14 12:00:41 +0800 |
| commit | 3155dd8058672ce8f04bc2c0f2536cb549067d0a (patch) | |
| tree | 7ddb56e276c74db30671eb17ffdde5eda027142d /libevmasm/AssemblyItem.cpp | |
| parent | c4cbbb054b5ed3b8ceaa21ee5b47b0704762ff40 (diff) | |
| parent | ef8292c6bb337d3c4b27836da6732b85021d1c5d (diff) | |
| download | dexon-solidity-3155dd8058672ce8f04bc2c0f2536cb549067d0a.tar dexon-solidity-3155dd8058672ce8f04bc2c0f2536cb549067d0a.tar.gz dexon-solidity-3155dd8058672ce8f04bc2c0f2536cb549067d0a.tar.bz2 dexon-solidity-3155dd8058672ce8f04bc2c0f2536cb549067d0a.tar.lz dexon-solidity-3155dd8058672ce8f04bc2c0f2536cb549067d0a.tar.xz dexon-solidity-3155dd8058672ce8f04bc2c0f2536cb549067d0a.tar.zst dexon-solidity-3155dd8058672ce8f04bc2c0f2536cb549067d0a.zip | |
Merge pull request #3503 from ethereum/develop
Merge develop into release for v0.4.20.
Diffstat (limited to 'libevmasm/AssemblyItem.cpp')
| -rw-r--r-- | libevmasm/AssemblyItem.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libevmasm/AssemblyItem.cpp b/libevmasm/AssemblyItem.cpp index 64963021..5af618ff 100644 --- a/libevmasm/AssemblyItem.cpp +++ b/libevmasm/AssemblyItem.cpp @@ -68,6 +68,7 @@ unsigned AssemblyItem::bytesRequired(unsigned _addressLength) const case PushSub: return 1 + _addressLength; case PushLibraryAddress: + case PushDeployTimeAddress: return 1 + 20; default: break; @@ -97,6 +98,7 @@ int AssemblyItem::returnValues() const case PushSubSize: case PushProgramSize: case PushLibraryAddress: + case PushDeployTimeAddress: return 1; case Tag: return 0; @@ -119,6 +121,7 @@ bool AssemblyItem::canBeFunctional() const case PushSubSize: case PushProgramSize: case PushLibraryAddress: + case PushDeployTimeAddress: return true; case Tag: return false; @@ -190,6 +193,9 @@ string AssemblyItem::toAssemblyText() const case PushLibraryAddress: text = string("linkerSymbol(\"") + toHex(data()) + string("\")"); break; + case PushDeployTimeAddress: + text = string("deployTimeAddress()"); + break; case UndefinedItem: assertThrow(false, AssemblyException, "Invalid assembly item."); break; @@ -252,6 +258,9 @@ ostream& dev::eth::operator<<(ostream& _out, AssemblyItem const& _item) _out << " PushLibraryAddress " << hash.substr(0, 8) + "..." + hash.substr(hash.length() - 8); break; } + case PushDeployTimeAddress: + _out << " PushDeployTimeAddress"; + break; case UndefinedItem: _out << " ???"; break; |