Merge branch 'main' into eliza/constant-time

hal-core/src/lib.rs

@@ -9,5 +9,7 @@ pub mod boot;
 pub mod framebuffer;
 pub mod interrupt;
 pub mod mem;
+mod local;
 pub use self::addr::*;
 pub use self::boot::BootInfo;
+pub use self::local::CoreLocal;

hal-core/src/local.rs

@@ -0,0 +1,19 @@
+//! Abstractions for core-local storage.
+
+/// A core-local storage cell.
+///
+/// This trait represents an architecture-specific mechanism for storing local
+/// data for each CPU core.
+pub trait CoreLocal<T: 'static> {
+    /// Returns a new instance of `Self`, using the provided `init` function to
+    /// generate the initial value for each CPU core.
+    fn new(init: fn() -> T) -> Self;
+
+    /// Accesses the value for the current CPU core.
+    ///
+    /// This method invokes the provided closure `f` with a reference to the
+    /// `T`-typed local data for the current CPU core.
+    fn with<F, U>(&self, f: F) -> U
+    where
+        F: FnOnce(&T) -> U;
+}

hal-x86_64/src/cpu/local.rs

@@ -8,6 +8,7 @@ use core::{
     sync::atomic::{AtomicPtr, AtomicUsize, Ordering},
 };
 use mycelium_util::{fmt, sync::Lazy};
+use hal_core::CoreLocal;
 
 #[repr(C)]
 #[derive(Debug)]
@@ -140,6 +141,8 @@ impl GsLocalData {
     }
 }
 
+// === impl LocalKey ===
+
 impl<T: 'static> LocalKey<T> {
     #[must_use]
     #[track_caller]
@@ -177,3 +180,17 @@ impl<T> fmt::Debug for LocalKey<T> {
             .finish()
     }
 }
+
+impl<T: 'static> CoreLocal<T> for LocalKey<T> {
+    #[must_use]
+    fn new(initializer: fn() -> T) -> Self {
+        Self::new(initializer)
+    }
+
+
+    #[track_caller]
+    fn with<F, U>(&self, f: F) -> U
+    where F: FnOnce(&T) -> U {
+        self.with(f)
+    }
+}

inoculate/Cargo.toml

@@ -17,7 +17,7 @@ tracing-subscriber = "0.3.16"
 tracing-error = "0.2"
 color-eyre = "0.6"
 bootloader = "0.11.2"
-bootloader-boot-config = "0.11.2"
+bootloader-boot-config = "0.11.3"
 locate-cargo-manifest = "0.2"
 wait-timeout = "0.2"
 owo-colors = "3.5.0"