From f125786d9b1d56f6a366994030317b687f078262 Mon Sep 17 00:00:00 2001 From: Daniel Lubarov Date: Sun, 16 Oct 2022 22:55:09 -0700 Subject: [PATCH] More directories for MPT logic --- evm/src/cpu/kernel/aggregator.rs | 18 +++++++++--------- .../cpu/kernel/asm/mpt/{ => delete}/delete.asm | 0 evm/src/cpu/kernel/asm/mpt/{ => hash}/hash.asm | 0 .../asm/mpt/{ => hash}/hash_trie_specific.asm | 0 .../cpu/kernel/asm/mpt/{ => insert}/insert.asm | 0 .../asm/mpt/{ => insert}/insert_extension.asm | 0 .../asm/mpt/{ => insert}/insert_leaf.asm | 0 .../mpt/{ => insert}/insert_trie_specific.asm | 0 evm/src/cpu/kernel/asm/mpt/{ => load}/load.asm | 0 .../asm/mpt/{ => load}/load_trie_specific.asm | 0 10 files changed, 9 insertions(+), 9 deletions(-) rename evm/src/cpu/kernel/asm/mpt/{ => delete}/delete.asm (100%) rename evm/src/cpu/kernel/asm/mpt/{ => hash}/hash.asm (100%) rename evm/src/cpu/kernel/asm/mpt/{ => hash}/hash_trie_specific.asm (100%) rename evm/src/cpu/kernel/asm/mpt/{ => insert}/insert.asm (100%) rename evm/src/cpu/kernel/asm/mpt/{ => insert}/insert_extension.asm (100%) rename evm/src/cpu/kernel/asm/mpt/{ => insert}/insert_leaf.asm (100%) rename evm/src/cpu/kernel/asm/mpt/{ => insert}/insert_trie_specific.asm (100%) rename evm/src/cpu/kernel/asm/mpt/{ => load}/load.asm (100%) rename evm/src/cpu/kernel/asm/mpt/{ => load}/load_trie_specific.asm (100%) diff --git a/evm/src/cpu/kernel/aggregator.rs b/evm/src/cpu/kernel/aggregator.rs index afed6a31..e0a64314 100644 --- a/evm/src/cpu/kernel/aggregator.rs +++ b/evm/src/cpu/kernel/aggregator.rs @@ -39,16 +39,16 @@ pub(crate) fn combined_kernel() -> Kernel { include_str!("asm/memory/metadata.asm"), include_str!("asm/memory/packing.asm"), include_str!("asm/memory/txn_fields.asm"), - include_str!("asm/mpt/delete.asm"), - include_str!("asm/mpt/hash.asm"), - include_str!("asm/mpt/hash_trie_specific.asm"), + include_str!("asm/mpt/delete/delete.asm"), + include_str!("asm/mpt/hash/hash.asm"), + include_str!("asm/mpt/hash/hash_trie_specific.asm"), include_str!("asm/mpt/hex_prefix.asm"), - include_str!("asm/mpt/insert.asm"), - include_str!("asm/mpt/insert_extension.asm"), - include_str!("asm/mpt/insert_leaf.asm"), - include_str!("asm/mpt/insert_trie_specific.asm"), - include_str!("asm/mpt/load.asm"), - include_str!("asm/mpt/load_trie_specific.asm"), + include_str!("asm/mpt/insert/insert.asm"), + include_str!("asm/mpt/insert/insert_extension.asm"), + include_str!("asm/mpt/insert/insert_leaf.asm"), + include_str!("asm/mpt/insert/insert_trie_specific.asm"), + include_str!("asm/mpt/load/load.asm"), + include_str!("asm/mpt/load/load_trie_specific.asm"), include_str!("asm/mpt/read.asm"), include_str!("asm/mpt/storage_read.asm"), include_str!("asm/mpt/storage_write.asm"), diff --git a/evm/src/cpu/kernel/asm/mpt/delete.asm b/evm/src/cpu/kernel/asm/mpt/delete/delete.asm similarity index 100% rename from evm/src/cpu/kernel/asm/mpt/delete.asm rename to evm/src/cpu/kernel/asm/mpt/delete/delete.asm diff --git a/evm/src/cpu/kernel/asm/mpt/hash.asm b/evm/src/cpu/kernel/asm/mpt/hash/hash.asm similarity index 100% rename from evm/src/cpu/kernel/asm/mpt/hash.asm rename to evm/src/cpu/kernel/asm/mpt/hash/hash.asm diff --git a/evm/src/cpu/kernel/asm/mpt/hash_trie_specific.asm b/evm/src/cpu/kernel/asm/mpt/hash/hash_trie_specific.asm similarity index 100% rename from evm/src/cpu/kernel/asm/mpt/hash_trie_specific.asm rename to evm/src/cpu/kernel/asm/mpt/hash/hash_trie_specific.asm diff --git a/evm/src/cpu/kernel/asm/mpt/insert.asm b/evm/src/cpu/kernel/asm/mpt/insert/insert.asm similarity index 100% rename from evm/src/cpu/kernel/asm/mpt/insert.asm rename to evm/src/cpu/kernel/asm/mpt/insert/insert.asm diff --git a/evm/src/cpu/kernel/asm/mpt/insert_extension.asm b/evm/src/cpu/kernel/asm/mpt/insert/insert_extension.asm similarity index 100% rename from evm/src/cpu/kernel/asm/mpt/insert_extension.asm rename to evm/src/cpu/kernel/asm/mpt/insert/insert_extension.asm diff --git a/evm/src/cpu/kernel/asm/mpt/insert_leaf.asm b/evm/src/cpu/kernel/asm/mpt/insert/insert_leaf.asm similarity index 100% rename from evm/src/cpu/kernel/asm/mpt/insert_leaf.asm rename to evm/src/cpu/kernel/asm/mpt/insert/insert_leaf.asm diff --git a/evm/src/cpu/kernel/asm/mpt/insert_trie_specific.asm b/evm/src/cpu/kernel/asm/mpt/insert/insert_trie_specific.asm similarity index 100% rename from evm/src/cpu/kernel/asm/mpt/insert_trie_specific.asm rename to evm/src/cpu/kernel/asm/mpt/insert/insert_trie_specific.asm diff --git a/evm/src/cpu/kernel/asm/mpt/load.asm b/evm/src/cpu/kernel/asm/mpt/load/load.asm similarity index 100% rename from evm/src/cpu/kernel/asm/mpt/load.asm rename to evm/src/cpu/kernel/asm/mpt/load/load.asm diff --git a/evm/src/cpu/kernel/asm/mpt/load_trie_specific.asm b/evm/src/cpu/kernel/asm/mpt/load/load_trie_specific.asm similarity index 100% rename from evm/src/cpu/kernel/asm/mpt/load_trie_specific.asm rename to evm/src/cpu/kernel/asm/mpt/load/load_trie_specific.asm