From 80d32f89b6cac50c57f0a76728cbd48b852bee55 Mon Sep 17 00:00:00 2001 From: Daniel Lubarov Date: Mon, 18 Jul 2022 15:58:12 -0700 Subject: [PATCH] fixes --- evm/src/cpu/kernel/aggregator.rs | 1 + evm/src/cpu/kernel/asm/memory.asm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/evm/src/cpu/kernel/aggregator.rs b/evm/src/cpu/kernel/aggregator.rs index c6c47387..8784e337 100644 --- a/evm/src/cpu/kernel/aggregator.rs +++ b/evm/src/cpu/kernel/aggregator.rs @@ -28,6 +28,7 @@ pub(crate) fn combined_kernel() -> Kernel { include_str!("asm/exp.asm"), include_str!("asm/curve_mul.asm"), include_str!("asm/curve_add.asm"), + include_str!("asm/memory.asm"), include_str!("asm/moddiv.asm"), include_str!("asm/secp256k1/curve_mul.asm"), include_str!("asm/secp256k1/curve_add.asm"), diff --git a/evm/src/cpu/kernel/asm/memory.asm b/evm/src/cpu/kernel/asm/memory.asm index 0bf0fbd1..42368af5 100644 --- a/evm/src/cpu/kernel/asm/memory.asm +++ b/evm/src/cpu/kernel/asm/memory.asm @@ -38,7 +38,7 @@ global memcpy: // stack: count, DST, SRC, count, retdest ISZERO // stack: count == 0, DST, SRC, count, retdest - %jumpi memcpy_finish + %jumpi(memcpy_finish) // stack: DST, SRC, count, retdest // Copy the next value. @@ -69,7 +69,7 @@ global memcpy: SWAP6 // Recurse! - JUMP memcpy + %jump(memcpy) memcpy_finish: JUMPDEST