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

wip

Browse Source
This commit is contained in:
Philipp Oppermann
2015-09-06 10:15:54 +02:00
parent d27d36fdd0
commit 10ddcead2d
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib.rs
View File

@@ -34,9 +34,11 @@ pub extern fn rust_main(multiboot_address: usize) {
use vga_buffer::{Writer, Color}; use vga_buffer::{Writer, Color};
vga_buffer::clear_screen(); vga_buffer::clear_screen();
let multiboot = unsafe{multiboot2::load(multiboot_address)}; if let Some(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');

26
src/memory/mod.rs
View File

@@ -14,8 +14,6 @@ pub fn init(multiboot: &Multiboot) {
let mut c = unsafe{paging::Controller::new(allocator)}; let mut c = unsafe{paging::Controller::new(allocator)};
c.begin_new_table(); c.begin_new_table();
c.identity_map(Page{number: 0xb8}, true, false);
for section in multiboot.elf_tag().unwrap().sections() { for section in multiboot.elf_tag().unwrap().sections() {
let in_memory = section.flags & 0x2 != 0; let in_memory = section.flags & 0x2 != 0;
@@ -32,7 +30,25 @@ pub fn init(multiboot: &Multiboot) {
c.identity_map(page, writable, executable); c.identity_map(page, writable, executable);
} }
} }
// identity map VGA text buffer
c.identity_map(Page{number: 0xb8}, true, false);
// identity map Multiboot structure
let multiboot_address = multiboot as *const _ as usize;
let start_page = Page::containing_address(multiboot_address);
let end_page = Page::containing_address(multiboot_address + multiboot.total_size as usize);
for page in range_inclusive(start_page.number, end_page.number).map(|n| Page{number: n}) {
c.identity_map(page, false, false);
}
c.activate_new_table(); c.activate_new_table();
let maximal_memory = multiboot.memory_area_tag().unwrap().areas().map(
|area| area.base_addr + area.length).max().unwrap();
println!("maximal_memory: 0x{:x}", maximal_memory);
let core_map = allocator.allocate_frames((maximal_memory / paging::PAGE_SIZE) as usize);
} }
struct VirtualAddress(*const u8); struct VirtualAddress(*const u8);
@@ -50,8 +66,12 @@ impl FrameAllocator {
} }
fn allocate_frame(&mut self) -> Option<Frame> { fn allocate_frame(&mut self) -> Option<Frame> {
self.allocate_frames(1)
}
fn allocate_frames(&mut self, number: usize) -> Option<Frame> {
let page_number = self.next_free_frame; let page_number = self.next_free_frame;
self.next_free_frame += 1; self.next_free_frame += number;
Some(Frame { Some(Frame {
number: page_number number: page_number
}) })