michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 22:37:49 +00:00
Code Issues Projects Releases Wiki Activity

Split translate into translate_page and rest

Browse Source
This commit is contained in:
Philipp Oppermann
2015-12-04 11:50:42 +01:00
parent 44fd5f682d
commit 6c5b932fbc
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/memory/paging/translate.rs
View File

@@ -4,9 +4,12 @@ use super::entry::{PRESENT, HUGE_PAGE};
use memory::Frame; use memory::Frame;
pub fn translate(virtual_address: VirtualAddress) -> Option<PhysicalAddress> { pub fn translate(virtual_address: VirtualAddress) -> Option<PhysicalAddress> {
let page = Page::containing_address(virtual_address);
let offset = virtual_address % PAGE_SIZE; let offset = virtual_address % PAGE_SIZE;
translate_page(Page::containing_address(virtual_address))
.map(|frame| frame.number * PAGE_SIZE + offset)
}
fn translate_page(page: Page) -> Option<Frame> {
let p4 = unsafe { &*P4 }; let p4 = unsafe { &*P4 };
let huge_page = || { let huge_page = || {
@@ -38,5 +41,4 @@ pub fn translate(virtual_address: VirtualAddress) -> Option<PhysicalAddress> {
.and_then(|p2| p2.next_table(page.p2_index())) .and_then(|p2| p2.next_table(page.p2_index()))
.map(|p1| p1[page.p1_index()].pointed_frame()) .map(|p1| p1[page.p1_index()].pointed_frame())
.or_else(huge_page) .or_else(huge_page)
.map(|frame| frame.number * PAGE_SIZE + offset)
} }