From 1db5b7374da4f3f3cd07a6063aa917d53010c334 Mon Sep 17 00:00:00 2001
From: Daniel Lubarov <daniel@lubarov.com>
Date: Sun, 24 Jul 2022 08:42:06 -0700
Subject: [PATCH] Move storage asm

---
 evm/src/cpu/kernel/aggregator.rs         |  4 ++--
 evm/src/cpu/kernel/asm/storage/read.asm  |  2 ++
 evm/src/cpu/kernel/asm/storage/write.asm |  2 ++
 evm/src/cpu/kernel/asm/storage_read.asm  | 10 ----------
 evm/src/cpu/kernel/asm/storage_write.asm |  6 ------
 5 files changed, 6 insertions(+), 18 deletions(-)
 create mode 100644 evm/src/cpu/kernel/asm/storage/read.asm
 create mode 100644 evm/src/cpu/kernel/asm/storage/write.asm
 delete mode 100644 evm/src/cpu/kernel/asm/storage_read.asm
 delete mode 100644 evm/src/cpu/kernel/asm/storage_write.asm

diff --git a/evm/src/cpu/kernel/aggregator.rs b/evm/src/cpu/kernel/aggregator.rs
index ec42f5c4..ac5ec6df 100644
--- a/evm/src/cpu/kernel/aggregator.rs
+++ b/evm/src/cpu/kernel/aggregator.rs
@@ -43,8 +43,8 @@ pub(crate) fn combined_kernel() -> Kernel {
         include_str!("asm/secp256k1/lift_x.asm"),
         include_str!("asm/secp256k1/inverse_scalar.asm"),
         include_str!("asm/ecrecover.asm"),
-        include_str!("asm/storage_read.asm"),
-        include_str!("asm/storage_write.asm"),
+        include_str!("asm/storage/read.asm"),
+        include_str!("asm/storage/write.asm"),
     ];
 
     let parsed_files = files.iter().map(|f| parse(f)).collect_vec();
diff --git a/evm/src/cpu/kernel/asm/storage/read.asm b/evm/src/cpu/kernel/asm/storage/read.asm
new file mode 100644
index 00000000..04fea17a
--- /dev/null
+++ b/evm/src/cpu/kernel/asm/storage/read.asm
@@ -0,0 +1,2 @@
+global storage_read:
+    // TODO
diff --git a/evm/src/cpu/kernel/asm/storage/write.asm b/evm/src/cpu/kernel/asm/storage/write.asm
new file mode 100644
index 00000000..940fb548
--- /dev/null
+++ b/evm/src/cpu/kernel/asm/storage/write.asm
@@ -0,0 +1,2 @@
+global storage_write:
+    // TODO
diff --git a/evm/src/cpu/kernel/asm/storage_read.asm b/evm/src/cpu/kernel/asm/storage_read.asm
deleted file mode 100644
index 6a704c61..00000000
--- a/evm/src/cpu/kernel/asm/storage_read.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-// TODO: Dummy code for now.
-global storage_read:
-    JUMPDEST
-    PUSH 1234
-    POP
-    // An infinite loop:
-mylabel:
-    JUMPDEST
-    PUSH mylabel
-    JUMP
diff --git a/evm/src/cpu/kernel/asm/storage_write.asm b/evm/src/cpu/kernel/asm/storage_write.asm
deleted file mode 100644
index 15c41b7c..00000000
--- a/evm/src/cpu/kernel/asm/storage_write.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-// TODO: Dummy code for now.
-global storage_write:
-    JUMPDEST
-    PUSH 123 // Whatever.
-    POP
-    BYTES 0x1, 0x02, 3