From 34421ea9e940aea36dc363ac1899ac4b1a7f40e4 Mon Sep 17 00:00:00 2001
From: Felix Puscasu <felix.puscasu@trili.tech>
Date: Thu, 7 Nov 2024 13:58:49 +0000
Subject: [PATCH] RISC-V: Delete read/write_some functions from Manager traits

---
 src/riscv/lib/src/state_backend.rs            | 22 --------------
 .../lib/src/state_backend/owned_backend.rs    | 17 -----------
 src/riscv/lib/src/state_backend/region.rs     | 29 -------------------
 3 files changed, 68 deletions(-)

diff --git a/src/riscv/lib/src/state_backend.rs b/src/riscv/lib/src/state_backend.rs
index e237d27d9bae..c315c604be00 100644
--- a/src/riscv/lib/src/state_backend.rs
+++ b/src/riscv/lib/src/state_backend.rs
@@ -100,13 +100,6 @@ pub trait ManagerRead: ManagerBase {
     /// Read all elements in the region.
     fn region_read_all<E: Copy, const LEN: usize>(region: &Self::Region<E, LEN>) -> Vec<E>;
 
-    /// Read `buffer.len()` elements from the region, starting at `offset`.
-    fn region_read_some<E: Copy, const LEN: usize>(
-        region: &Self::Region<E, LEN>,
-        offset: usize,
-        buffer: &mut [E],
-    );
-
     /// Read an element in the region. `address` is in bytes.
     fn dyn_region_read<E: Elem, const LEN: usize>(
         region: &Self::DynRegion<LEN>,
@@ -133,13 +126,6 @@ pub trait ManagerWrite: ManagerBase {
     /// Update all elements in the region.
     fn region_write_all<E: Copy, const LEN: usize>(region: &mut Self::Region<E, LEN>, value: &[E]);
 
-    /// Update a subset of elements in the region starting at `index`.
-    fn region_write_some<E: Copy, const LEN: usize>(
-        region: &mut Self::Region<E, LEN>,
-        index: usize,
-        buffer: &[E],
-    );
-
     /// Update an element in the region. `address` is in bytes.
     fn dyn_region_write<E: Elem, const LEN: usize>(
         region: &mut Self::DynRegion<LEN>,
@@ -247,14 +233,6 @@ impl<M: ManagerRead> ManagerRead for Ref<'_, M> {
         M::region_read_all(region)
     }
 
-    fn region_read_some<E: Copy, const LEN: usize>(
-        region: &Self::Region<E, LEN>,
-        offset: usize,
-        buffer: &mut [E],
-    ) {
-        M::region_read_some(region, offset, buffer)
-    }
-
     fn dyn_region_read<E: Elem, const LEN: usize>(
         region: &Self::DynRegion<LEN>,
         address: usize,
diff --git a/src/riscv/lib/src/state_backend/owned_backend.rs b/src/riscv/lib/src/state_backend/owned_backend.rs
index a016e4085840..2aa2ac32cf1b 100644
--- a/src/riscv/lib/src/state_backend/owned_backend.rs
+++ b/src/riscv/lib/src/state_backend/owned_backend.rs
@@ -65,15 +65,6 @@ impl ManagerRead for Owned {
         region.to_vec()
     }
 
-    fn region_read_some<E: StaticCopy, const LEN: usize>(
-        region: &Self::Region<E, LEN>,
-        offset: usize,
-        buffer: &mut [E],
-    ) {
-        let slice = &region[offset..][..buffer.len()];
-        buffer.copy_from_slice(slice)
-    }
-
     fn dyn_region_read<E: Elem, const LEN: usize>(
         region: &Self::DynRegion<LEN>,
         address: usize,
@@ -125,14 +116,6 @@ impl ManagerWrite for Owned {
         region.copy_from_slice(value)
     }
 
-    fn region_write_some<E: StaticCopy, const LEN: usize>(
-        region: &mut Self::Region<E, LEN>,
-        index: usize,
-        buffer: &[E],
-    ) {
-        region[index..][..buffer.len()].copy_from_slice(buffer)
-    }
-
     fn dyn_region_write<E: Elem, const LEN: usize>(
         region: &mut Self::DynRegion<LEN>,
         address: usize,
diff --git a/src/riscv/lib/src/state_backend/region.rs b/src/riscv/lib/src/state_backend/region.rs
index c865adaafc13..c0f07ad397e4 100644
--- a/src/riscv/lib/src/state_backend/region.rs
+++ b/src/riscv/lib/src/state_backend/region.rs
@@ -235,15 +235,6 @@ impl<E: Copy, const LEN: usize, M: ManagerBase> Cells<E, LEN, M> {
         M::region_read_all(&self.region)
     }
 
-    /// Read `buffer.len()` elements from the region, starting at `offset`.
-    #[inline]
-    pub fn read_some(&self, offset: usize, buffer: &mut [E])
-    where
-        M: ManagerRead,
-    {
-        M::region_read_some(&self.region, offset, buffer)
-    }
-
     /// Update an element in the region.
     #[inline]
     pub fn write(&mut self, index: usize, value: E)
@@ -262,15 +253,6 @@ impl<E: Copy, const LEN: usize, M: ManagerBase> Cells<E, LEN, M> {
         M::region_write_all(&mut self.region, value)
     }
 
-    /// Update a subset of elements in the region starting at `index`.
-    #[inline]
-    pub fn write_some(&mut self, index: usize, buffer: &[E])
-    where
-        M: ManagerWrite,
-    {
-        M::region_write_some(&mut self.region, index, buffer)
-    }
-
     /// Update the element in the region and return the previous value.
     #[inline]
     pub fn replace(&mut self, index: usize, value: E) -> E
@@ -641,17 +623,6 @@ pub(crate) mod tests {
         let buffer = bincode::serialize(&region.struct_ref()).unwrap();
         assert_eq!(buffer[..2], [74, 26]);
 
-        // Writing to sub-section must convert to stored format.
-
-        region.write_some(1, &[Flipper { a: 1, b: 2 }, Flipper { a: 3, b: 4 }]);
-
-        let mut buffer = [Flipper { a: 0, b: 0 }; 2];
-        region.read_some(1, &mut buffer);
-        assert_eq!(buffer, [Flipper { a: 1, b: 2 }, Flipper { a: 3, b: 4 }]);
-
-        let buffer = bincode::serialize(&region.struct_ref()).unwrap();
-        assert_eq!(buffer[2..6], [2, 1, 4, 3]);
-
         // Writing to the entire region must convert properly to stored format.
         region.write_all(&[
             Flipper { a: 11, b: 22 },
-- 
GitLab