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

Improve huge_page closure

Browse Source
This commit is contained in:
Philipp Oppermann
2015-12-06 14:58:43 +01:00
parent 4aeda180a1
commit f912dfa506
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,25 +15,31 @@ fn translate_page(page: Page) -> Option<Frame> {
let huge_page = || { let huge_page = || {
p4.next_table(page.p4_index()) p4.next_table(page.p4_index())
.and_then(|p3| { .and_then(|p3| {
let p3_entry = &p3[page.p3_index()];
// 1GiB page? // 1GiB page?
if p3[page.p3_index()].flags().contains(HUGE_PAGE | PRESENT) { if let Some(start_frame) = p3_entry.pointed_frame() {
let start_frame_number = p3[page.p3_index()].pointed_frame().unwrap().number; if p3_entry.flags().contains(HUGE_PAGE) {
// address must be 1GiB aligned // address must be 1GiB aligned
assert!(start_frame_number % (ENTRY_COUNT * ENTRY_COUNT) == 0); assert!(start_frame.number % (ENTRY_COUNT * ENTRY_COUNT) == 0);
return Some(start_frame_number + page.p2_index() * ENTRY_COUNT + page.p1_index()); return Some(Frame {
number: start_frame.number + page.p2_index() * ENTRY_COUNT +
page.p1_index(),
});
}
} }
if let Some(p2) = p3.next_table(page.p3_index()) { if let Some(p2) = p3.next_table(page.p3_index()) {
let p2_entry = &p2[page.p2_index()];
// 2MiB page? // 2MiB page?
if p2[page.p2_index()].flags().contains(HUGE_PAGE | PRESENT) { if let Some(start_frame) = p2_entry.pointed_frame() {
let start_frame_number = p2[page.p2_index()].pointed_frame().unwrap().number; if p2_entry.flags().contains(HUGE_PAGE) {
// address must be 2MiB aligned // address must be 2MiB aligned
assert!(start_frame_number % ENTRY_COUNT == 0); assert!(start_frame.number % ENTRY_COUNT == 0);
return Some(start_frame_number + page.p1_index()); return Some(Frame { number: start_frame.number + page.p1_index() });
}
} }
} }
None None
}) })
.map(|start_frame_number| Frame { number: start_frame_number })
}; };
p4.next_table(page.p4_index()) p4.next_table(page.p4_index())