Tateisi/rcore-tutorial
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix issue #123

Browse source
This commit is contained in:
Yifan Wu 2023-05-31 21:17:53 +08:00
parent 45477b345f
commit 90e969c0ae
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
os/src/mm/address.rs
View file

@ -103,8 +103,12 @@ impl VirtAddr {
VirtPageNum(self.0 / PAGE_SIZE) VirtPageNum(self.0 / PAGE_SIZE)
} }
pub fn ceil(&self) -> VirtPageNum { pub fn ceil(&self) -> VirtPageNum {
if self.0 == 0 {
VirtPageNum(0)
} else {
VirtPageNum((self.0 - 1 + PAGE_SIZE) / PAGE_SIZE) VirtPageNum((self.0 - 1 + PAGE_SIZE) / PAGE_SIZE)
} }
}
pub fn page_offset(&self) -> usize { pub fn page_offset(&self) -> usize {
self.0 & (PAGE_SIZE - 1) self.0 & (PAGE_SIZE - 1)
} }
@ -128,8 +132,12 @@ impl PhysAddr {
PhysPageNum(self.0 / PAGE_SIZE) PhysPageNum(self.0 / PAGE_SIZE)
} }
pub fn ceil(&self) -> PhysPageNum { pub fn ceil(&self) -> PhysPageNum {
if self.0 == 0 {
PhysPageNum(0)
} else {
PhysPageNum((self.0 - 1 + PAGE_SIZE) / PAGE_SIZE) PhysPageNum((self.0 - 1 + PAGE_SIZE) / PAGE_SIZE)
} }
}
pub fn page_offset(&self) -> usize { pub fn page_offset(&self) -> usize {
self.0 & (PAGE_SIZE - 1) self.0 & (PAGE_SIZE - 1)
} }