Fix

Author: Kaweees

scripts/image.sh

@@ -9,7 +9,8 @@
 #
 
 image() {
-  local arch=$(uname -m)
+  local arch
+  arch="$(uname -m)"
   local kernel_arch="$3"
   local kernel_file="$1"
   local image_file="$2"
@@ -20,7 +21,7 @@ image() {
   # Create a folder whose structure mirrors that of the desired disk image
   mkdir -p "${boot_files_dir}"
   sudo mkdir -p "${boot_files_dir}/boot/grub"
-  sudo cp -r ./src/arch/${kernel_arch}/grub.cfg "${boot_files_dir}/boot/grub/"
+  sudo cp -r ./src/arch/"${kernel_arch}"/grub.cfg "${boot_files_dir}/boot/grub/"
   sudo cp -r "${kernel_file}" "${boot_files_dir}/boot/kiwirtos.bin"
   # Create a zeroed out disk image file
   dd if=/dev/zero of="${image_file}" bs=512 count=32768
@@ -82,7 +83,7 @@ image() {
 }
 
 # Main script logic
-set -e # Exit on error
+set -euo pipefail # Exit on error, print the error message
 if [ $# -eq 3 ]; then
   image "$1" "$2" "$3"
 else

src/arch/x86_64/idt.zig

@@ -3,13 +3,6 @@
 const std = @import("std");
 const arch = @import("arch.zig");
 
-// IDT entry types
-pub const IDT_TASK_GATE = 0x5;
-pub const IDT_INTERRUPT_GATE_16 = 0x6;
-pub const IDT_TRAP_GATE_16 = 0x7;
-pub const IDT_INTERRUPT_GATE_32 = 0xE;
-pub const IDT_TRAP_GATE_32 = 0xF;
-
 extern const isr_stub_table: []void;
 
 // Number of entries in the IDT
@@ -54,6 +47,8 @@ pub const DPL = enum(u2) {
 
 // The type of gate the IDT entry represents
 pub const GateType = enum(u4) {
+    /// Task gate (system call)
+    GATE_TASK = 0b0101,
     /// Interrupt gate (system call)
     GATE_INTERRUPT = 0b1110,
     /// Trap gate (exception)
@@ -108,7 +103,8 @@ pub const Idt = struct {
     /// Set the IDT entries
     pub fn setEntries(self: *Idt) void {
         for (0..IDT_ENTRIES) |vector| {
-            self.setDescriptor(vector, @intFromPtr(isr_stub_table[vector]), IdtAttributes{
+            const addr = @intFromPtr(isr_stub_table[vector]);
+            self.setDescriptor(vector, addr, IdtAttributes{
                 .present = 1,
                 .dpl = DPL.KERNEL,
                 .gate_type = GateType.GATE_INTERRUPT,

src/drivers/vga.zig

@@ -325,4 +325,25 @@ pub const VgaTextDriver = struct {
     pub fn println(self: *VgaTextDriver, comptime format: []const u8, args: anytype) void {
         self.writer().print(format ++ "\n", args) catch unreachable;
     }
+
+    /// Put a character to the VGA buffer with race condition protection
+    pub fn setCharSafe(self: *VgaTextDriver, ch: u8) void {
+        arch.cli(); // Disable interrupts
+        self.setChar(ch);
+        arch.sti(); // Re-enable interrupts
+    }
+
+    /// Update cursor position with race condition protection
+    pub fn updateCursorSafe(self: *const VgaTextDriver) void {
+        arch.cli(); // Disable interrupts
+        self.updateCursor();
+        arch.sti(); // Re-enable interrupts
+    }
+
+    /// Scroll the VGA buffer with race condition protection
+    pub fn scrollSafe(self: *VgaTextDriver) void {
+        arch.cli(); // Disable interrupts
+        self.scroll();
+        arch.sti(); // Re-enable interrupts
+    }
 };