Make translate and map_to safe by making them methods of a new ActivePageTable struct

src/memory/paging/mod.rs

@@ -1,5 +1,7 @@
-use memory::{PAGE_SIZE, Frame, FrameAllocator};
 pub use self::entry::*;
+use core::ptr::Unique;
+use memory::{PAGE_SIZE, Frame, FrameAllocator};
+use self::table::{Table, Level4};
 
 mod entry;
 mod table;
@@ -37,19 +39,37 @@ impl Page {
     fn p1_index(&self) -> usize {
         (self.number >> 0) & 0o777
     }
-
 }
 
-pub fn translate(virtual_address: VirtualAddress) -> Option<PhysicalAddress> {
+pub struct ActivePageTable {
+    p4: Unique<Table<Level4>>,
+}
+
+impl ActivePageTable {
+    pub unsafe fn new() -> ActivePageTable {
+        ActivePageTable {
+            p4: Unique::new_unchecked(table::P4),
+        }
+    }
+
+    fn p4(&self) -> &Table<Level4> {
+        unsafe { self.p4.as_ref() }
+    }
+
+    fn p4_mut(&mut self) -> &mut Table<Level4> {
+        unsafe { self.p4.as_mut() }
+    }
+
+    pub fn translate(&self, virtual_address: VirtualAddress) -> Option<PhysicalAddress> {
         let offset = virtual_address % PAGE_SIZE;
-    translate_page(Page::containing_address(virtual_address))
+        self.translate_page(Page::containing_address(virtual_address))
             .map(|frame| frame.number * PAGE_SIZE + offset)
     }
 
-fn translate_page(page: Page) -> Option<Frame> {
+    fn translate_page(&self, page: Page) -> Option<Frame> {
         use self::entry::HUGE_PAGE;
 
-    let p3 = unsafe { &*table::P4 }.next_table(page.p4_index());
+        let p3 = self.p4().next_table(page.p4_index());
 
         let huge_page = || {
             p3.and_then(|p3| {
@@ -88,11 +108,11 @@ fn translate_page(page: Page) -> Option<Frame> {
         .or_else(huge_page)
     }
 
-pub fn map_to<A>(page: Page, frame: Frame, flags: EntryFlags,
+    pub fn map_to<A>(&mut self, page: Page, frame: Frame, flags: EntryFlags,
                     allocator: &mut A)
         where A: FrameAllocator
     {
-    let p4 = unsafe { &mut *table::P4 };
+        let p4 = self.p4_mut();
         let mut p3 = p4.next_table_create(page.p4_index(), allocator);
         let mut p2 = p3.next_table_create(page.p3_index(), allocator);
         let mut p1 = p2.next_table_create(page.p2_index(), allocator);
@@ -100,3 +120,4 @@ pub fn map_to<A>(page: Page, frame: Frame, flags: EntryFlags,
         assert!(p1[page.p1_index()].is_unused());
         p1[page.p1_index()].set(frame, flags | PRESENT);
     }
+}