From fa3b572d6851c6df292d887834a47b50d779eb4d Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Tue, 18 Apr 2017 12:22:36 +0200 Subject: [PATCH] Only print kernel/multiboot start/end in rust_main --- src/lib.rs | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index c9098da..c56d602 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -26,21 +26,8 @@ pub extern fn rust_main(multiboot_information_address: usize) { let boot_info = unsafe{ multiboot2::load(multiboot_information_address) }; let memory_map_tag = boot_info.memory_map_tag() .expect("Memory map tag required"); - - println!("memory areas:"); - for area in memory_map_tag.memory_areas() { - println!(" start: 0x{:x}, length: 0x{:x}", - area.base_addr, area.length); - } - let elf_sections_tag = boot_info.elf_sections_tag() - .expect("Elf-sections tag required"); - - println!("kernel sections:"); - for section in elf_sections_tag.sections() { - println!(" addr: 0x{:x}, size: 0x{:x}, flags: 0x{:x}", - section.addr, section.size, section.flags); - } + .expect("Elf sections tag required"); let kernel_start = elf_sections_tag.sections().map(|s| s.addr) .min().unwrap(); @@ -49,6 +36,11 @@ pub extern fn rust_main(multiboot_information_address: usize) { let multiboot_start = multiboot_information_address; let multiboot_end = multiboot_start + (boot_info.total_size as usize); + println!("kernel start: 0x{:x}, kernel end: 0x{:x}", + kernel_start, kernel_end); + println!("multiboot start: 0x{:x}, multiboot end: 0x{:x}", + multiboot_start, multiboot_end); + let mut frame_allocator = memory::AreaFrameAllocator::new( kernel_start as usize, kernel_end as usize, multiboot_start, multiboot_end, memory_map_tag.memory_areas());