From 50101570ef1372394b60d0ce88f2d682eda53843 Mon Sep 17 00:00:00 2001 From: Mathias Baumann Date: Tue, 18 Dec 2018 17:53:58 +0100 Subject: Format "and" as instruction op code --- docs/assembly.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assembly.rst b/docs/assembly.rst index 5bb9825a..b5206815 100644 --- a/docs/assembly.rst +++ b/docs/assembly.rst @@ -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. -- cgit v1.2.3 From e9944206a5ee1b7d4f4230c3618df539dbc69438 Mon Sep 17 00:00:00 2001 From: Mathias Baumann Date: Tue, 18 Dec 2018 18:05:14 +0100 Subject: Rephrase opcode result returning description It was a bit between the lines that "pushing on the stack" is their means of returning a result. --- docs/assembly.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assembly.rst b/docs/assembly.rst index b5206815..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. -- cgit v1.2.3