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

Update to latest bootloader prototype

Browse Source
This commit is contained in:
Philipp Oppermann
2020-09-09 15:31:43 +02:00
parent a38fe2cd0b
commit 261f4d0649
13 changed files with 491 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/heap_allocation.rs
View File

@@ -19,9 +19,9 @@ fn main(boot_info: &'static BootInfo) -> ! {
use x86_64::VirtAddr;
blog_os::init();
let phys_mem_offset = VirtAddr::new(boot_info.physical_memory_offset);
let phys_mem_offset = VirtAddr::new(boot_info.physical_memory_offset.unwrap());
let mut mapper = unsafe { memory::init(phys_mem_offset) };
let mut frame_allocator = unsafe { BootInfoFrameAllocator::init(&boot_info.memory_map) };
let mut frame_allocator = unsafe { BootInfoFrameAllocator::init(&boot_info.memory_regions) };
allocator::init_heap(&mut mapper, &mut frame_allocator).expect("heap initialization failed");
test_main();