Add support for CLS variables with user-defined types

kernel/cls/Cargo.toml

@@ -7,3 +7,12 @@ edition = "2021"
 
 [dependencies]
 cls_macros = { path = "cls_macros" }
+irq_safety = { git = "https://github.com/theseus-os/irq_safety" }
+preemption = { path = "../preemption" }
+
+[target.'cfg(target_arch = "x86_64")'.dependencies]
+x86_64 = "0.14.8"
+
+[target.'cfg(target_arch = "aarch64")'.dependencies]
+tock-registers = "0.7.0"
+cortex-a = "7.5.0"

kernel/cls/cls_macros/src/int.rs

@@ -0,0 +1,120 @@
+use proc_macro2::TokenStream;
+use quote::{quote, ToTokens};
+use syn::{LitInt, Type};
+
+pub(crate) fn int_functions(ty: Type, offset: LitInt) -> Option<TokenStream> {
+    let ((x64_asm_width, x64_reg_class), (aarch64_reg_modifier, aarch64_instr_width)) =
+        match ty.to_token_stream().to_string().as_ref() {
+            "u8" => (("byte", quote! { reg_byte }), (":w", "b")),
+            "u16" => (("word", quote! { reg }), (":w", "w")),
+            "u32" => (("dword", quote! { reg }), (":w", "")),
+            "u64" => (("qword", quote! { reg }), ("", "")),
+            _ => {
+                return None;
+            }
+        };
+    let x64_width_modifier = format!("{x64_asm_width} ptr ");
+    let x64_cls_location = format!("gs:[{offset}]");
+
+    Some(quote! {
+        #[inline]
+        pub fn load(&self) -> #ty {
+            #[cfg(target_arch = "x86_64")]
+            {
+                let ret;
+                unsafe {
+                    ::core::arch::asm!(
+                        ::core::concat!("mov {}, ", #x64_cls_location),
+                        out(#x64_reg_class) ret,
+                        options(preserves_flags, nostack),
+                    )
+                };
+                ret
+            }
+            #[cfg(target_arch = "aarch64")]
+            {
+                let ret;
+                unsafe {
+                    ::core::arch::asm!(
+                        "2:",
+                        // Load value.
+                        "mrs {tp_1}, tpidr_el1",
+                        concat!(
+                            "ldr", #aarch64_instr_width,
+                            " {ret", #aarch64_reg_modifier,"},",
+                            " [{tp_1},#", stringify!(#offset), "]",
+                        ),
+
+                        // Make sure task wasn't migrated between mrs and ldr.
+                        "mrs {tp_2}, tpidr_el1",
+                        "cmp {tp_1}, {tp_2}",
+                        "b.ne 2b",
+
+                        tp_1 = out(reg) _,
+                        ret = out(reg) ret,
+                        tp_2 = out(reg) _,
+
+                        options(nostack),
+                    )
+                };
+                ret
+            }
+        }
+
+        #[inline]
+        pub fn fetch_add(&self, mut operand: #ty) -> #ty {
+            #[cfg(target_arch = "x86_64")]
+            {
+                unsafe {
+                    ::core::arch::asm!(
+                        ::core::concat!("xadd ", #x64_width_modifier, #x64_cls_location, ", {}"),
+                        inout(#x64_reg_class) operand,
+                        options(nostack),
+                    )
+                };
+                operand
+            }
+            #[cfg(target_arch = "aarch64")]
+            {
+                let ret;
+                unsafe {
+                    ::core::arch::asm!(
+                        "2:",
+                        // Load value.
+                        "mrs {tp_1}, tpidr_el1",
+                        concat!("add {ptr}, {tp_1}, ", stringify!(#offset)),
+                        concat!("ldxr", #aarch64_instr_width, " {value", #aarch64_reg_modifier,"}, [{ptr}]"),
+
+                        // Make sure task wasn't migrated between msr and ldxr.
+                        "mrs {tp_2}, tpidr_el1",
+                        "cmp {tp_1}, {tp_2}",
+                        "b.ne 2b",
+
+                        // Compute and store value (reuse tp_1 register).
+                        "add {tp_1}, {value}, {operand}",
+                        concat!("stxr", #aarch64_instr_width, " {cond:w}, {tp_1", #aarch64_reg_modifier,"}, [{ptr}]"),
+
+                        // Make sure task wasn't migrated between ldxr and stxr.
+                        "cbnz {cond}, 2b",
+
+                        tp_1 = out(reg) ret,
+                        ptr = out(reg) _,
+                        value = out(reg) ret,
+                        tp_2 = out(reg) _,
+                        operand = in(reg) operand,
+                        cond = out(reg) _,
+
+                        options(nostack),
+                    )
+                };
+                ret
+            }
+        }
+
+        #[inline]
+        pub fn fetch_sub(&self, mut operand: #ty) -> #ty {
+            operand = operand.overflowing_neg().0;
+            self.fetch_add(operand)
+        }
+    })
+}