able/ext2-rs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix with_block_size

Browse source
This commit is contained in:
Szymon Walter 2018-03-20 12:35:05 +01:00
parent 7c57c047bc
commit 764c4de6bf
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/block.rs
View file

@ -61,7 +61,7 @@ impl<S: Size> Address<S> {
) -> Address<S> { ) -> Address<S> {
let log_diff = log_block_size as isize - S::LOG_SIZE as isize; let log_diff = log_block_size as isize - S::LOG_SIZE as isize;
let top_offset = offset >> S::LOG_SIZE; let top_offset = offset >> S::LOG_SIZE;
let offset = offset >> log_diff; let offset = offset & ((1 << log_block_size) - 1);
let block = block << log_diff | top_offset; let block = block << log_diff | top_offset;
Address::new(block, offset as isize) Address::new(block, offset as isize)
} }
@ -187,6 +187,19 @@ impl<S: Size> Sub for Address<S> {
mod tests { mod tests {
use super::*; use super::*;
#[test]
fn conv() {
assert_eq!(Address::<Size512>::new(0, 1024).into_index(), Some(1024));
assert_eq!(
Address::<Size512>::from(1024_usize).into_index(),
Some(1024)
);
assert_eq!(
Address::<Size512>::with_block_size(1, 256, 10).into_index(),
Some(1024 + 256)
);
}
#[test] #[test]
fn arithmetic() { fn arithmetic() {
assert_eq!( assert_eq!(