wip

JonasKruckenberg · JonasKruckenberg · Dec 29, 2024 · Dec 18, 2024 · Dec 18, 2024 · Dec 18, 2024
commit c299420e48f73a88c7123a33fe2a0b5744902406
diff --git a/libs/mmu/src/lib.rs b/libs/mmu/src/lib.rs
@@ -8,7 +8,9 @@ mod error;
 mod flush;
 pub mod frame_alloc;
 
+use core::alloc::{Layout, LayoutError};
 use core::fmt;
+use core::fmt::Formatter;
 use core::ops::Range;
 
 pub use address_space::AddressSpace;
@@ -29,6 +31,12 @@ bitflags::bitflags! {
     }
 }
 
+impl fmt::Display for Flags {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        bitflags::parser::to_writer(self, f)
+    }
+}
+
 #[repr(transparent)]
 #[derive(Default, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Hash)]
 pub struct VirtualAddress(usize);
@@ -236,6 +244,8 @@ pub trait AddressRangeExt {
     fn align_in(self, align: usize) -> Self;
     #[must_use]
     fn align_out(self, align: usize) -> Self;
+    fn align(&self) -> usize;
+    fn into_layout(self) -> core::result::Result<Layout, LayoutError>;
     fn is_user_accessible(&self) -> bool;
 }
 
@@ -258,6 +268,13 @@ impl AddressRangeExt for Range<PhysicalAddress> {
     fn align_out(self, align: usize) -> Self {
         self.start.align_down(align)..self.end.align_up(align)
     }
+    // TODO test
+    fn align(&self) -> usize {
+        self.start.as_raw() & (!self.start.as_raw() + 1)
+    }
+    fn into_layout(self) -> core::result::Result<Layout, LayoutError> {
+        Layout::from_size_align(self.size(), self.align())
+    }
     fn is_user_accessible(&self) -> bool {
         unimplemented!("PhysicalAddress is never user accessible")
     }
@@ -282,6 +299,13 @@ impl AddressRangeExt for Range<VirtualAddress> {
     fn align_out(self, align: usize) -> Self {
         self.start.align_down(align)..self.end.align_up(align)
     }
+    // TODO test
+    fn align(&self) -> usize {
+        self.start.as_raw() & (!self.start.as_raw() + 1)
+    }
+    fn into_layout(self) -> core::result::Result<Layout, LayoutError> {
+        Layout::from_size_align(self.size(), self.align())
+    }
     fn is_user_accessible(&self) -> bool {
         if self.is_empty() {
             return false;