aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--StrixKernel/src/main.rs16
1 files changed, 4 insertions, 12 deletions
diff --git a/StrixKernel/src/main.rs b/StrixKernel/src/main.rs
index 36783d1..f91134b 100644
--- a/StrixKernel/src/main.rs
+++ b/StrixKernel/src/main.rs
@@ -11,22 +11,14 @@ static HELLO: &[u8] = b"Hello World!";
#[unsafe(no_mangle)]
pub extern "C" fn _start() -> ! {
- let vga_buffer = 0xb8000 as *mut u8;
-
- for (i, &byte) in HELLO.iter().enumerate() {
- unsafe {
- *vga_buffer.offset(i as isize * 2) = byte;
- *vga_buffer.offset(i as isize * 2 + 1) = 0xb;
- }
- }
-
+ println!("Hello World{}", "!");
+ panic!("This is a test panic message");
loop {}
}
/// This function is called on panic.
#[panic_handler]
-fn panic(_info: &PanicInfo) -> ! {
- vga_buffer::print_something();
-
+fn panic(info: &PanicInfo) -> ! {
+ println!("{}", info);
loop {}
}