From 7a6d996fe70cbaa5cdab70f443d078074e0b9871 Mon Sep 17 00:00:00 2001 From: Daniel Lubarov Date: Sun, 31 Jul 2022 09:28:16 -0700 Subject: [PATCH] Move couple asm files --- evm/src/cpu/kernel/aggregator.rs | 4 ++-- evm/src/cpu/kernel/asm/{ => util}/assertions.asm | 0 evm/src/cpu/kernel/asm/{ => util}/basic_macros.asm | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename evm/src/cpu/kernel/asm/{ => util}/assertions.asm (100%) rename evm/src/cpu/kernel/asm/{ => util}/basic_macros.asm (100%) diff --git a/evm/src/cpu/kernel/aggregator.rs b/evm/src/cpu/kernel/aggregator.rs index 196341f9..e5e1f29f 100644 --- a/evm/src/cpu/kernel/aggregator.rs +++ b/evm/src/cpu/kernel/aggregator.rs @@ -46,8 +46,6 @@ pub fn evm_constants() -> HashMap { #[allow(dead_code)] // TODO: Should be used once witness generation is done. pub(crate) fn combined_kernel() -> Kernel { let files = vec![ - include_str!("asm/assertions.asm"), - include_str!("asm/basic_macros.asm"), include_str!("asm/curve/bn254/curve_add.asm"), include_str!("asm/curve/bn254/curve_mul.asm"), include_str!("asm/curve/bn254/moddiv.asm"), @@ -71,6 +69,8 @@ pub(crate) fn combined_kernel() -> Kernel { include_str!("asm/transactions/type_0.asm"), include_str!("asm/transactions/type_1.asm"), include_str!("asm/transactions/type_2.asm"), + include_str!("asm/util/assertions.asm"), + include_str!("asm/util/basic_macros.asm"), ]; let parsed_files = files.iter().map(|f| parse(f)).collect_vec(); diff --git a/evm/src/cpu/kernel/asm/assertions.asm b/evm/src/cpu/kernel/asm/util/assertions.asm similarity index 100% rename from evm/src/cpu/kernel/asm/assertions.asm rename to evm/src/cpu/kernel/asm/util/assertions.asm diff --git a/evm/src/cpu/kernel/asm/basic_macros.asm b/evm/src/cpu/kernel/asm/util/basic_macros.asm similarity index 100% rename from evm/src/cpu/kernel/asm/basic_macros.asm rename to evm/src/cpu/kernel/asm/util/basic_macros.asm