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

fix sector::Address::with_block_size

Browse source
This commit is contained in:
Szymon Walter 2018-03-20 13:42:52 +01:00
parent 6c2dc293e0
commit 2a755f740d
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/sector.rs
View file

@ -62,14 +62,17 @@ impl<S: Size> Address<S> {
pub fn with_block_size( pub fn with_block_size(
block: usize, block: usize,
offset: usize, offset: isize,
log_block_size: u32, log_block_size: u32,
) -> Address<S> { ) -> Address<S> {
let block = (block as isize + (offset >> log_block_size)) as usize;
let offset = offset.abs() as usize & ((1 << log_block_size) - 1);
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 & ((1 << log_block_size) - 1); let offset = offset & ((1 << S::LOG_SIZE) - 1);
let sector = block << log_diff | top_offset; let sector = block << log_diff | top_offset;
Address::new(sector, offset as isize) unsafe { Address::new_unchecked(sector, offset) }
} }
pub fn index64(&self) -> u64 { pub fn index64(&self) -> u64 {
@ -204,6 +207,14 @@ mod tests {
Address::<Size512>::with_block_size(1, 256, 10).into_index(), Address::<Size512>::with_block_size(1, 256, 10).into_index(),
Some(1024 + 256) Some(1024 + 256)
); );
assert_eq!(
Address::<Size512>::with_block_size(2, 0, 10).into_index(),
Some(2048)
);
assert_eq!(
Address::<Size512>::with_block_size(0, 1792, 10).into_index(),
Some(1792)
);
} }
#[test] #[test]