aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2017-01-30 21:18:16 +0800
committerGitHub <noreply@github.com>2017-01-30 21:18:16 +0800
commitedd3696dc1efa87bd0f62e02637874e1a0f43dad (patch)
tree5ce364bcff797079e9d27a265066ce11e3978f65 /docs
parentb2c35fb41a65dc996189b890f292103d9318b53e (diff)
parenteb530aa217387092a84057b550c7665a4acf72b6 (diff)
downloaddexon-solidity-edd3696dc1efa87bd0f62e02637874e1a0f43dad.tar
dexon-solidity-edd3696dc1efa87bd0f62e02637874e1a0f43dad.tar.gz
dexon-solidity-edd3696dc1efa87bd0f62e02637874e1a0f43dad.tar.bz2
dexon-solidity-edd3696dc1efa87bd0f62e02637874e1a0f43dad.tar.lz
dexon-solidity-edd3696dc1efa87bd0f62e02637874e1a0f43dad.tar.xz
dexon-solidity-edd3696dc1efa87bd0f62e02637874e1a0f43dad.tar.zst
dexon-solidity-edd3696dc1efa87bd0f62e02637874e1a0f43dad.zip
Merge pull request #1619 from ethereum/changelog
Mention in changelog that invalid as an opcode is valid inline assembly
Diffstat (limited to 'docs')
-rw-r--r--docs/control-structures.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/control-structures.rst b/docs/control-structures.rst
index ff9b245a..c83d654e 100644
--- a/docs/control-structures.rst
+++ b/docs/control-structures.rst
@@ -632,6 +632,8 @@ The opcodes ``pushi`` and ``jumpdest`` cannot be used directly.
+-------------------------+------+-----------------------------------------------------------------+
| selfdestruct(a) | `-` | end execution, destroy current contract and send funds to a |
+-------------------------+------+-----------------------------------------------------------------+
+| invalid | `-` | end execution with invalid instruction |
++-------------------------+------+-----------------------------------------------------------------+
| log0(p, s) | `-` | log without topics and data mem[p..(p+s)) |
+-------------------------+------+-----------------------------------------------------------------+
| log1(p, s, t1) | `-` | log with topic t1 and data mem[p..(p+s)) |