diff --git a/evm/src/cpu/kernel/aggregator.rs b/evm/src/cpu/kernel/aggregator.rs index cff0c644..13ac61fe 100644 --- a/evm/src/cpu/kernel/aggregator.rs +++ b/evm/src/cpu/kernel/aggregator.rs @@ -39,9 +39,9 @@ pub(crate) fn combined_kernel() -> Kernel { include_str!("asm/fields/fp6_mul.asm"), include_str!("asm/fields/fp12_mul.asm"), include_str!("asm/halt.asm"), - // 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/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"), diff --git a/evm/src/cpu/kernel/asm/hash/blake/compression.asm b/evm/src/cpu/kernel/asm/hash/blake/compression.asm index c00c7554..c319e791 100644 --- a/evm/src/cpu/kernel/asm/hash/blake/compression.asm +++ b/evm/src/cpu/kernel/asm/hash/blake/compression.asm @@ -94,4 +94,4 @@ global blake_compression: %increment // stack: round + 1, start %endrep - + \ No newline at end of file diff --git a/evm/src/cpu/kernel/asm/hash/blake/initial_state.asm b/evm/src/cpu/kernel/asm/hash/blake/initial_state.asm index 3d2bccff..d65ea0db 100644 --- a/evm/src/cpu/kernel/asm/hash/blake/initial_state.asm +++ b/evm/src/cpu/kernel/asm/hash/blake/initial_state.asm @@ -1,5 +1,4 @@ -global blake_initial_state: - // stack: retdest +%macro blae_initial_state %blake_iv(7) %blake_iv(6) %blake_iv(5) @@ -7,10 +6,11 @@ global blake_initial_state: %blake_iv(3) %blake_iv(2) %blake_iv(1) - // stack: IV_1, IV_2, IV_3, IV_4, IV_5, IV_6, IV_7, retdest + // stack: IV_1, IV_2, IV_3, IV_4, IV_5, IV_6, IV_7 PUSH 0x01010040 // params: key = 00, digest_size = 64 = 0x40 %blake_iv(0) XOR - // stack: IV_0 ^ params, IV_1, IV_2, IV_3, IV_4, IV_5, IV_6, IV_7, retdest + // stack: IV_0 ^ params, IV_1, IV_2, IV_3, IV_4, IV_5, IV_6, IV_7 %stack () -> (0, 0) - // stack: c_0 = 0, c_1 = 0, h_0, h_1, h_2, h_3, h_4, h_5, h_6, h_7, retdest \ No newline at end of file + // stack: c_0 = 0, c_1 = 0, h_0, h_1, h_2, h_3, h_4, h_5, h_6, h_7 +%endmacro \ No newline at end of file