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/GasMeter.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/GasMeter.cpp')
| -rw-r--r-- | libevmasm/GasMeter.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libevmasm/GasMeter.cpp b/libevmasm/GasMeter.cpp index 260b7439..31a7d13e 100644 --- a/libevmasm/GasMeter.cpp +++ b/libevmasm/GasMeter.cpp @@ -103,6 +103,7 @@ GasMeter::GasConsumption GasMeter::estimateMax(AssemblyItem const& _item, bool _ break; case Instruction::CALLDATACOPY: case Instruction::CODECOPY: + case Instruction::RETURNDATACOPY: gas += memoryGas(0, -2); gas += wordGas(GasCosts::copyGas, m_state->relativeStackElement(-2)); break; |