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

Update kernel_main to use MapperAllSizes::translate_addr

Browse Source
This commit is contained in:
Philipp Oppermann
2019-03-13 14:12:28 +01:00
parent 98b5976656
commit cb4410c84e
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.rs
View File

@@ -11,8 +11,8 @@ entry_point!(kernel_main);
#[cfg(not(test))] #[cfg(not(test))]
fn kernel_main(boot_info: &'static BootInfo) -> ! { fn kernel_main(boot_info: &'static BootInfo) -> ! {
use blog_os::interrupts::PICS; use blog_os::interrupts::PICS;
use blog_os::memory::translate_addr; use blog_os::memory;
use x86_64::VirtAddr; use x86_64::{structures::paging::MapperAllSizes, VirtAddr};
println!("Hello World{}", "!"); println!("Hello World{}", "!");
@@ -21,6 +21,8 @@ fn kernel_main(boot_info: &'static BootInfo) -> ! {
unsafe { PICS.lock().initialize() }; unsafe { PICS.lock().initialize() };
x86_64::instructions::interrupts::enable(); x86_64::instructions::interrupts::enable();
let mapper = unsafe { memory::init(boot_info.physical_memory_offset) };
let addresses = [ let addresses = [
// the identity-mapped vga buffer page // the identity-mapped vga buffer page
0xb8000, 0xb8000,
@@ -34,7 +36,7 @@ fn kernel_main(boot_info: &'static BootInfo) -> ! {
for &address in &addresses { for &address in &addresses {
let virt = VirtAddr::new(address); let virt = VirtAddr::new(address);
let phys = unsafe { translate_addr(virt, boot_info.physical_memory_offset) }; let phys = mapper.translate_addr(virt);
println!("{:?} -> {:?}", virt, phys); println!("{:?} -> {:?}", virt, phys);
} }