From c52f58cc4ccec8371b45f3adf45832810e528a70 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Sat, 5 Dec 2015 01:00:13 +0100 Subject: [PATCH] Rename and use `is_unused()` --- posts/DRAFT-paging.md | 2 +- src/memory/paging/entry.rs | 2 +- src/memory/paging/mapping.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/posts/DRAFT-paging.md b/posts/DRAFT-paging.md index cd288ac5..33c5bcae 100644 --- a/posts/DRAFT-paging.md +++ b/posts/DRAFT-paging.md @@ -32,7 +32,7 @@ use memory::Frame; // needed later pub struct Entry(u64); impl Entry { - pub fn unused(&self) -> bool { + pub fn is_unused(&self) -> bool { self.0 == 0 } diff --git a/src/memory/paging/entry.rs b/src/memory/paging/entry.rs index e08ba9a5..1048f469 100644 --- a/src/memory/paging/entry.rs +++ b/src/memory/paging/entry.rs @@ -4,7 +4,7 @@ use memory::paging::PhysicalAddress; pub struct Entry(u64); impl Entry { - pub fn unused(&self) -> bool { + pub fn is_unused(&self) -> bool { self.0 == 0 } diff --git a/src/memory/paging/mapping.rs b/src/memory/paging/mapping.rs index 8a6af29f..faa7c602 100644 --- a/src/memory/paging/mapping.rs +++ b/src/memory/paging/mapping.rs @@ -19,6 +19,6 @@ pub fn map_to(page: &Page, frame: Frame, flags: EntryFlags, allocator: &mut A let mut p2 = p3.next_table_create(page.p3_index(), allocator); let mut p1 = p2.next_table_create(page.p2_index(), allocator); - assert!(!p1[page.p1_index()].flags().contains(PRESENT)); + assert!(p1[page.p1_index()].is_unused()); p1[page.p1_index()].set(frame, flags | PRESENT); }