From 1007c5157d8cef0cfafc639e6df8d58216bb3e2d Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Thu, 13 Apr 2017 19:44:36 +0200
Subject: [PATCH] Remove paging testing code again

---
 src/lib.rs                         |  2 --
 src/memory/area_frame_allocator.rs |  2 +-
 src/memory/mod.rs                  |  1 -
 src/memory/paging/mod.rs           | 27 ---------------------------
 4 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 9cb01ff..54d82a8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -53,8 +53,6 @@ pub extern fn rust_main(multiboot_information_address: usize) {
         kernel_start as usize, kernel_end as usize, multiboot_start,
         multiboot_end, memory_map_tag.memory_areas());
 
-    memory::test_paging(&mut frame_allocator);
-
     loop{}
 }
 
diff --git a/src/memory/area_frame_allocator.rs b/src/memory/area_frame_allocator.rs
index a13fcf5..a0269ee 100644
--- a/src/memory/area_frame_allocator.rs
+++ b/src/memory/area_frame_allocator.rs
@@ -50,7 +50,7 @@ impl FrameAllocator for AreaFrameAllocator {
     }
 
     fn deallocate_frame(&mut self, _frame: Frame) {
-        //unimplemented!()
+        unimplemented!()
     }
 }
 
diff --git a/src/memory/mod.rs b/src/memory/mod.rs
index 02dbf6a..98b36e0 100644
--- a/src/memory/mod.rs
+++ b/src/memory/mod.rs
@@ -1,5 +1,4 @@
 pub use self::area_frame_allocator::AreaFrameAllocator;
-pub use self::paging::test_paging;
 use self::paging::PhysicalAddress;
 
 mod area_frame_allocator;
diff --git a/src/memory/paging/mod.rs b/src/memory/paging/mod.rs
index 25950fe..a096654 100644
--- a/src/memory/paging/mod.rs
+++ b/src/memory/paging/mod.rs
@@ -155,30 +155,3 @@ impl ActivePageTable {
         //allocator.deallocate_frame(frame);
     }
 }
-
-pub fn test_paging<A>(allocator: &mut A)
-    where A: FrameAllocator
-{
-    let mut page_table = unsafe { ActivePageTable::new() };
-
-    let addr = 42 * 512 * 512 * 4096; // 42th P3 entry
-    let page = Page::containing_address(addr);
-    let frame = allocator.allocate_frame().expect("no more frames");
-    println!("None = {:?}, map to {:?}",
-            page_table.translate(addr),
-            frame);
-    page_table.map_to(page, frame, EntryFlags::empty(), allocator);
-    println!("Some = {:?}", page_table.translate(addr));
-    println!("next free frame: {:?}", allocator.allocate_frame());
-
-    println!("{:#x}", unsafe {
-        *(Page::containing_address(addr).start_address() as *const u64)
-    });
-
-    page_table.unmap(Page::containing_address(addr), allocator);
-    println!("None = {:?}", page_table.translate(addr));
-
-    println!("{:#x}", unsafe {
-        *(Page::containing_address(addr).start_address() as *const u64)
-    });
-}