diff --git a/src/arch/x86_64/gdt.rs b/src/arch/x86_64/gdt.rs index 052643f04205884ab17a6269c6fc41ae041f9bd2..c7a4b29349ef5f96716a177c2842e9c125097a50 100644 --- a/src/arch/x86_64/gdt.rs +++ b/src/arch/x86_64/gdt.rs @@ -1,3 +1,5 @@ +use crate::println; + use super::idt::DOUBLE_FAULT_IST; use spin::Lazy; use x86_64::{ @@ -13,6 +15,7 @@ use x86_64::{ // pub fn init() { + println!("Initializing GDT"); GDT.0.load(); unsafe { diff --git a/src/arch/x86_64/idt.rs b/src/arch/x86_64/idt.rs index af15634086f6e4bf232ebc092b236b386279a443..4a09b045974a0610b592adef6dcd5194692a36e3 100644 --- a/src/arch/x86_64/idt.rs +++ b/src/arch/x86_64/idt.rs @@ -9,6 +9,7 @@ pub static DOUBLE_FAULT_IST: u16 = 1; // pub fn init() { + println!("Initializing IDT"); IDT.load(); } diff --git a/src/arch/x86_64/limine/mod.rs b/src/arch/x86_64/limine/mod.rs index 754f283f737d42404fe63a793718bb0bcf2c5297..9c902107fae059b1749a4d09f214590dfb5803fb 100644 --- a/src/arch/x86_64/limine/mod.rs +++ b/src/arch/x86_64/limine/mod.rs @@ -1,3 +1,5 @@ +use crate::println; + use super::{gdt, idt}; // @@ -21,8 +23,10 @@ pub extern "C" fn _start() -> ! { gdt::init(); idt::init(); + println!("Re-enabling x86_64 interrupts"); x86_64::instructions::interrupts::enable(); + println!("Calling general kernel_main"); crate::kernel_main() } diff --git a/src/main.rs b/src/main.rs index 9bdb52c3685dba97871dfcd96ca024c51bcf86ca..b75b1223e83dacc8219cede0fc560441fd822c0c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -43,7 +43,7 @@ pub static BOOTLOADER: Mutex<&'static str> = Mutex::new(KERNEL); // fn kernel_main() -> ! { - println!("Hello from {}", KERNEL.cyan()); + println!("\n\nHello from {}", KERNEL.cyan()); println!(" - {} was booted with {}", KERNEL.cyan(), BOOTLOADER.lock()); // error handling test @@ -53,9 +53,9 @@ fn kernel_main() -> ! { // } if let Some(mut fbo) = get_fbo() { - fbo.fill(240, 240, 40, 40, Color::RED); - fbo.fill(250, 250, 60, 40, Color::GREEN); - fbo.fill(205, 215, 80, 20, Color::BLUE); + fbo.fill(240, 340, 40, 40, Color::RED); + fbo.fill(250, 350, 60, 40, Color::GREEN); + fbo.fill(205, 315, 80, 20, Color::BLUE); } #[cfg(test)]