Merge branch 'nightly' of https://github.com/ViktorPopp/Hexium into nightly

Author: ViktorPopp

.github/workflows/make.yml

@@ -0,0 +1,49 @@
+name: Makefile CI
+
+on:
+  push:
+    branches: [ "nightly" ]
+  pull_request:
+    branches: [ "nitghly" ]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: 'recursive'
+
+    - name: Install Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: nightly
+        override: true
+        target: x86_64-unknown-none
+        components: rust-src
+
+    - name: Add rust-src
+      run: rustup component add rust-src --toolchain nightly-2025-04-03-x86_64-unknown-linux-gnu
+
+    - name: Update Debian repositories
+      run: sudo apt-get update
+
+    - name: Setup nasm
+      run: sudo apt-get install -y nasm
+
+    - name: Install xorriso
+      run:  sudo apt-get install -y xorriso
+
+    - name: Install qemu
+      run: sudo apt-get install qemu-system-x86
+
+    - name: Run make
+      run: make
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: 'hexium.iso'
+        path: 'hexium-x86_64.iso'

kernel/Cargo.lock

@@ -9,7 +9,6 @@ bitflags = "2.9.1"
 elf = { version = "0.7", default-features = false, features = ["nightly"] }
 flanterm = "0.0.2"
 limine = "0.5"
-lazy_static = { version = "1.0", features = ["spin_no_std"] }
 rustc-demangle = "0.1"
 spin = "0.10.0"
 talc = "4.4.3"

kernel/Cargo.toml

@@ -9,6 +9,7 @@ use core::{
     marker::PhantomData,
     ops::{Index, IndexMut},
 };
+use spin::Lazy;
 
 #[allow(dead_code)]
 #[repr(C, align(16))]
@@ -311,14 +312,14 @@ impl_handler_func_type!(HandlerFuncWithErrCode);
 impl_handler_func_type!(DivergingHandlerFunc);
 impl_handler_func_type!(DivergingHandlerFuncWithErrCode);
 
-lazy_static::lazy_static! {
-    static ref IDT: InterruptDescriptorTable = {
-        let mut idt = InterruptDescriptorTable::new();
-        idt.double_fault.set_handler_fn(exceptions::double_fault_handler);
-        idt.page_fault.set_handler_fn(exceptions::page_fault_handler);
-        idt
-    };
-}
+static IDT: Lazy<InterruptDescriptorTable> = Lazy::new(|| {
+    let mut idt = InterruptDescriptorTable::new();
+    idt.double_fault
+        .set_handler_fn(exceptions::double_fault_handler);
+    idt.page_fault
+        .set_handler_fn(exceptions::page_fault_handler);
+    idt
+});
 
 pub fn init() {
     IDT.load();

kernel/src/arch/x86_64/idt.rs

@@ -1,6 +1,6 @@
 use crate::util::option_to_c_void;
 use core::{fmt, ptr};
-use spin::Mutex;
+use spin::{Lazy, Mutex};
 
 pub struct FlantermContext(pub *mut flanterm::sys::flanterm_context);
 unsafe impl Send for FlantermContext {}
@@ -45,11 +45,9 @@ pub fn init() {
     crate::trace!("Initialized Flanterm context");
 }
 
-lazy_static::lazy_static! {
-    pub static ref FLANTERM_CTX: Mutex<FlantermContext> =
-        Mutex::new(FlantermContext(ptr::null_mut()));
-    pub static ref WRITER: Mutex<FlantermWriter> = Mutex::new(FlantermWriter {});
-}
+pub static FLANTERM_CTX: Lazy<Mutex<FlantermContext>> =
+    Lazy::new(|| Mutex::new(FlantermContext(ptr::null_mut())));
+pub static WRITER: Lazy<Mutex<FlantermWriter>> = Lazy::new(|| Mutex::new(FlantermWriter {}));
 
 pub struct FlantermWriter {}