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

Switch to new multiboot2 crate

Browse Source
This commit is contained in:
Philipp Oppermann
2015-11-12 17:06:07 +01:00
parent a4835b6778
commit ca42c45c5e
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -15,7 +15,7 @@ git = "https://github.com/phil-opp/bitflags.git"
branch = "no_std" branch = "no_std"
[dependencies.multiboot2] [dependencies.multiboot2]
path = "../multiboot2" git = "https://github.com/phil-opp/multiboot2-elf64"
[dependencies.allocator] [dependencies.allocator]
path = "src/memory/alloc/allocator" path = "src/memory/alloc/allocator"

7
src/lib.rs
View File

@@ -40,11 +40,8 @@ pub extern fn rust_main(multiboot_address: usize) {
use alloc::boxed::Box; use alloc::boxed::Box;
vga_buffer::clear_screen(); vga_buffer::clear_screen();
if let Some(multiboot) = unsafe{multiboot2::load(multiboot_address)} { let multiboot = unsafe{multiboot2::load(multiboot_address)};
memory::init(multiboot); memory::init(multiboot);
} else {
println!("MULTIBOOT INOFORMATION STRUCTURE INVALID");
}
let mut writer = Writer::new(Color::Blue, Color::LightGreen); let mut writer = Writer::new(Color::Blue, Color::LightGreen);
writer.write_byte(b'H'); writer.write_byte(b'H');

8
src/memory/mod.rs
View File

@@ -14,7 +14,7 @@ pub fn init(multiboot: &Multiboot) {
use core::cmp::max; use core::cmp::max;
use self::frame_allocator::FrameAllocator; use self::frame_allocator::FrameAllocator;
let kernel_end = multiboot.elf_tag().unwrap().sections().map(|s| s.addr + s.size).max() let kernel_end = multiboot.elf_sections_tag().unwrap().sections().map(|s| s.addr + s.size).max()
.unwrap() as usize; .unwrap() as usize;
let multiboot_end = multiboot as *const _ as usize + multiboot.total_size as usize; let multiboot_end = multiboot as *const _ as usize + multiboot.total_size as usize;
let mut bump_pointer = BumpPointer::new(max(kernel_end, multiboot_end)); let mut bump_pointer = BumpPointer::new(max(kernel_end, multiboot_end));
@@ -29,7 +29,7 @@ pub fn init(multiboot: &Multiboot) {
let frame_stack = init_core_map(multiboot, &mut lock, bump_pointer); let frame_stack = init_core_map(multiboot, &mut lock, bump_pointer);
let maximal_memory = multiboot.memory_area_tag().unwrap().areas().map( let maximal_memory = multiboot.memory_area_tag().unwrap().memory_areas().map(
|area| area.base_addr + area.length).max().unwrap(); |area| area.base_addr + area.length).max().unwrap();
println!("maximal_memory: 0x{:x}", maximal_memory); println!("maximal_memory: 0x{:x}", maximal_memory);
alloc::init(lock, frame_stack); alloc::init(lock, frame_stack);
@@ -41,7 +41,7 @@ fn identity_map_kernel_sections<T>(multiboot: &Multiboot, mut mapper: paging::Ma
{ {
use core::iter::range_inclusive; use core::iter::range_inclusive;
for section in multiboot.elf_tag().expect("no section tag").sections() { for section in multiboot.elf_sections_tag().expect("no section tag").sections() {
let in_memory = section.flags & 0x2 != 0; let in_memory = section.flags & 0x2 != 0;
let writable = section.flags & 0x1 != 0; let writable = section.flags & 0x1 != 0;
let executable = section.flags & 0x4 != 0; let executable = section.flags & 0x4 != 0;
@@ -84,7 +84,7 @@ fn init_core_map(multiboot: &Multiboot, lock: &mut paging::Lock,
lock.mapper(&mut bump_pointer).map(CORE_MAP_PAGE, true, false); lock.mapper(&mut bump_pointer).map(CORE_MAP_PAGE, true, false);
let mut frame_stack = DynamicFrameStack::new(CORE_MAP_PAGE); let mut frame_stack = DynamicFrameStack::new(CORE_MAP_PAGE);
for area in multiboot.memory_area_tag().expect("no memory tag").areas() { for area in multiboot.memory_area_tag().expect("no memory tag").memory_areas() {
println!("area start {:x} length {:x}", area.base_addr, area.length); println!("area start {:x} length {:x}", area.base_addr, area.length);
let start_frame = Frame::containing_address(area.base_addr as usize); let start_frame = Frame::containing_address(area.base_addr as usize);
let end_frame = Frame::containing_address((area.base_addr + area.length) as usize); let end_frame = Frame::containing_address((area.base_addr + area.length) as usize);