From cd1c1ac1efb97e9faf02e033188c21383a69f997 Mon Sep 17 00:00:00 2001
From: Eemeli <eemeli.o.lehtonen@utu.fi>
Date: Sun, 15 Jan 2023 05:52:48 +0200
Subject: [PATCH] debug prints
---
src/arch/x86_64/gdt.rs | 3 +++
src/arch/x86_64/idt.rs | 1 +
src/arch/x86_64/limine/mod.rs | 4 ++++
src/main.rs | 8 ++++----
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/arch/x86_64/gdt.rs b/src/arch/x86_64/gdt.rs
index 052643f..c7a4b29 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 af15634..4a09b04 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 754f283..9c90210 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 9bdb52c..b75b122 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)]
--
GitLab