From b80a28dbd18fba7446ba5e7a6ffb8f50f125ee65 Mon Sep 17 00:00:00 2001
From: Daniel Lubarov <daniel@lubarov.com>
Date: Sun, 19 Mar 2023 22:52:44 -0700
Subject: [PATCH] Misc

---
 evm/src/cpu/kernel/asm/core/syscall_stubs.asm |  8 --------
 evm/src/cpu/kernel/asm/memory/syscalls.asm    | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/evm/src/cpu/kernel/asm/core/syscall_stubs.asm b/evm/src/cpu/kernel/asm/core/syscall_stubs.asm
index 624bd9c6..23363166 100644
--- a/evm/src/cpu/kernel/asm/core/syscall_stubs.asm
+++ b/evm/src/cpu/kernel/asm/core/syscall_stubs.asm
@@ -17,20 +17,12 @@ global sys_balance:
     PANIC
 global sys_origin:
     PANIC
-global sys_calldataload:
-    PANIC
 global sys_calldatasize:
     PANIC
 global sys_calldatacopy:
     PANIC
 global sys_codecopy:
     PANIC
-global sys_gasprice:
-    // stack: kexit_info
-    %mload_txn_field(@TXN_FIELD_COMPUTED_FEE_PER_GAS)
-    // stack: gas_price, kexit_info
-    SWAP1
-    EXIT_KERNEL
 global sys_returndatasize:
     PANIC
 global sys_returndatacopy:
diff --git a/evm/src/cpu/kernel/asm/memory/syscalls.asm b/evm/src/cpu/kernel/asm/memory/syscalls.asm
index af8b6f27..3045be6d 100644
--- a/evm/src/cpu/kernel/asm/memory/syscalls.asm
+++ b/evm/src/cpu/kernel/asm/memory/syscalls.asm
@@ -104,3 +104,17 @@ global sys_mstore8:
     %mstore_current(@SEGMENT_MAIN_MEMORY)
     // stack: kexit_info
     EXIT_KERNEL
+
+global sys_calldataload:
+    // stack: kexit_info, i
+    %charge_gas_const(@GAS_VERYLOW)
+    // stack: kexit_info, i
+    %stack (kexit_info, i) -> (@SEGMENT_CALLDATA, i, 32, sys_calldataload_after_mload_packing, kexit_info)
+    GET_CONTEXT
+    // stack: ADDR: 3, 32, sys_calldataload_after_mload_packing, kexit_info
+    %jump(mload_packing)
+sys_calldataload_after_mload_packing:
+    // stack: value, kexit_info
+    SWAP1
+    EXIT_KERNEL
+    PANIC