WIP

Author: mkroening

Cargo.lock

@@ -191,10 +191,15 @@ pub fn message_output_init() {
 #[cfg(target_os = "none")]
 pub fn output_message_buf(buf: &[u8]) {
 	// Output messages to the serial port and VGA screen in unikernel mode.
+
+use alloc::string::String;
 	COM1.lock().as_mut().unwrap().send(buf);
 
 	#[cfg(feature = "vga")]
-	vga::print(buf);
+	{
+		let s = String::from_utf8_lossy(buf);
+		vga::print(&s);
+	}
 }
 
 #[cfg(not(target_os = "none"))]

src/arch/x86_64/kernel/mod.rs

@@ -1,11 +1,12 @@
 use core::alloc::Layout;
 
+use core::fmt::Write;
 use hermit_sync::{InterruptOnceCell, InterruptSpinMutex};
-use vga_text_mode::{ VgaScreen, TextBuffer, FrontBuffer};
+use vga_text_mode::{ VgaScreen, FrontBuffer, text_buffer::TextBuffer};
 use x86_64::instructions::port::Port;
 
 use crate::arch::x86_64::mm::paging::{BasePageSize, PageTableEntryFlags, PageTableEntryFlagsExt};
-use crate::arch::x86_64::mm::{paging, PhysAddr, VirtAddr, virtualmem};
+use crate::arch::x86_64::mm::{paging, PhysAddr, VirtAddr};
 
 static VGA_SCREEN: InterruptOnceCell<InterruptSpinMutex<VgaScreen<'static>>> = InterruptOnceCell::new();
 
@@ -35,14 +36,15 @@ pub fn init() {
 	}
 
 	let front_buffer = unsafe { &mut *(virt_addr as *mut TextBuffer) };
+	let front_buffer = FrontBuffer::new(front_buffer);
 
 	VGA_SCREEN
-		.set(InterruptSpinMutex::new(VgaScreen::new(front_buffer).unwrap()))
+		.set(InterruptSpinMutex::new(VgaScreen::new(front_buffer)))
 		.unwrap();
 }
 
-pub fn print(buf: &[u8]) {
+pub fn print(s: &str) {
 	if let Some(vga_screen) = VGA_SCREEN.get() {
-		vga_screen.lock().print(buf);
+		vga_screen.lock().write_str(s).unwrap();
 	}
 }