From 6ab65800585a699658a8a8ad7ffdaa67539d6505 Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Tue, 13 Dec 2022 14:42:45 -0800 Subject: [PATCH] block_size macro --- evm/src/cpu/kernel/asm/hash/blake2b/addresses.asm | 7 ++++++- evm/src/cpu/kernel/asm/hash/blake2b/compression.asm | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/evm/src/cpu/kernel/asm/hash/blake2b/addresses.asm b/evm/src/cpu/kernel/asm/hash/blake2b/addresses.asm index 8372639c..9d65b9ed 100644 --- a/evm/src/cpu/kernel/asm/hash/blake2b/addresses.asm +++ b/evm/src/cpu/kernel/asm/hash/blake2b/addresses.asm @@ -20,7 +20,7 @@ // stack: 0 %mload_kernel_general // stack: num_blocks - %mul_const(128) + %block_size %add_const(2) // stack: num_bytes+2 %endmacro @@ -36,3 +36,8 @@ %blake2b_internal_state_addr %add_const(16) %endmacro + +// Block size is 128 bytes. +%macro block_size + %mul_const(128) +%endmacro \ No newline at end of file diff --git a/evm/src/cpu/kernel/asm/hash/blake2b/compression.asm b/evm/src/cpu/kernel/asm/hash/blake2b/compression.asm index 2b590d41..a25158d9 100644 --- a/evm/src/cpu/kernel/asm/hash/blake2b/compression.asm +++ b/evm/src/cpu/kernel/asm/hash/blake2b/compression.asm @@ -42,7 +42,7 @@ compression_loop: DUP2 // stack: cur_block, is_last_block * num_bytes, cur_block, is_last_block, retdest %increment - %mul_const(128) + %block_size // stack: (cur_block + 1) * 128, is_last_block * num_bytes, cur_block, is_last_block, retdest DUP4 // stack: is_last_block, (cur_block + 1) * 128, is_last_block * num_bytes, cur_block, is_last_block, retdest @@ -56,7 +56,7 @@ compression_loop: // stack: cur_block, t, is_last_block, retdest DUP1 // stack: cur_block, cur_block, t, is_last_block, retdest - %mul_const(128) + %block_size %add_const(2) // stack: cur_block_start_byte, t, cur_block, is_last_block, retdest