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

Run rustfmt

Browse Source
This commit is contained in:
Philipp Oppermann
2015-12-20 15:05:08 +01:00
parent 52f239e5b4
commit 165e6ebff8
4 changed files with 66 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/lib.rs
View File

@@ -28,24 +28,28 @@ mod vga_buffer;
mod memory;
#[no_mangle]
pub extern fn rust_main(multiboot_information_address: usize) {
pub extern "C" fn rust_main(multiboot_information_address: usize) {
// ATTENTION: we have a very small stack and no guard page
vga_buffer::clear_screen();
println!("Hello World{}", "!");
let boot_info = unsafe{ multiboot2::load(multiboot_information_address) };
let boot_info = unsafe { multiboot2::load(multiboot_information_address) };
let memory_map_tag = boot_info.memory_map_tag().expect("Memory map tag required");
let elf_sections_tag = boot_info.elf_sections_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);
println!(" start: 0x{:x}, length: 0x{:x}",
area.base_addr,
area.length);
}
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);
section.addr,
section.size,
section.flags);
}
let kernel_start = elf_sections_tag.sections().map(|s| s.addr).min().unwrap();
@@ -54,25 +58,32 @@ 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);
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());
kernel_end as usize,
multiboot_start,
multiboot_end,
memory_map_tag.memory_areas());
memory::test_paging(&mut frame_allocator);
loop{}
loop {}
}
#[cfg(not(test))]
#[lang = "eh_personality"]
extern fn eh_personality() {}
extern "C" fn eh_personality() {}
#[cfg(not(test))]
#[lang = "panic_fmt"]
extern fn panic_fmt(fmt: core::fmt::Arguments, file: &str, line: u32) -> ! {
extern "C" fn panic_fmt(fmt: core::fmt::Arguments, file: &str, line: u32) -> ! {
println!("\n\nPANIC in {} at line {}:", file, line);
println!(" {}", fmt);
loop{}
loop {}
}