diff options
| author | chriseth <chris@ethereum.org> | 2017-03-16 01:07:52 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-16 01:07:52 +0800 |
| commit | f0d539ae05739e35336cc9cc8f44bd9798a95c28 (patch) | |
| tree | 13ef1dea012c7f093122d5e7578dc3c893636e59 /libevmasm/Instruction.cpp | |
| parent | 364da425d3116a4b85863df39a1864340861d71e (diff) | |
| parent | 59099908c53129b2f5723bd0d5283c4da089e398 (diff) | |
| download | dexon-solidity-f0d539ae05739e35336cc9cc8f44bd9798a95c28.tar dexon-solidity-f0d539ae05739e35336cc9cc8f44bd9798a95c28.tar.gz dexon-solidity-f0d539ae05739e35336cc9cc8f44bd9798a95c28.tar.bz2 dexon-solidity-f0d539ae05739e35336cc9cc8f44bd9798a95c28.tar.lz dexon-solidity-f0d539ae05739e35336cc9cc8f44bd9798a95c28.tar.xz dexon-solidity-f0d539ae05739e35336cc9cc8f44bd9798a95c28.tar.zst dexon-solidity-f0d539ae05739e35336cc9cc8f44bd9798a95c28.zip | |
Merge pull request #1782 from ethereum/develop
Solidity 0.4.10
Diffstat (limited to 'libevmasm/Instruction.cpp')
| -rw-r--r-- | libevmasm/Instruction.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp index b0f063da..de6630f3 100644 --- a/libevmasm/Instruction.cpp +++ b/libevmasm/Instruction.cpp @@ -159,8 +159,9 @@ const std::map<std::string, Instruction> dev::solidity::c_instructions = { "CALLCODE", Instruction::CALLCODE }, { "RETURN", Instruction::RETURN }, { "DELEGATECALL", Instruction::DELEGATECALL }, + { "REVERT", Instruction::REVERT }, { "INVALID", Instruction::INVALID }, - { "SUICIDE", Instruction::SUICIDE } + { "SELFDESTRUCT", Instruction::SELFDESTRUCT } }; static const std::map<Instruction, InstructionInfo> c_instructionInfo = @@ -293,9 +294,10 @@ 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::REVERT, { "REVERT", 0, 2, 0, true, Tier::Zero } }, { 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( |