mirror of
https://github.com/phil-opp/blog_os.git
synced 2025-12-16 22:37:49 +00:00
Add remap_the_kernel function
This commit is contained in:
@@ -9,6 +9,7 @@
|
|||||||
|
|
||||||
#![feature(lang_items)]
|
#![feature(lang_items)]
|
||||||
#![feature(const_fn, unique)]
|
#![feature(const_fn, unique)]
|
||||||
|
#![feature(step_by)]
|
||||||
#![no_std]
|
#![no_std]
|
||||||
|
|
||||||
extern crate rlibc;
|
extern crate rlibc;
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ use self::temporary_page::TemporaryPage;
|
|||||||
pub use self::mapper::Mapper;
|
pub use self::mapper::Mapper;
|
||||||
use core::ops::{Deref, DerefMut};
|
use core::ops::{Deref, DerefMut};
|
||||||
use core::ptr::Unique;
|
use core::ptr::Unique;
|
||||||
|
use multiboot2::BootInformation;
|
||||||
|
|
||||||
mod entry;
|
mod entry;
|
||||||
mod table;
|
mod table;
|
||||||
@@ -160,3 +161,48 @@ pub fn test_paging<A>(allocator: &mut A)
|
|||||||
page_table.unmap(Page::containing_address(addr), allocator);
|
page_table.unmap(Page::containing_address(addr), allocator);
|
||||||
println!("None = {:?}", page_table.translate(addr));
|
println!("None = {:?}", page_table.translate(addr));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn remap_the_kernel<A>(allocator: &mut A, boot_info: &BootInformation)
|
||||||
|
where A: FrameAllocator
|
||||||
|
{
|
||||||
|
use core::ops::Range;
|
||||||
|
|
||||||
|
let mut temporary_page = TemporaryPage::new(Page { number: 0xcafebabe }, allocator);
|
||||||
|
|
||||||
|
let mut active_table = unsafe { ActivePageTable::new() };
|
||||||
|
let mut new_table = {
|
||||||
|
let frame = allocator.allocate_frame().expect("no more frames");
|
||||||
|
InactivePageTable::new(frame, &mut active_table, &mut temporary_page)
|
||||||
|
};
|
||||||
|
|
||||||
|
active_table.with(&mut new_table, &mut temporary_page, |mapper| {
|
||||||
|
let elf_sections_tag = boot_info.elf_sections_tag()
|
||||||
|
.expect("Memory map tag required");
|
||||||
|
|
||||||
|
for section in elf_sections_tag.sections() {
|
||||||
|
use multiboot2::ELF_SECTION_ALLOCATED;
|
||||||
|
use self::entry::WRITABLE;
|
||||||
|
|
||||||
|
if !section.flags().contains(ELF_SECTION_ALLOCATED) {
|
||||||
|
// section is not loaded to memory
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
println!("mapping section at addr: {:#x}, size: {:#x}",
|
||||||
|
section.addr,
|
||||||
|
section.size);
|
||||||
|
|
||||||
|
let flags = WRITABLE; // TODO use real section flags
|
||||||
|
|
||||||
|
let range = Range {
|
||||||
|
start: section.addr as usize,
|
||||||
|
end: (section.addr + section.size) as usize,
|
||||||
|
};
|
||||||
|
for address in range.step_by(PAGE_SIZE) {
|
||||||
|
assert!(address % PAGE_SIZE == 0, "sections need to be page aligned");
|
||||||
|
let frame = Frame::containing_address(address);
|
||||||
|
mapper.identity_map(frame, flags, allocator);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user