diff options
| author | chriseth <chris@ethereum.org> | 2017-02-07 18:13:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-07 18:13:45 +0800 |
| commit | 277415be30588e9694552c43bdbc70cc93aab94a (patch) | |
| tree | ae9b0621382a22141f2be4f839bdbd36f2a5a7db /libevmasm/Instruction.cpp | |
| parent | 48f0da16b7cf820b276b97bbc41bf5daef201de5 (diff) | |
| parent | 02a840f92474bfaded14a4412902b6ea35132f95 (diff) | |
| download | dexon-solidity-277415be30588e9694552c43bdbc70cc93aab94a.tar dexon-solidity-277415be30588e9694552c43bdbc70cc93aab94a.tar.gz dexon-solidity-277415be30588e9694552c43bdbc70cc93aab94a.tar.bz2 dexon-solidity-277415be30588e9694552c43bdbc70cc93aab94a.tar.lz dexon-solidity-277415be30588e9694552c43bdbc70cc93aab94a.tar.xz dexon-solidity-277415be30588e9694552c43bdbc70cc93aab94a.tar.zst dexon-solidity-277415be30588e9694552c43bdbc70cc93aab94a.zip | |
Merge pull request #1660 from ethereum/asm-selfdestruct
Rename SUICIDE opcode to SELFDESTRUCT in libevmasm
Diffstat (limited to 'libevmasm/Instruction.cpp')
| -rw-r--r-- | libevmasm/Instruction.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp index b0f063da..f9ee9be1 100644 --- a/libevmasm/Instruction.cpp +++ b/libevmasm/Instruction.cpp @@ -160,7 +160,7 @@ const std::map<std::string, Instruction> dev::solidity::c_instructions = { "RETURN", Instruction::RETURN }, { "DELEGATECALL", Instruction::DELEGATECALL }, { "INVALID", Instruction::INVALID }, - { "SUICIDE", Instruction::SUICIDE } + { "SELFDESTRUCT", Instruction::SELFDESTRUCT } }; static const std::map<Instruction, InstructionInfo> c_instructionInfo = @@ -293,9 +293,9 @@ static const std::map<Instruction, InstructionInfo> c_instructionInfo = { Instruction::CALL, { "CALL", 0, 7, 1, true, Tier::Special } }, { Instruction::CALLCODE, { "CALLCODE", 0, 7, 1, true, Tier::Special } }, { Instruction::RETURN, { "RETURN", 0, 2, 0, true, Tier::Zero } }, - { Instruction::DELEGATECALL,{ "DELEGATECALL", 0, 6, 1, true, Tier::Special } }, + { Instruction::DELEGATECALL, { "DELEGATECALL", 0, 6, 1, true, Tier::Special } }, { Instruction::INVALID, { "INVALID", 0, 0, 0, true, Tier::Zero } }, - { Instruction::SUICIDE, { "SUICIDE", 0, 1, 0, true, Tier::Zero } } + { Instruction::SELFDESTRUCT, { "SELFDESTRUCT", 0, 1, 0, true, Tier::Zero } } }; void dev::solidity::eachInstruction( |