diff options
| author | chriseth <chris@ethereum.org> | 2017-05-31 01:34:28 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-31 01:34:28 +0800 |
| commit | d4a57d81ba7f2a9b5db57397d36f1a17adb4b142 (patch) | |
| tree | 15d8048ad9ed48dc7d010e37fd2125df8d5db436 /docs | |
| parent | 254b55728f66ea164e9085700a294ac4837f2029 (diff) | |
| parent | dcb7c51920a947e57371b7dc92417f47ee5cc65c (diff) | |
| download | dexon-solidity-d4a57d81ba7f2a9b5db57397d36f1a17adb4b142.tar dexon-solidity-d4a57d81ba7f2a9b5db57397d36f1a17adb4b142.tar.gz dexon-solidity-d4a57d81ba7f2a9b5db57397d36f1a17adb4b142.tar.bz2 dexon-solidity-d4a57d81ba7f2a9b5db57397d36f1a17adb4b142.tar.lz dexon-solidity-d4a57d81ba7f2a9b5db57397d36f1a17adb4b142.tar.xz dexon-solidity-d4a57d81ba7f2a9b5db57397d36f1a17adb4b142.tar.zst dexon-solidity-d4a57d81ba7f2a9b5db57397d36f1a17adb4b142.zip | |
Merge pull request #2317 from ethereum/keccak256
Use keccak256 in tests and replace the SHA3 instruction in assembly
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assembly.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/assembly.rst b/docs/assembly.rst index 07583a24..90e70031 100644 --- a/docs/assembly.rst +++ b/docs/assembly.rst @@ -182,6 +182,8 @@ In the grammar, opcodes are represented as pre-defined identifiers. +-------------------------+------+-----------------------------------------------------------------+ | signextend(i, x) | | sign extend from (i*8+7)th bit counting from least significant | +-------------------------+------+-----------------------------------------------------------------+ +| keccak256(p, n) | | keccak(mem[p...(p+n))) | ++-------------------------+------+-----------------------------------------------------------------+ | sha3(p, n) | | keccak(mem[p...(p+n))) | +-------------------------+------+-----------------------------------------------------------------+ | jump(label) | `-` | jump to label / code position | |