michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-17 23:07:50 +00:00
Code Issues Projects Releases Wiki Activity

Make translate and map_to safe by making them RecursivePageTable methods

Browse Source
This commit is contained in:
Philipp Oppermann
2015-12-09 01:01:32 +01:00
parent fb7d2d22b6
commit 86d8e99271
1 changed files with 49 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/memory/paging/mod.rs
View File

@@ -57,17 +57,15 @@ impl RecursivePageTable {
fn p4_mut(&mut self) -> &mut Table<Level4> { fn p4_mut(&mut self) -> &mut Table<Level4> {
unsafe { self.p4.get_mut() } unsafe { self.p4.get_mut() }
} }
}
pub unsafe fn translate(virtual_address: VirtualAddress) -> Option<PhysicalAddress> { pub fn translate(&self, virtual_address: VirtualAddress) -> Option<PhysicalAddress> {
let offset = virtual_address % PAGE_SIZE; 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) .map(|frame| frame.number * PAGE_SIZE + offset)
} }
unsafe fn translate_page(page: Page) -> Option<Frame> { fn translate_page(&self, page: Page) -> Option<Frame> {
let p3 = self.p4().next_table(page.p4_index());
let p3 = unsafe { &*table::P4 }.next_table(page.p4_index());
let huge_page = || { let huge_page = || {
p3.and_then(|p3| { p3.and_then(|p3| {
@@ -102,16 +100,16 @@ unsafe fn translate_page(page: Page) -> Option<Frame> {
.and_then(|p2| p2.next_table(page.p2_index())) .and_then(|p2| p2.next_table(page.p2_index()))
.and_then(|p1| p1[page.p1_index()].pointed_frame()) .and_then(|p1| p1[page.p1_index()].pointed_frame())
.or_else(huge_page) .or_else(huge_page)
} }
pub unsafe fn map_to<A>(page: Page, frame: Frame, flags: EntryFlags, allocator: &mut A) pub fn map_to<A>(&mut self, page: Page, frame: Frame, flags: EntryFlags, allocator: &mut A)
where A: FrameAllocator where A: FrameAllocator
{ {
let p4 = unsafe { &mut *table::P4 }; let mut p3 = self.p4_mut().next_table_create(page.p4_index(), allocator);
let mut p3 = p4.next_table_create(page.p4_index(), allocator);
let mut p2 = p3.next_table_create(page.p3_index(), allocator); let mut p2 = p3.next_table_create(page.p3_index(), allocator);
let mut p1 = p2.next_table_create(page.p2_index(), allocator); let mut p1 = p2.next_table_create(page.p2_index(), allocator);
assert!(p1[page.p1_index()].is_unused()); assert!(p1[page.p1_index()].is_unused());
p1[page.p1_index()].set(frame, flags | PRESENT); p1[page.p1_index()].set(frame, flags | PRESENT);
}
} }