From 5c0ea91e652eb17902515eb3df5b791e21ab59d2 Mon Sep 17 00:00:00 2001 From: Greg Shuflin Date: Sat, 19 Feb 2022 00:54:44 -0800 Subject: [PATCH] Add back code for writing to screen --- Cargo.lock | 41 +++++++++++++++++++++++++++++++++ Cargo.toml | 5 ++++ src/main.rs | 20 ++-------------- src/vga_buffer.rs | 58 ++++++++++++++++++++++++++++++++++------------- 4 files changed, 90 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9a16c44..9bf077c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,9 +8,50 @@ version = "0.9.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a62c8f6168cd106687ee36a2b71a46c4144d73399f72814104d33094b8092fd2" +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] + +[[package]] +name = "lock_api" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" +dependencies = [ + "scopeguard", +] + [[package]] name = "rustos" version = "0.1.0" dependencies = [ "bootloader", + "lazy_static", + "spin 0.9.2", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5" +dependencies = [ + "lock_api", ] diff --git a/Cargo.toml b/Cargo.toml index 7dade6f..5caf1f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,4 +7,9 @@ edition = "2021" [dependencies] #bootloader = "0.10.12" bootloader = "0.9.8" +spin = "0.9.2" + +[dependencies.lazy_static] +version = "1.4.0" +features = ["spin_no_std"] diff --git a/src/main.rs b/src/main.rs index fb7b430..7eda8db 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,11 +1,9 @@ -//#![feature(abi_x86_interrupt, asm)] +// #![feature(abi_x86_interrupt, asm)] #![no_std] #![no_main] -/* #[macro_use] mod vga_buffer; -*/ use core::panic::PanicInfo; @@ -14,23 +12,9 @@ fn panic(_info: &PanicInfo) -> ! { loop {} } -static GAMARJOBA: &[u8] = b"Gamarjoba, MVNDE!"; - #[no_mangle] pub extern "C" fn _start() -> ! { - let vga_buffer = 0xb8000 as *mut u8; - - for (i, &byte) in GAMARJOBA.iter().enumerate() { - let i = i as isize; - unsafe { - *vga_buffer.offset(i * 2) = byte; - *vga_buffer.offset(i * 2 + 1) = 0xd; - - - } - - } - + println!("Gamarjoba, munde!"); loop {} } diff --git a/src/vga_buffer.rs b/src/vga_buffer.rs index b4f21d6..f0931b7 100644 --- a/src/vga_buffer.rs +++ b/src/vga_buffer.rs @@ -1,4 +1,3 @@ -use volatile::Volatile; use core::fmt; use spin::Mutex; use lazy_static::lazy_static; @@ -18,10 +17,13 @@ macro_rules! println { #[doc(hidden)] pub fn _print(args: fmt::Arguments) { use core::fmt::Write; + WRITER.lock().write_fmt(args).unwrap(); + /* use x86_64::instructions::interrupts; interrupts::without_interrupts(|| { WRITER.lock().write_fmt(args).unwrap(); }); + */ } #[allow(dead_code)] @@ -46,12 +48,13 @@ pub enum Color { White = 15, } + #[derive(Debug, Clone, Copy, PartialEq, Eq)] #[repr(transparent)] -struct ColorCode(u8); +pub struct ColorCode(u8); impl ColorCode { - fn new(foreground: Color, background: Color) -> ColorCode { + pub fn new(foreground: Color, background: Color) -> ColorCode { ColorCode((background as u8) << 4 | (foreground as u8)) } } @@ -67,8 +70,8 @@ const BUFFER_WIDTH: usize = 80; const BUFFER_HEIGHT: usize = 25; #[repr(transparent)] -struct Buffer { - chars: [[Volatile; BUFFER_WIDTH]; BUFFER_HEIGHT], +pub struct Buffer { + chars: [[ScreenChar; BUFFER_WIDTH]; BUFFER_HEIGHT], } pub struct Writer { @@ -78,11 +81,19 @@ pub struct Writer { } impl Writer { + pub fn new(color_code: ColorCode) -> Self { + Writer { + column_position: 0, + color_code, + buffer: unsafe { &mut *(0xb8000 as *mut Buffer) }, + } + + } pub fn write_string(&mut self, s: &str) { for byte in s.bytes() { match byte { 0x20..=0x7e | b'\n' => self.write_byte(byte), - _ => self.write_byte(0xfe), // a ■ + _ => self.write_byte(0xfe), // 0xfe is the character ■ } } } @@ -97,9 +108,16 @@ impl Writer { let row = BUFFER_HEIGHT - 1; let col = self.column_position; let color_code = self.color_code; - self.buffer.chars[row][col].write(ScreenChar { - ascii_char: byte, color_code, - }); + + let ptr = &mut self.buffer.chars[row][col] as *mut ScreenChar; + let screenchar = ScreenChar { + ascii_char: byte, color_code, + }; + + unsafe { + core::ptr::write_volatile(ptr, screenchar); + } + self.column_position += 1; } } @@ -108,8 +126,14 @@ impl Writer { fn new_line(&mut self) { for row in 1..BUFFER_HEIGHT { for col in 0..BUFFER_WIDTH { - let character = self.buffer.chars[row][col].read(); - self.buffer.chars[row - 1][col].write(character); + let character = unsafe { + core::ptr::read_volatile(&self.buffer.chars[row][col] as *const ScreenChar) + }; + + let ptr = &mut self.buffer.chars[row - 1][col] as *mut ScreenChar; + unsafe { + core::ptr::write_volatile(ptr, character); + } } } self.clear_row(BUFFER_HEIGHT - 1); @@ -122,7 +146,10 @@ impl Writer { color_code: self.color_code, }; for col in 0..BUFFER_WIDTH { - self.buffer.chars[row][col].write(blank); + let ptr = &mut self.buffer.chars[row][col] as *mut ScreenChar; + unsafe { + core::ptr::write_volatile(ptr, blank); + } } } } @@ -136,9 +163,8 @@ impl fmt::Write for Writer { lazy_static! { - pub static ref WRITER: Mutex = Mutex::new(Writer { - column_position: 0, color_code: ColorCode::new(Color::Yellow, Color::Black), - buffer: unsafe { &mut *(0xb8000 as *mut Buffer) }, - }); + pub static ref WRITER: Mutex = Mutex::new(Writer::new( + ColorCode::new(Color::Yellow, Color::Black) + )); }