diff options
author | chriseth <chris@ethereum.org> | 2017-02-13 21:56:22 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-13 21:56:22 +0800 |
commit | 0d8a9c328910bc9a0ab18beb273c029dc9a05b15 (patch) | |
tree | 388b2cc84825e30c0753e480be1d6bb0bbc4db03 /libevmasm/Instruction.cpp | |
parent | e2349f9d5db80e57558ddaf7564ea57cf3b216d8 (diff) | |
parent | c8ec79548b8f8825735ee96f1768e7fc5313d19e (diff) | |
download | dexon-solidity-0d8a9c328910bc9a0ab18beb273c029dc9a05b15.tar.gz dexon-solidity-0d8a9c328910bc9a0ab18beb273c029dc9a05b15.tar.zst dexon-solidity-0d8a9c328910bc9a0ab18beb273c029dc9a05b15.zip |
Merge pull request #1661 from ethereum/asm-revert
Implement REVERT (EIP140)
Diffstat (limited to 'libevmasm/Instruction.cpp')
-rw-r--r-- | libevmasm/Instruction.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp index f9ee9be1..de6630f3 100644 --- a/libevmasm/Instruction.cpp +++ b/libevmasm/Instruction.cpp @@ -159,6 +159,7 @@ 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 }, { "SELFDESTRUCT", Instruction::SELFDESTRUCT } }; @@ -294,6 +295,7 @@ static const std::map<Instruction, InstructionInfo> c_instructionInfo = { 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::REVERT, { "REVERT", 0, 2, 0, true, Tier::Zero } }, { Instruction::INVALID, { "INVALID", 0, 0, 0, true, Tier::Zero } }, { Instruction::SELFDESTRUCT, { "SELFDESTRUCT", 0, 1, 0, true, Tier::Zero } } }; |