Attempting to make println!

Author: katietheqt-old

src/bootsector/src/errors.rs

@@ -1,5 +1,5 @@
 use shared::utils;
-use shared::console::println;
+use super::console::println;
 
 #[no_mangle]
 pub extern "C" fn dap_load_failed() -> ! {

src/bootsector/src/main.rs

@@ -8,7 +8,6 @@
 mod errors;
 mod console;
 
-use core::panic::PanicInfo;
 use stage_2::second_stage;
 
 use self::console::println;
@@ -37,14 +36,6 @@ unsafe extern "C" fn rust_start(disk_number: u16) -> ! {
     }
 }
 
-#[panic_handler]
-pub fn panic(_info: &PanicInfo) -> ! {
-    println(b"[!] Rust Panic");
-    loop {
-    	utils::hlt()
-    }
-}
-
 pub fn check_int13h_extensions(disk_number: u16) {
 	unsafe {
 		llvm_asm!("

src/shared/src/console.rs

@@ -1,22 +1,51 @@
-#[inline(never)]
-pub fn println(s: &[u8]) {
-    print(s);
-    print_char(b'\n');
+use core::{fmt, fmt::Write};
+
+#[macro_export]
+macro_rules! print {
+    ($($arg:tt)*) => {{
+        use core::fmt::Write;
+        let mut writer = $crate::console::Writer {};
+        let _ = writer.write_fmt(format_args!($($arg)*));
+    }};
+}
+
+#[macro_export]
+macro_rules! println {
+    () => ($crate::print!("\n"));
+    ($($arg:tt)*) => ($crate::print!("{}\n", format_args!($($arg)*)));
 }
 
-pub fn print(s: &[u8]) {
-	let mut i = 0;
+pub struct Writer {}
+
+impl Write for Writer {
+    fn write_str(&mut self, s: &str) -> fmt::Result {
+        for c in s.chars() {
+            let _ = self.write_char(c);
+        }
+
+        Ok(())
+    }
 
-	while i < s.len() {
-		print_char(s[i]);
-		i += 1;
-	}
+    fn write_char(&mut self, c: char) -> fmt::Result {
+        let mut buffer = [0u8; 4];
+
+        c.encode_utf8(&mut buffer);
+
+        for raw_char in &buffer {
+            self.write_raw_char(*raw_char);
+        }
+
+        Ok(())
+    }
 }
 
-#[inline(always)]
-pub fn print_char(c: u8) {
-    let ax = u16::from(c) | 0x0e00;
-    unsafe {
-        llvm_asm!("int 0x10" :: "{ax}"(ax) :: "intel" );
+impl Writer {
+    #[inline(always)]
+    fn write_raw_char(&mut self, c: u8) {
+        let ax = u16::from(c) | 0x0e00;
+
+        unsafe {
+            llvm_asm!("int 0x10" :: "{ax}"(ax), "{bx}"(0) :: "intel", "volatile");
+        }
     }
 }

src/stage_2/src/lib.rs

@@ -1,12 +1,17 @@
 #![no_std]
 #![feature(llvm_asm)]
 
-use shared::console::println;
+// FIXME
+#![allow(dead_code, unused_variables)]
+
+use shared::println;
 use shared::linker_symbol;
 use v86::gdt::{GlobalDescriptorTable, Descriptor, TaskStateSegment};
 
 use lazy_static::lazy_static;
 
+mod panic;
+
 lazy_static! {
     static ref TSS: TaskStateSegment = {
         let mut tss = TaskStateSegment::new();
@@ -30,21 +35,23 @@ lazy_static! {
 
 #[no_mangle]
 pub fn second_stage() {
-    println(b"Stage 2");
+    println!("Stage 2");
 
-    println(b"Loading GDT");
+    loop {}
+}
+
+fn enter_protected_mode() {
+    println!("Loading GDT");
 
     unsafe { GDT.load(); }
 
-    println(b"GDT Loaded!");
+    println!("GDT Loaded!");
 
-    loop {};
-
-    println(b"Switching to 32-bit");
+    println!("Switching to 32-bit");
 
     enable_a20();
 
-    println(b"A20");
+    println!("A20");
 
     loop {};
 
@@ -61,18 +68,9 @@ pub fn second_stage() {
     }
 }
 
-static HELLO: &[u8] = b"Protected Mode!";
-
 #[no_mangle]
 extern "C" fn protected_mode() {
-    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!("Protected Mode!");
 
     loop {} 
 }

src/stage_2/src/panic.rs

@@ -0,0 +1,12 @@
+use core::panic::PanicInfo;
+use shared::println;
+use shared::utils;
+
+#[panic_handler]
+pub fn panic(info: &PanicInfo) -> ! {
+	println!("[Panic]");
+
+    loop {
+        utils::hlt()
+    }
+}

src/v86/src/gdt.rs

@@ -48,9 +48,7 @@ impl GlobalDescriptorTable {
             limit: (self.table.len() * size_of::<u64>() - 1) as u16,
         };
 
-        unsafe {
-            llvm_asm!("lgdt ($0)" :: "r" (&ptr) : "memory");
-        }
+        llvm_asm!("lgdt ($0)" :: "r" (&ptr) : "memory");
     }
 
     #[inline]

src/v86/src/lib.rs

@@ -3,6 +3,9 @@
 #![feature(llvm_asm)]
 #![no_std]
 
+// FIXME
+#![allow(dead_code, unused_imports)]
+
 use core::slice;
 
 pub mod gdt;