broken cbfa to fix for a while

This commit is contained in:
FantasyPvP
2023-11-26 13:34:53 +00:00
parent b28b53418a
commit b16ce4a6f2
21 changed files with 86 additions and 601 deletions
+4 -17
View File
@@ -6,15 +6,15 @@
use bootloader::{entry_point, BootInfo};
use core::panic::PanicInfo;
use CrystalOS::kernel::tasks::{executor::Executor, Task};
use CrystalOS::{kernel, print, print_log, printerr, println, println_log};
use CrystalOS::std::tasks::{Executor, Task};
use CrystalOS::{print, print_log, printerr, println, println_log, std::syscall};
extern crate alloc;
use CrystalOS::user::bin::shell;
#[cfg(not(test))]
#[panic_handler]
fn panic(_info: &PanicInfo) -> ! {
kernel::render::RENDERER.lock().terminal_mode_force();
syscall::terminal_mode_force();
printerr!("{}", _info);
CrystalOS::hlt();
}
@@ -28,23 +28,10 @@ fn panic(info: &PanicInfo) -> ! {
entry_point!(main);
fn main(boot_info: &'static BootInfo) -> ! {
use x86_64::VirtAddr;
use CrystalOS::kernel::allocator;
use CrystalOS::kernel::memory;
use CrystalOS::kernel::memory::BootInfoFrameAllocator;
CrystalOS::init();
let physical_memory_offset = VirtAddr::new(boot_info.physical_memory_offset);
let mut mapper = unsafe { memory::init(physical_memory_offset) };
let mut frame_allocator = unsafe { BootInfoFrameAllocator::init(&boot_info.memory_map) };
allocator::init_heap(&mut mapper, &mut frame_allocator).expect("heap initialisation failed");
CrystalOS::start(boot_info);
let mut executor = Executor::new();
executor.spawn(Task::new(shell::command_handler()));
loop {
executor.try_run();
}