diff --git a/evm/src/cpu/kernel/asm/sha2/compression.asm b/evm/src/cpu/kernel/asm/sha2/compression.asm index 3288c405..bee829f3 100644 --- a/evm/src/cpu/kernel/asm/sha2/compression.asm +++ b/evm/src/cpu/kernel/asm/sha2/compression.asm @@ -136,7 +136,7 @@ sha2_compression_loop: // stack: sha2_constants_k + 4*i, W[i], a[i], b[i], c[i], d[i], e[i], f[i], g[i], h[i], num_blocks, scratch_space_addr, message_schedule_addr, i, retdest %mload_kernel_code_u32 // stack: K[i], W[i], a[i], b[i], c[i], d[i], e[i], f[i], g[i], h[i], num_blocks, scratch_space_addr, message_schedule_addr, i, retdest - %stack ((start: 6), e, f, g, h) -> (e, f, g, h, start, e, f, g, h) + %stack (start: 6, e, f, g, h) -> (e, f, g, h, start, e, f, g, h) // stack: e[i], f[i], g[i], h[i], K[i], W[i], a[i], b[i], c[i], d[i], e[i], f[i], g[i], h[i], num_blocks, scratch_space_addr, message_schedule_addr, i, retdest %sha2_temp_word1 // stack: T1[i], a[i], b[i], c[i], d[i], e[i], f[i], g[i], h[i], num_blocks, scratch_space_addr, message_schedule_addr, i, retdest @@ -271,7 +271,7 @@ sha2_compression_end_block: // In this case, we've finished all the blocks. %jumpi(sha2_compression_end) // stack: num_blocks, a[0]+a[64], b[0]+b[64], c[0]+c[64], d[0]+d[64], e[0]+e[64], f[0]+f[64], g[0]+g[64], h[0]+h[64], scratch_space_addr, message_schedule_addr, i, retdest - %stack (num_blocks, (working: 8)) -> (working, num_blocks) + %stack (num_blocks, working: 8) -> (working, num_blocks) %jump(sha2_compression_start_block) sha2_compression_end: // stack: num_blocks, a[0]+a[64], b[0]+b[64], c[0]+c[64], d[0]+d[64], e[0]+e[64], f[0]+f[64], g[0]+g[64], h[0]+h[64], scratch_space_addr, message_schedule_addr, i, retdest diff --git a/evm/src/cpu/kernel/asm/sha2/ops.asm b/evm/src/cpu/kernel/asm/sha2/ops.asm index 7bd96a10..3f20b2d0 100644 --- a/evm/src/cpu/kernel/asm/sha2/ops.asm +++ b/evm/src/cpu/kernel/asm/sha2/ops.asm @@ -171,7 +171,7 @@ %macro sha2_majority // stack: x, y, z - %stack ((xyz: 3)) -> (xyz, xyz) + %stack (xyz: 3) -> (xyz, xyz) // stack: x, y, z, x, y, z AND // stack: x and y, z, x, y, z @@ -179,7 +179,7 @@ // stack: x, z, x and y, y, z AND // stack: x and z, x and y, y, z - %stack ((a: 2), (b: 2)) -> (b, a) + %stack (a: 2, b: 2) -> (b, a) // stack: y, z, x and z, x and y AND // stack: y and z, x and z, x and y diff --git a/evm/src/cpu/kernel/asm/sha2/temp_words.asm b/evm/src/cpu/kernel/asm/sha2/temp_words.asm index cd84f240..daf07ab5 100644 --- a/evm/src/cpu/kernel/asm/sha2/temp_words.asm +++ b/evm/src/cpu/kernel/asm/sha2/temp_words.asm @@ -4,7 +4,7 @@ // stack: e, e, f, g, h, K[i], W[i] %sha2_bigsigma_1 // stack: Sigma_1(e), e, f, g, h, K[i], W[i] - %stack (sig, (efg: 3)) -> (efg, sig) + %stack (sig, efg: 3) -> (efg, sig) // stack: e, f, g, Sigma_1(e), h, K[i], W[i] %sha2_choice // stack: Ch(e, f, g), Sigma_1(e), h, K[i], W[i]