From a1b178f6c7c22f84830b03db86fe810d3f79ef34 Mon Sep 17 00:00:00 2001
From: Robin Salen <salenrobin@gmail.com>
Date: Thu, 26 Oct 2023 11:21:10 -0400
Subject: [PATCH] Refactor memcpy

---
 evm/src/cpu/kernel/asm/memory/memcpy.asm | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/evm/src/cpu/kernel/asm/memory/memcpy.asm b/evm/src/cpu/kernel/asm/memory/memcpy.asm
index e737dc33..55b773eb 100644
--- a/evm/src/cpu/kernel/asm/memory/memcpy.asm
+++ b/evm/src/cpu/kernel/asm/memory/memcpy.asm
@@ -42,12 +42,6 @@ global memcpy:
     // Continue the loop.
     %jump(memcpy)
 
-memcpy_finish:
-    // stack: DST, SRC, count, retdest
-    %pop7
-    // stack: retdest
-    JUMP
-
 %macro memcpy
     %stack (dst: 3, src: 3, count) -> (dst, src, count, %%after)
     %jump(memcpy)
@@ -63,7 +57,7 @@ global memcpy_bytes:
     // stack: count, DST, SRC, count, retdest
     ISZERO
     // stack: count == 0, DST, SRC, count, retdest
-    %jumpi(memcpy_bytes_empty)
+    %jumpi(memcpy_finish)
 
     // stack: DST, SRC, count, retdest
 
@@ -126,12 +120,8 @@ memcpy_bytes_finish:
     MSTORE_32BYTES
     // stack: DST, SRC, count, retdest
 
-    %pop7
-    // stack: retdest
-    JUMP
-
-memcpy_bytes_empty:
-    // stack: DST, SRC, 0, retdest
+memcpy_finish:
+    // stack: DST, SRC, count, retdest
     %pop7
     // stack: retdest
     JUMP