Cargo.lock

@@ -8,50 +8,9 @@ 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",
 ]

Cargo.toml

@@ -7,9 +7,4 @@ 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"]
 

src/main.rs

@@ -1,20 +1,37 @@
-// #![feature(abi_x86_interrupt, asm)]
+//#![feature(abi_x86_interrupt, asm)]
 #![no_std]
 #![no_main]
 
+/*
 #[macro_use]
 mod vga_buffer;
+*/
 
 use core::panic::PanicInfo;
 
 #[panic_handler]
-fn panic(info: &PanicInfo) -> ! {
+fn panic(_info: &PanicInfo) -> ! {
-    println!("{info}");
     loop {}
 }
 
+static GAMARJOBA: &[u8] = b"Gamarjoba, MVNDE!";
+
 #[no_mangle]
 pub extern "C" fn _start() -> ! {
-    println!("Gamarjoba, munde!");
+    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;
+
+
+        }
+
+    }
+
     loop {}
 }
+
+

src/vga_buffer.rs

@@ -1,6 +1,8 @@
+use volatile::Volatile;
 use core::fmt;
-use lazy_static::lazy_static;
 use spin::Mutex;
+use lazy_static::lazy_static;
+
 
 #[macro_export]
 macro_rules! print {
@@ -16,13 +18,10 @@ 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)]
@@ -49,117 +48,97 @@ pub enum Color {
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 #[repr(transparent)]
-pub struct ColorCode(u8);
+struct ColorCode(u8);
 
 impl ColorCode {
-    pub fn new(foreground: Color, background: Color) -> ColorCode {
+  fn new(foreground: Color, background: Color) -> ColorCode {
-        ColorCode((background as u8) << 4 | (foreground as u8))
+    ColorCode((background as u8) << 4 | (foreground as u8))
-    }
+  }
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 #[repr(C)]
 struct ScreenChar {
-    ascii_char: u8,
+  ascii_char: u8,
-    color_code: ColorCode,
+  color_code: ColorCode,
 }
 
 const BUFFER_WIDTH: usize = 80;
 const BUFFER_HEIGHT: usize = 25;
 
 #[repr(transparent)]
-pub struct Buffer {
+struct Buffer {
-    chars: [[ScreenChar; BUFFER_WIDTH]; BUFFER_HEIGHT],
+  chars: [[Volatile<ScreenChar>; BUFFER_WIDTH]; BUFFER_HEIGHT],
 }
 
 pub struct Writer {
-    column_position: usize,
+  column_position: usize,
-    color_code: ColorCode,
+  color_code: ColorCode,
-    buffer: &'static mut Buffer,
+  buffer: &'static mut Buffer,
 }
 
 impl Writer {
-    pub fn new(color_code: ColorCode) -> Self {
+  pub fn write_string(&mut self, s: &str) {
-        Writer {
+    for byte in s.bytes() {
-            column_position: 0,
+      match byte {
-            color_code,
+        0x20..=0x7e | b'\n' => self.write_byte(byte),
-            buffer: unsafe { &mut *(0xb8000 as *mut Buffer) },
+        _ => self.write_byte(0xfe), // a ■
-        }
+      }
     }
-    pub fn write_string(&mut self, s: &str) {
+  }
-        for byte in s.bytes() {
+
-            match byte {
+  pub fn write_byte(&mut self, byte: u8) {
-                0x20..=0x7e | b'\n' => self.write_byte(byte),
+    match byte {
-                _ => self.write_byte(0xfe), // 0xfe is the character ■
+      b'\n' => self.new_line(),
-            }
+      byte => {
+        if self.column_position >= BUFFER_WIDTH {
+          self.new_line();
         }
+        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,
+        });
+        self.column_position += 1;
+      }
     }
+  }
 
-    pub fn write_byte(&mut self, byte: u8) {
+  fn new_line(&mut self) {
-        match byte {
+    for row in 1..BUFFER_HEIGHT {
-            b'\n' => self.new_line(),
+      for col in 0..BUFFER_WIDTH {
-            byte => {
+        let character = self.buffer.chars[row][col].read();
-                if self.column_position >= BUFFER_WIDTH {
+        self.buffer.chars[row - 1][col].write(character);
-                    self.new_line();
+      }
-                }
-                let row = BUFFER_HEIGHT - 1;
-                let col = self.column_position;
-                let color_code = self.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;
-            }
-        }
     }
+    self.clear_row(BUFFER_HEIGHT - 1);
+    self.column_position = 0;
+  }
 
-    fn new_line(&mut self) {
+  fn clear_row(&mut self, row: usize) {
-        for row in 1..BUFFER_HEIGHT {
+    let blank = ScreenChar {
-            for col in 0..BUFFER_WIDTH {
+      ascii_char: b' ',
-                let character = unsafe {
+      color_code: self.color_code,
-                    core::ptr::read_volatile(&self.buffer.chars[row][col] as *const ScreenChar)
+    };
-                };
+    for col in 0..BUFFER_WIDTH {
-
+      self.buffer.chars[row][col].write(blank);
-                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);
-        self.column_position = 0;
-    }
-
-    fn clear_row(&mut self, row: usize) {
-        let blank = ScreenChar {
-            ascii_char: b' ',
-            color_code: self.color_code,
-        };
-        for col in 0..BUFFER_WIDTH {
-            let ptr = &mut self.buffer.chars[row][col] as *mut ScreenChar;
-            unsafe {
-                core::ptr::write_volatile(ptr, blank);
-            }
-        }
     }
+  }
 }
 
 impl fmt::Write for Writer {
-    fn write_str(&mut self, s: &str) -> fmt::Result {
+  fn write_str(&mut self, s: &str) -> fmt::Result {
-        self.write_string(s);
+    self.write_string(s);
-        Ok(())
+    Ok(())
-    }
+  }
 }
 
+
 lazy_static! {
-    pub static ref WRITER: Mutex<Writer> =
+  pub static ref WRITER: Mutex<Writer> = Mutex::new(Writer {
-        Mutex::new(Writer::new(ColorCode::new(Color::Yellow, Color::Black)));
+    column_position: 0, color_code: ColorCode::new(Color::Yellow, Color::Black),
+    buffer: unsafe { &mut *(0xb8000 as *mut Buffer) },
+  });
 }
+