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

Fix page fault by mapping the complete heap

Browse Source
This commit is contained in:
Philipp Oppermann
2016-04-11 22:23:26 +02:00
parent fbc1c60164
commit eac60162ad
2 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/memory/mod.rs
View File

@@ -43,7 +43,18 @@ pub fn init(boot_info: &BootInformation) {
boot_info.start_address(), boot_info.end_address(),
memory_map_tag.memory_areas());
paging::remap_the_kernel(&mut frame_allocator, boot_info);
let mut active_table = paging::remap_the_kernel(&mut frame_allocator,
boot_info);
use self::paging::{Page, WRITABLE};
use bump_allocator::{HEAP_START, HEAP_SIZE};
let heap_start_page = Page::containing_address(HEAP_START);
let heap_end_page = Page::containing_address(HEAP_START + HEAP_SIZE-1);
for page in Page::range_inclusive(heap_start_page, heap_end_page) {
active_table.map(page, paging::WRITABLE, &mut frame_allocator);
}
}
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]