update

crates/sparreal-macros/src/arch/aarch64.rs

@@ -3,15 +3,13 @@
 use proc_macro::TokenStream;
 use syn::parse;
 
-pub fn store_cpu_context(input: TokenStream) -> Result<TokenStream, parse::Error> {
-    // let reg = syn::parse::<syn::LitStr>(input)?;
-
-    // let after = format!("[{},#-0x20]!", reg.value());
-
-    let after = format!("[{},#-0x20]!", "sp");
-    let asm_str = reg_op_pair("stp", "q", 0..32, &after, true);
-
-    Ok(asm_str.parse().unwrap())
+fn ctx_store_x_q() -> String {
+    let mut out = reg_op_pair("stp", "x", 1..32, "[sp,#-0x10]!", true);
+    out = format!(
+        "{out}\r\n    mrs	x9,     SPSR_EL1
+    stp x9, x0, [sp,#-0x10]!"
+    );
+    out
 }
 
 fn reg_op_pair(

crates/sparreal-macros/src/lib.rs

@@ -191,3 +191,18 @@ pub fn module_driver(input: TokenStream) -> TokenStream {
     }
     .into()
 }
+
+#[proc_macro]
+pub fn define_tcb_switch(input: TokenStream) -> TokenStream {
+    let s = "mov sp, x0";
+
+    quote! {
+        #[naked]
+        pub unsafe extern "C" fn __tcb_switch(prev: *mut u8, next: *mut u8) {
+            core::arch::naked_asm!(
+                #s
+            )
+        }
+    }
+    .into()
+}

crates/sparreal-rt/src/arch/aarch64/context.rs

@@ -4,6 +4,7 @@ use core::{
 };
 
 use sparreal_kernel::task::TaskControlBlock;
+use sparreal_macros::define_tcb_switch;
 
 #[repr(C, align(0x10))]
 #[derive(Clone)]
@@ -230,3 +231,7 @@ pub fn tcb_switch(prev_ptr: *mut u8, next_ptr: *mut u8) {
 
     restore_pc_is_lr();
 }
+
+
+
+define_tcb_switch!();