kmwebnet/OpenSK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update ERASED_WORD definition to use WORD

Browse Source
This commit is contained in:
Julien Cretin
2020-10-27 13:45:18 +01:00
parent edd1bcf5d2
commit 71815cad09
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/persistent_store/src/format.rs
View File

@@ -76,7 +76,7 @@ const MAX_UPDATES: usize = 31;
const MAX_VIRT_PAGE_SIZE: usize = div_ceil(MAX_PAGE_SIZE, WORD_SIZE) - CONTENT_WORD; const MAX_VIRT_PAGE_SIZE: usize = div_ceil(MAX_PAGE_SIZE, WORD_SIZE) - CONTENT_WORD;
/// Word with all bits set to one. /// Word with all bits set to one.
const ERASED_WORD: u32 = 0xffffffff; const ERASED_WORD: WORD = !(0 as WORD);
/// Helpers for a given storage configuration. /// Helpers for a given storage configuration.
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
@@ -449,7 +449,9 @@ impl Format {
/// Returns the minimum number of words to represent a given number of bytes. /// Returns the minimum number of words to represent a given number of bytes.
/// ///
/// Assumes `bytes + self.word_size()` does not overflow. /// # Preconditions
///
/// - `bytes + self.word_size()` does not overflow.
pub fn bytes_to_words(&self, bytes: usize) -> usize { pub fn bytes_to_words(&self, bytes: usize) -> usize {
div_ceil(bytes, self.word_size()) div_ceil(bytes, self.word_size())
} }
@@ -808,7 +810,11 @@ pub fn is_erased(slice: &[u8]) -> bool {
/// Divides then takes ceiling. /// Divides then takes ceiling.
/// ///
/// Returns `ceil(x / m)` with mathematical notations. Assumes `x + m` does not overflow. /// Returns `ceil(x / m)` in mathematical notations (not Rust code).
///
/// # Preconditions
///
/// - `x + m` does not overflow.
const fn div_ceil(x: usize, m: usize) -> usize { const fn div_ceil(x: usize, m: usize) -> usize {
(x + m - 1) / m (x + m - 1) / m
} }