From 1475cddb3db522ee6dc178e12b414f62a2ec2093 Mon Sep 17 00:00:00 2001
From: Dmitry Vagner <typecat@Dmitrys-MacBook-Pro.local>
Date: Mon, 3 Oct 2022 15:01:59 -0700
Subject: [PATCH] rearrange

---
 evm/src/cpu/kernel/asm/memory/core.asm | 28 +++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/evm/src/cpu/kernel/asm/memory/core.asm b/evm/src/cpu/kernel/asm/memory/core.asm
index 7ffd904a..2ec27d0e 100644
--- a/evm/src/cpu/kernel/asm/memory/core.asm
+++ b/evm/src/cpu/kernel/asm/memory/core.asm
@@ -238,13 +238,6 @@
     // stack: byte
 %endmacro
 
-// Load a single byte from kernel general memory.
-%macro mload_kernel_general
-    // stack: offset
-    %mload_kernel(@SEGMENT_KERNEL_GENERAL)
-    // stack: value
-%endmacro
-
 // Load a big-endian u32, consisting of 4 bytes (c_3, c_2, c_1, c_0),
 // from kernel code.
 %macro mload_kernel_code_u32
@@ -264,6 +257,13 @@
     // stack: value
 %endmacro
 
+// Load a single byte from kernel general memory.
+%macro mload_kernel_general
+    // stack: offset
+    %mload_kernel(@SEGMENT_KERNEL_GENERAL)
+    // stack: value
+%endmacro
+
 // Load a big-endian u32, consisting of 4 bytes (c_3, c_2, c_1, c_0),
 // from kernel general memory.
 %macro mload_kernel_general_u32
@@ -308,13 +308,6 @@
     %mstore_kernel_u32(@SEGMENT_CODE)
 %endmacro
 
-// Store a big-endian u32, consisting of 4 bytes (c_3, c_2, c_1, c_0),
-// to kernel general memory.
-%macro mstore_kernel_general_u32
-    // stack: offset, value
-    %mstore_kernel_u32(@SEGMENT_KERNEL_GENERAL)
-%endmacro
-
 // Store a single byte to @SEGMENT_RLP_RAW.
 %macro mstore_rlp
     // stack: offset, value
@@ -336,6 +329,13 @@
     // stack: 
 %endmacro
 
+// Store a big-endian u32, consisting of 4 bytes (c_3, c_2, c_1, c_0),
+// to kernel general memory.
+%macro mstore_kernel_general_u32
+    // stack: offset, value
+    %mstore_kernel_u32(@SEGMENT_KERNEL_GENERAL)
+%endmacro
+
 // set offset i to offset j in kernel general
 %macro mupdate_kernel_general
     // stack: j, i