diff --git a/evm/src/cpu/columns/mod.rs b/evm/src/cpu/columns/mod.rs index 51acbfd3..bfb3f0a8 100644 --- a/evm/src/cpu/columns/mod.rs +++ b/evm/src/cpu/columns/mod.rs @@ -6,7 +6,7 @@ use std::fmt::Debug; use std::mem::{size_of, transmute, transmute_copy, ManuallyDrop}; use std::ops::{Index, IndexMut}; -use crate::cpu::columns::shared::CpuSharedColumnsView; +use crate::cpu::columns::shared::CpuGeneralColumnsView; use crate::memory; mod shared; @@ -141,7 +141,7 @@ pub struct CpuColumnsView { /// Filter. 1 iff a Keccak permutation is computed on this row. pub is_keccak: T, - pub(crate) general: CpuSharedColumnsView, + pub(crate) general: CpuGeneralColumnsView, pub simple_logic_diff: T, pub simple_logic_diff_inv: T, diff --git a/evm/src/cpu/columns/shared.rs b/evm/src/cpu/columns/shared.rs index 34db209d..600dda87 100644 --- a/evm/src/cpu/columns/shared.rs +++ b/evm/src/cpu/columns/shared.rs @@ -4,13 +4,13 @@ use std::mem::{size_of, transmute}; /// General purpose columns, which can have different meanings depending on what CTL or other /// operation is occurring at this row. -pub(crate) union CpuSharedColumnsView { +pub(crate) union CpuGeneralColumnsView { keccak: CpuKeccakView, arithmetic: CpuArithmeticView, logic: CpuLogicView, } -impl CpuSharedColumnsView { +impl CpuGeneralColumnsView { // SAFETY: Each view is a valid interpretation of the underlying array. pub(crate) fn keccak(&self) -> &CpuKeccakView { unsafe { &self.keccak } @@ -42,7 +42,7 @@ impl CpuSharedColumnsView { } } -impl PartialEq for CpuSharedColumnsView { +impl PartialEq for CpuGeneralColumnsView { fn eq(&self, other: &Self) -> bool { let self_arr: &[T; NUM_SHARED_COLUMNS] = self.borrow(); let other_arr: &[T; NUM_SHARED_COLUMNS] = other.borrow(); @@ -50,22 +50,22 @@ impl PartialEq for CpuSharedColumnsView { } } -impl Eq for CpuSharedColumnsView {} +impl Eq for CpuGeneralColumnsView {} -impl Debug for CpuSharedColumnsView { +impl Debug for CpuGeneralColumnsView { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { let self_arr: &[T; NUM_SHARED_COLUMNS] = self.borrow(); Debug::fmt(self_arr, f) } } -impl Borrow<[T; NUM_SHARED_COLUMNS]> for CpuSharedColumnsView { +impl Borrow<[T; NUM_SHARED_COLUMNS]> for CpuGeneralColumnsView { fn borrow(&self) -> &[T; NUM_SHARED_COLUMNS] { unsafe { transmute(self) } } } -impl BorrowMut<[T; NUM_SHARED_COLUMNS]> for CpuSharedColumnsView { +impl BorrowMut<[T; NUM_SHARED_COLUMNS]> for CpuGeneralColumnsView { fn borrow_mut(&mut self) -> &mut [T; NUM_SHARED_COLUMNS] { unsafe { transmute(self) } } @@ -92,4 +92,4 @@ pub(crate) struct CpuLogicView { } // `u8` is guaranteed to have a `size_of` of 1. -pub const NUM_SHARED_COLUMNS: usize = size_of::>(); +pub const NUM_SHARED_COLUMNS: usize = size_of::>();