diff options
| author | chriseth <chris@ethereum.org> | 2016-10-14 17:55:19 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-14 17:55:19 +0800 |
| commit | 1f0f60087828dfd74d65fa23c4789635928997ca (patch) | |
| tree | 4c3f9ddabf0133d9efdcfe0cf6172a5edf62c234 /docs | |
| parent | 1584c5992e05a4eb0b7a9335edd4e7b3e272c29b (diff) | |
| parent | 550c92cb2f1cb40989efdc53bac60852aa7249de (diff) | |
| download | dexon-solidity-1f0f60087828dfd74d65fa23c4789635928997ca.tar.gz dexon-solidity-1f0f60087828dfd74d65fa23c4789635928997ca.tar.zst dexon-solidity-1f0f60087828dfd74d65fa23c4789635928997ca.zip | |
Merge pull request #1217 from ethereum/instruction_table
Small points on the instruction table
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/control-structures.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/control-structures.rst b/docs/control-structures.rst index 6cbbcdf8..c754de64 100644 --- a/docs/control-structures.rst +++ b/docs/control-structures.rst @@ -505,7 +505,7 @@ The opcodes ``pushi`` and ``jumpdest`` cannot be used directly. +-------------------------+------+-----------------------------------------------------------------+ | pc | | current position in code | +-------------------------+------+-----------------------------------------------------------------+ -| pop | `*` | remove topmost stack slot | +| pop(x) | `-` | remove the element pushed by x | +-------------------------+------+-----------------------------------------------------------------+ | dup1 ... dup16 | | copy ith stack slot to the top (counting from top) | +-------------------------+------+-----------------------------------------------------------------+ @@ -561,9 +561,9 @@ The opcodes ``pushi`` and ``jumpdest`` cannot be used directly. | delegatecall(g, a, in, | | identical to `callcode` but also keep ``caller`` | | insize, out, outsize) | | and ``callvalue`` | +-------------------------+------+-----------------------------------------------------------------+ -| return(p, s) | `*` | end execution, return data mem[p..(p+s)) | +| return(p, s) | `-` | end execution, return data mem[p..(p+s)) | +-------------------------+------+-----------------------------------------------------------------+ -| selfdestruct(a) | `*` | end execution, destroy current contract and send funds to a | +| selfdestruct(a) | `-` | end execution, destroy current contract and send funds to a | +-------------------------+------+-----------------------------------------------------------------+ | log0(p, s) | `-` | log without topics and data mem[p..(p+s)) | +-------------------------+------+-----------------------------------------------------------------+ |