andrey/rCore-Tutorial-v3
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore-Tutorial-v3.git synced 2024-11-25 02:46:23 +04:00
Code Issues Projects Releases Wiki Activity

Fix issue #123

Browse Source
This commit is contained in:
Yifan Wu 2023-05-31 21:17:53 +08:00
parent e9e7a2856e
commit 1dda82bd58
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
os/src/mm/address.rs
View File

@ -101,7 +101,11 @@ impl VirtAddr {
VirtPageNum(self.0 / PAGE_SIZE) VirtPageNum(self.0 / PAGE_SIZE)
} }
pub fn ceil(&self) -> VirtPageNum { pub fn ceil(&self) -> VirtPageNum {
VirtPageNum((self.0 - 1 + PAGE_SIZE) / PAGE_SIZE) if self.0 == 0 {
VirtPageNum(0)
} else {
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)
@ -126,7 +130,11 @@ impl PhysAddr {
PhysPageNum(self.0 / PAGE_SIZE) PhysPageNum(self.0 / PAGE_SIZE)
} }
pub fn ceil(&self) -> PhysPageNum { pub fn ceil(&self) -> PhysPageNum {
PhysPageNum((self.0 - 1 + PAGE_SIZE) / PAGE_SIZE) if self.0 == 0 {
PhysPageNum(0)
} else {
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)