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

Refactor a bit

Browse Source
This commit is contained in:
Philipp Oppermann
2020-01-22 16:33:23 +01:00
parent ce1fdcf768
commit c3450b6df7
1 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main.rs
View File

@@ -10,7 +10,6 @@ use alloc::{boxed::Box, rc::Rc, vec, vec::Vec};
use blog_os::{print, println}; use blog_os::{print, println};
use bootloader::{entry_point, BootInfo}; use bootloader::{entry_point, BootInfo};
use core::panic::PanicInfo; use core::panic::PanicInfo;
use x86_64::structures::paging::{FrameAllocator, Mapper, Size4KiB};
entry_point!(kernel_main); entry_point!(kernel_main);
@@ -55,31 +54,16 @@ fn kernel_main(boot_info: &'static BootInfo) -> ! {
#[cfg(test)] #[cfg(test)]
test_main(); test_main();
create_thread(thread_1, &mut mapper, &mut frame_allocator); use blog_os::multitasking::create_thread;
create_thread(thread_2, &mut mapper, &mut frame_allocator);
create_thread(thread_1, 1, &mut mapper, &mut frame_allocator);
create_thread(thread_2, 1, &mut mapper, &mut frame_allocator);
create_thread(thread_3, 1, &mut mapper, &mut frame_allocator);
println!("It did not crash!"); println!("It did not crash!");
blog_os::hlt_loop(); blog_os::hlt_loop();
} }
fn create_thread(
f: fn() -> !,
mapper: &mut impl Mapper<Size4KiB>,
frame_allocator: &mut impl FrameAllocator<Size4KiB>,
) {
let mut stack = blog_os::memory::alloc_stack(1, mapper, frame_allocator).unwrap();
stack -= core::mem::size_of::<u64>();
let ptr: *mut u64 = stack.as_mut_ptr();
unsafe { ptr.write(f as u64) };
stack -= core::mem::size_of::<u64>();
let ptr: *mut u64 = stack.as_mut_ptr();
let rflags = 0x200;
unsafe { ptr.write(rflags) };
unsafe {
blog_os::multitasking::add_thread(stack);
}
}
fn thread_1() -> ! { fn thread_1() -> ! {
loop { loop {
print!("1"); print!("1");
@@ -94,6 +78,13 @@ fn thread_2() -> ! {
} }
} }
fn thread_3() -> ! {
loop {
print!("3");
x86_64::instructions::hlt();
}
}
/// This function is called on panic. /// This function is called on panic.
#[cfg(not(test))] #[cfg(not(test))]
#[panic_handler] #[panic_handler]