diff options
author | chriseth <chris@ethereum.org> | 2018-12-19 02:50:46 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-19 02:50:46 +0800 |
commit | eed46f001132d6052c6afe16e6dfb16967571167 (patch) | |
tree | 0be6eb35967f93c3397db73d8279b0cc1e12e70d | |
parent | 20189c3f3bb553096b0eb8a783d80d04ba6d49e9 (diff) | |
parent | e9944206a5ee1b7d4f4230c3618df539dbc69438 (diff) | |
download | dexon-solidity-eed46f001132d6052c6afe16e6dfb16967571167.tar.gz dexon-solidity-eed46f001132d6052c6afe16e6dfb16967571167.tar.zst dexon-solidity-eed46f001132d6052c6afe16e6dfb16967571167.zip |
Merge pull request #5680 from ethereum/doc-fix-trivial
[Trivial] Format "and" as instruction op code
-rw-r--r-- | docs/assembly.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/assembly.rst b/docs/assembly.rst index 5bb9825a..b2f150ca 100644 --- a/docs/assembly.rst +++ b/docs/assembly.rst @@ -159,8 +159,8 @@ following list can be used as a reference of its opcodes. If an opcode takes arguments (always from the top of the stack), they are given in parentheses. Note that the order of arguments can be seen to be reversed in non-functional style (explained below). -Opcodes marked with ``-`` do not push an item onto the stack, those marked with ``*`` are -special and all others push exactly one item onto the stack. +Opcodes marked with ``-`` do not push an item onto the stack (do not return a result), +those marked with ``*`` are special and all others push exactly one item onto the stack (their "return value"). Opcodes marked with ``F``, ``H``, ``B`` or ``C`` are present since Frontier, Homestead, Byzantium or Constantinople, respectively. Constantinople is still in planning and all instructions marked as such will result in an invalid instruction exception. @@ -346,7 +346,7 @@ Literals You can use integer constants by typing them in decimal or hexadecimal notation and an appropriate ``PUSHi`` instruction will automatically be generated. The following creates code -to add 2 and 3 resulting in 5 and then computes the bitwise and with the string "abc". +to add 2 and 3 resulting in 5 and then computes the bitwise ``AND`` with the string "abc". The final value is assigned to a local variable called ``x``. Strings are stored left-aligned and cannot be longer than 32 bytes. |