diff --git a/evm/src/cpu/kernel/aggregator.rs b/evm/src/cpu/kernel/aggregator.rs index 13ac61fe..01ba419b 100644 --- a/evm/src/cpu/kernel/aggregator.rs +++ b/evm/src/cpu/kernel/aggregator.rs @@ -42,10 +42,10 @@ pub(crate) fn combined_kernel() -> Kernel { include_str!("asm/hash/blake/compression.asm"), include_str!("asm/hash/blake/g_functions.asm"), include_str!("asm/hash/blake/initial_state.asm"), - // include_str!("asm/hash/blake/iv.asm"), - // include_str!("asm/hash/blake/ops.asm"), - // include_str!("asm/hash/blake/permutations.asm"), - // include_str!("asm/hash/blake/store.asm"), + include_str!("asm/hash/blake/iv.asm"), + include_str!("asm/hash/blake/ops.asm"), + include_str!("asm/hash/blake/permutations.asm"), + include_str!("asm/hash/blake/store.asm"), include_str!("asm/hash/ripemd/box.asm"), include_str!("asm/hash/ripemd/compression.asm"), include_str!("asm/hash/ripemd/constants.asm"), diff --git a/evm/src/cpu/kernel/asm/hash/blake/compression.asm b/evm/src/cpu/kernel/asm/hash/blake/compression.asm index c319e791..7dc55a72 100644 --- a/evm/src/cpu/kernel/asm/hash/blake/compression.asm +++ b/evm/src/cpu/kernel/asm/hash/blake/compression.asm @@ -1,6 +1,3 @@ -// We put the message schedule in memory starting at 64 * num_blocks + 2. -%macro message_schedule_addr_from_num_blocks - %macro blake_internal_state_addr PUSH 0 // stack: 0 @@ -17,7 +14,7 @@ global blake_compression: // stack: h_0, ..., h_7, t_0, t_1, f_0, f_1, m_0, ..., m_15 - %blake_compression_internal_state_addr + %blake_internal_state_addr // stack: start, h_0, ..., h_7, t_0, t_1, f_0, f_1, m_0, ..., m_15 %rep 8 SWAP1 @@ -67,7 +64,7 @@ global blake_compression: POP POP // stack: m_0, ..., m_15 - %blake_compression_message_addr + %blake_message_addr // stack: addr, m_0, ..., m_15 %rep 16 SWAP1 @@ -76,7 +73,7 @@ global blake_compression: %increment %endrep // stack: (empty) - %blake_compression_internal_state_addr + %blake_internal_state_addr // stack: start PUSH 0 // stack: round=0, start diff --git a/evm/src/cpu/kernel/asm/hash/blake/permutations.asm b/evm/src/cpu/kernel/asm/hash/blake/permutations.asm index b1997e2f..6f444c3b 100644 --- a/evm/src/cpu/kernel/asm/hash/blake/permutations.asm +++ b/evm/src/cpu/kernel/asm/hash/blake/permutations.asm @@ -169,6 +169,6 @@ permutation_9_constants: %mod_const(10) %mul_const(16) ADD - %add_const($i) + ADD %mload_kernel_code %endmacro