From ac6c1af84f0b1546f6f01e2a1b9149c349a2c049 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Fri, 1 Jan 2016 17:20:30 +0100 Subject: [PATCH] Remove test_paging function --- src/lib.rs | 2 -- src/memory/mod.rs | 1 - src/memory/paging/mod.rs | 31 ------------------------------- 3 files changed, 34 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 9d28ebcd..33e3f326 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -67,8 +67,6 @@ pub extern "C" fn rust_main(multiboot_information_address: usize) { multiboot_end, memory_map_tag.memory_areas()); - memory::test_paging(&mut frame_allocator); - enable_nxe_bit(); enable_write_protect_bit(); diff --git a/src/memory/mod.rs b/src/memory/mod.rs index b7c6044d..dc80ec73 100644 --- a/src/memory/mod.rs +++ b/src/memory/mod.rs @@ -8,7 +8,6 @@ // except according to those terms. pub use self::area_frame_allocator::AreaFrameAllocator; -pub use self::paging::test_paging; pub use self::paging::remap_the_kernel; use self::paging::PhysicalAddress; diff --git a/src/memory/paging/mod.rs b/src/memory/paging/mod.rs index aedc9ec2..cfac8430 100644 --- a/src/memory/paging/mod.rs +++ b/src/memory/paging/mod.rs @@ -141,37 +141,6 @@ impl InactivePageTable { } } -pub fn test_paging(allocator: &mut A) - where A: FrameAllocator -{ - let mut page_table = unsafe { ActivePageTable::new() }; - - // test translate - println!("Some = {:?}", page_table.translate(0)); - println!("Some = {:?}", page_table.translate(4096)); // second P1 entry - println!("Some = {:?}", page_table.translate(512 * 4096)); // second P2 entry - println!("Some = {:?}", page_table.translate(300 * 512 * 4096)); // 300th P2 entry - println!("None = {:?}", page_table.translate(512 * 512 * 4096)); // second P3 entry - println!("Some = {:?}", page_table.translate(512 * 512 * 4096 - 1)); // last mapped byte - - // test map_to - 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()); - - // test unmap - 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)); -} - pub fn remap_the_kernel(allocator: &mut A, boot_info: &BootInformation) where A: FrameAllocator {