michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 22:37:49 +00:00
Code Issues Projects Releases Wiki Activity

Modify pointed_frame to return an Option

Browse Source
This commit is contained in:
Philipp Oppermann
2015-12-04 13:11:18 +01:00
parent 2d9b619587
commit 7e5da6c897
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/memory/paging/entry.rs
View File

@@ -15,8 +15,12 @@ impl Entry {
EntryFlags::from_bits_truncate(self.0)
}
pub fn pointed_frame(&self) -> Frame {
Frame { number: ((self.0 & 0x000fffff_fffff000) >> 12) as usize }
pub fn pointed_frame(&self) -> Option<Frame> {
if self.flags().contains(PRESENT) {
Some(Frame { number: ((self.0 & 0x000fffff_fffff000) >> 12) as usize })
} else {
None
}
}
pub fn set(&mut self, frame: Frame, flags: EntryFlags) {