Merge pull request 0xPolygonZero#1316 from topos-protocol/memcpy_tiny

Move empty check inside final iteration of memcpy_bytes
topos-protocol · Oct 30, 2023 · 0f299d4 · 0f299d4
2 parents af4935c + c96a870
commit 0f299d4
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/evm/src/cpu/kernel/asm/memory/memcpy.asm b/evm/src/cpu/kernel/asm/memory/memcpy.asm
@@ -52,15 +52,6 @@ global memcpy:
 global memcpy_bytes:
     // stack: DST, SRC, count, retdest
 
-    // Handle empty case
-    DUP7
-    // stack: count, DST, SRC, count, retdest
-    ISZERO
-    // stack: count == 0, DST, SRC, count, retdest
-    %jumpi(memcpy_finish)
-
-    // stack: DST, SRC, count, retdest
-
     // Handle small case
     DUP7
     // stack: count, DST, SRC, count, retdest
@@ -104,6 +95,15 @@ global memcpy_bytes:
 memcpy_bytes_finish:
     // stack: DST, SRC, count, retdest
 
+    // Handle empty case
+    DUP7
+    // stack: count, DST, SRC, count, retdest
+    ISZERO
+    // stack: count == 0, DST, SRC, count, retdest
+    %jumpi(memcpy_finish)
+
+    // stack: DST, SRC, count, retdest
+
     // Copy the last chunk of `count` bytes.
     DUP7
     DUP1