Skip to content

Commit 09b1a21

Browse files
committed
fix offsets
1 parent f8b2168 commit 09b1a21

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

src/structures/paging/mapper/mapped_page_table.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -588,8 +588,8 @@ impl<'a, P: PageTableFrameMapping> Mapper<Size1GiB> for MappedPageTable<'a, P> {
588588
self.map_to_range_1gib(
589589
pages,
590590
|page, _| {
591-
let offset = pages.start - page;
592-
Some(frames.start + (offset / Size1GiB::SIZE))
591+
let offset = page - pages.start;
592+
Some(frames.start + offset)
593593
},
594594
flags,
595595
parent_table_flags,
@@ -790,8 +790,8 @@ impl<'a, P: PageTableFrameMapping> Mapper<Size2MiB> for MappedPageTable<'a, P> {
790790
self.map_range_2mib(
791791
pages,
792792
|page, _| {
793-
let offset = pages.start - page;
794-
Some(frames.start + (offset / Size2MiB::SIZE))
793+
let offset = page - pages.start;
794+
Some(frames.start + offset)
795795
},
796796
flags,
797797
parent_table_flags,
@@ -1012,8 +1012,8 @@ impl<'a, P: PageTableFrameMapping> Mapper<Size4KiB> for MappedPageTable<'a, P> {
10121012
self.map_to_range_4kib(
10131013
pages,
10141014
|page, _| {
1015-
let offset = pages.start - page;
1016-
Some(frames.start + (offset / Size4KiB::SIZE))
1015+
let offset = page - pages.start;
1016+
Some(frames.start + offset)
10171017
},
10181018
flags,
10191019
parent_table_flags,

src/structures/paging/mapper/recursive_page_table.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -757,8 +757,8 @@ impl<'a> Mapper<Size1GiB> for RecursivePageTable<'a> {
757757
self.map_to_range_1gib(
758758
pages,
759759
|page, _| {
760-
let offset = pages.start - page;
761-
Some(frames.start + (offset / Size1GiB::SIZE))
760+
let offset = page - pages.start;
761+
Some(frames.start + offset)
762762
},
763763
flags,
764764
parent_table_flags,
@@ -973,8 +973,8 @@ impl<'a> Mapper<Size2MiB> for RecursivePageTable<'a> {
973973
self.map_range_2mib(
974974
pages,
975975
|page, _| {
976-
let offset = pages.start - page;
977-
Some(frames.start + (offset / Size2MiB::SIZE))
976+
let offset = page - pages.start;
977+
Some(frames.start + offset)
978978
},
979979
flags,
980980
parent_table_flags,
@@ -1224,8 +1224,8 @@ impl<'a> Mapper<Size4KiB> for RecursivePageTable<'a> {
12241224
self.map_to_range_4kib(
12251225
pages,
12261226
|page, _| {
1227-
let offset = pages.start - page;
1228-
Some(frames.start + (offset / Size4KiB::SIZE))
1227+
let offset = page - pages.start;
1228+
Some(frames.start + offset)
12291229
},
12301230
flags,
12311231
parent_table_flags,

0 commit comments

Comments
 (0)