feat(paging): map kernel using elf section flags

Signed-off-by: Julien CLEMENT <julien.clement@epita.fr>
This commit is contained in:
juju committed 2021-12-08 16:20:38 +01:00
1 parent 5e994b9dff
commit 5ff8596233
2 files changed
+37 -8

No files matched your search

+14 -3
View File
@@ -12,6 +12,8 @@ extern crate multiboot2;
use core::panic::PanicInfo;
use vga::{Color, ColorCode};
use memory::paging::{Size4KiB, FrameAllocator};
use multiboot2::BootInformation;
#[panic_handler]
fn panic_handler(info: &PanicInfo) -> ! {
@@ -26,14 +28,24 @@ pub fn hlt_loop() -> ! {
}
}
pub fn init() {
pub fn init<A>(frame_allocator: &mut A, boot_info: &BootInformation)
where A: FrameAllocator<Size4KiB>
{
vga::change_color(ColorCode::new(Color::LightCyan, Color::Black));
println!("Starting init");
enable_nxe_bit();
memory::kernel_remap(frame_allocator, boot_info);
gdt::init_gdt();
interrupts::init_idt();
vga::change_color(ColorCode::new(Color::LightGreen, Color::Black));
}
fn enable_nxe_bit() {
println!("Enabling nxe bit");
use x86_64::registers::control::{Efer, EferFlags};
unsafe { Efer::update(|efer| *efer |= EferFlags::NO_EXECUTE_ENABLE) }
}
fn get_frame_allocator(multiboot_info_addr: usize) -> memory::AreaFrameAllocator {
let boot_info = unsafe { multiboot2::load(multiboot_info_addr) };
let memory_map_tag = boot_info.memory_map_tag().expect("Memory map tag required");
@@ -62,9 +74,8 @@ pub extern "C" fn julios_main(multiboot_info_addr: usize) -> ! {
let mut frame_allocator = get_frame_allocator(multiboot_info_addr);
memory::kernel_remap(&mut frame_allocator, boot_info);
init();
init(&mut frame_allocator, &boot_info);
println!("***JuliOS V0.1.0***");
serial_println!("Hello serial");
memory::paging::test_paging(&mut frame_allocator);
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.