Merge pull request #6 from Roeegg2/main

Make repo stable

Author: Roeegg2

Cargo.lock

@@ -19,4 +19,3 @@ panic = "abort"
 
 [profile.release]
 panic = "abort"
-

Cargo.toml

@@ -17,7 +17,7 @@ limine-binary := limine-dir + "/limine"
 
 # Rust flags
 rustflags := "-C relocation-model=static"
-features := "default"
+features := "limine"
 
 # Default recipe (runs when just is called without arguments)
 default: build
@@ -116,6 +116,8 @@ _media:
   sudo dd if={{iso-file}} of=$DEVICE bs=4M status=progress oflag=sync
 
 # Helper recipe for running QEMU
+#
+# Remove logging options if you want
 _run-qemu: _download-firmware
     qemu-system-x86_64 \
         -machine q35 \
@@ -127,7 +129,8 @@ _run-qemu: _download-firmware
         -drive file=nvme.img,if=none,id=nvme-drive,format=raw \
         -drive if=pflash,unit=0,format=raw,file={{ovmf-code}},readonly=on \
         -drive if=pflash,unit=1,format=raw,file={{ovmf-vars}} \
-        -cdrom {{iso-file}}
+        -cdrom {{iso-file}} \
+        -d in_asm,int -D qemu.log \
 
 # Helper recipe for running QEMU with debug
 #
@@ -143,7 +146,7 @@ _run-qemu-debug: _download-firmware
         -drive if=pflash,unit=1,format=raw,file={{ovmf-vars}} \
         -cdrom {{iso-file}} \
         -d in_asm,int -D qemu.log \
-        -D qemu.log \
+        -s -S \
 
 # Common ISO creation steps
 _create-iso-common: _setup-limine

Justfile

@@ -18,11 +18,9 @@ slab = { version = "0.1.0", path = "../slab" }
 pedantic = "warn"
 
 [features]
-default = ["limine", "serial", "framebuffer"]
-
-# logging methods
-serial = []
-framebuffer = []
+default = []
 
 # Booting method
 limine = ["dep:limine"]
+
+framebuffer = []

boot/Cargo.toml

@@ -1,6 +1,5 @@
 fn main() {
     let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();
-    println!("cargo:warning=Target architecture: {arch}");
     // Tell cargo to pass the linker script to the linker..
     println!("cargo:rustc-link-arg=-Tlinker-{arch}.ld");
     // ..and to re-run if it changes.

boot/build.rs

@@ -27,19 +27,15 @@ impl Hpet {
         // reserved, so the kernel shouldn't be tracking it
         let phys_addr = PhysAddr(self.base_addr.addr as usize);
         unsafe {
-            let virt_addr = X86_64::map_pages(
+            let ptr = X86_64::map_pages(
                 phys_addr,
                 1,
                 Flags::new().set_read_write(true),
                 PageSize::size_4kb(),
             )
             .unwrap();
 
-            hpet::Hpet::init(
-                virt_addr.into(),
-                self.minimum_tick,
-                InterruptRoutingMode::Legacy,
-            );
+            hpet::Hpet::init(ptr.cast(), self.minimum_tick, InterruptRoutingMode::Legacy);
         }
 
         logger::info!("Configured HPET as timer");

boot/src/acpi/hpet.rs

@@ -243,7 +243,7 @@ impl Madt {
                         PageSize::size_4kb(),
                     )
                     .unwrap()
-                    .into();
+                    .cast();
                     lapic::override_base(ptr);
                 },
                 EntryType::PROCESSOR_LOCAL_X2APIC => unsafe {

boot/src/acpi/madt.rs

@@ -86,11 +86,13 @@ pub unsafe fn init(rsdp_addr: PhysAddr) -> Result<(), AcpiError> {
     sanity_assert!(rsdp_addr.0 % align_of::<Rsdp2>() == 0);
 
     let rsdp = unsafe {
-        let diff = rsdp_addr.0 % BASIC_PAGE_SIZE;
+        let diff = rsdp_addr.0 % BASIC_PAGE_SIZE.size();
         let ptr: *const Rsdp2 =
-            (X86_64::map_pages(rsdp_addr - diff, 1, Flags::new(), PageSize::size_4kb()).unwrap()
-                + diff)
-                .into();
+            X86_64::map_pages(rsdp_addr - diff, 1, Flags::new(), PageSize::size_4kb())
+                .unwrap()
+                .byte_add(diff)
+                .cast();
+
         ptr.as_ref().unwrap()
     };
 

boot/src/acpi/mod.rs

@@ -78,9 +78,12 @@ impl Rsdp2 {
     pub(super) fn get_xsdt(&self) -> &Xsdt {
         let ptr: *const SdtHeader = unsafe {
             let addr = PhysAddr(self.xsdt_address as usize);
-            let diff = addr.0 % BASIC_PAGE_SIZE;
-            (X86_64::map_pages(addr - diff, 1, Flags::new(), PageSize::size_4kb()).unwrap() + diff)
-                .into()
+            let diff = addr.0 % BASIC_PAGE_SIZE.size();
+
+            X86_64::map_pages(addr - diff, 1, Flags::new(), PageSize::size_4kb())
+                .unwrap()
+                .byte_add(diff)
+                .cast()
         };
 
         utils::sanity_assert!(ptr.is_aligned_to(align_of::<Xsdt>()));

boot/src/acpi/rsdp.rs

@@ -76,11 +76,13 @@ impl Iterator for Iter {
             return None;
         }
 
-        let ptr: *const SdtHeader = unsafe {
+        let ptr = unsafe {
             let addr = self.ptr.read_unaligned();
-            let diff = addr.0 % BASIC_PAGE_SIZE;
-            (X86_64::map_pages(addr - diff, 1, Flags::new(), PageSize::size_4kb()).unwrap() + diff)
-                .into()
+            let diff = addr.0 % BASIC_PAGE_SIZE.size();
+            X86_64::map_pages(addr - diff, 1, Flags::new(), PageSize::size_4kb())
+                .unwrap()
+                .cast::<SdtHeader>()
+                .byte_add(diff)
         };
 
         self.ptr = unsafe { self.ptr.add(1) };