diff options
author | chriseth <chris@ethereum.org> | 2017-06-13 23:41:52 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-13 23:41:52 +0800 |
commit | 6b052249dac2bce9d3a87f21cbde3a6429428fc0 (patch) | |
tree | d114e3c9fddb70aee8bfe7855bcb56d7b41b3c36 /libevmasm/Instruction.cpp | |
parent | 40f5690f68961130073028526f8b923ed0793c8a (diff) | |
parent | 8775e77305f84117827f1e6165c4d3776c51f667 (diff) | |
download | dexon-solidity-6b052249dac2bce9d3a87f21cbde3a6429428fc0.tar dexon-solidity-6b052249dac2bce9d3a87f21cbde3a6429428fc0.tar.gz dexon-solidity-6b052249dac2bce9d3a87f21cbde3a6429428fc0.tar.bz2 dexon-solidity-6b052249dac2bce9d3a87f21cbde3a6429428fc0.tar.lz dexon-solidity-6b052249dac2bce9d3a87f21cbde3a6429428fc0.tar.xz dexon-solidity-6b052249dac2bce9d3a87f21cbde3a6429428fc0.tar.zst dexon-solidity-6b052249dac2bce9d3a87f21cbde3a6429428fc0.zip |
Merge pull request #2275 from ethereum/returndata_lll
Add RETURNDATACOPY and RETURNDATASIZE to assembly (and LLL)
Diffstat (limited to 'libevmasm/Instruction.cpp')
-rw-r--r-- | libevmasm/Instruction.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp index 25eab60b..af7e9ff9 100644 --- a/libevmasm/Instruction.cpp +++ b/libevmasm/Instruction.cpp @@ -67,6 +67,8 @@ const std::map<std::string, Instruction> dev::solidity::c_instructions = { "GASPRICE", Instruction::GASPRICE }, { "EXTCODESIZE", Instruction::EXTCODESIZE }, { "EXTCODECOPY", Instruction::EXTCODECOPY }, + { "RETURNDATASIZE", Instruction::RETURNDATASIZE }, + { "RETURNDATACOPY", Instruction::RETURNDATACOPY }, { "BLOCKHASH", Instruction::BLOCKHASH }, { "COINBASE", Instruction::COINBASE }, { "TIMESTAMP", Instruction::TIMESTAMP }, @@ -203,6 +205,8 @@ static const std::map<Instruction, InstructionInfo> c_instructionInfo = { Instruction::GASPRICE, { "GASPRICE", 0, 0, 1, false, Tier::Base } }, { Instruction::EXTCODESIZE, { "EXTCODESIZE", 0, 1, 1, false, Tier::ExtCode } }, { Instruction::EXTCODECOPY, { "EXTCODECOPY", 0, 4, 0, true, Tier::ExtCode } }, + { Instruction::RETURNDATASIZE, {"RETURNDATASIZE", 0, 0, 1, false, Tier::Base } }, + { Instruction::RETURNDATACOPY, {"RETURNDATACOPY", 0, 3, 0, true, Tier::VeryLow } }, { Instruction::BLOCKHASH, { "BLOCKHASH", 0, 1, 1, false, Tier::Ext } }, { Instruction::COINBASE, { "COINBASE", 0, 0, 1, false, Tier::Base } }, { Instruction::TIMESTAMP, { "TIMESTAMP", 0, 0, 1, false, Tier::Base } }, |