task重构

qclic · Jan 21, 2025 · 665d38d · 665d38d
1 parent ac26122
commit 665d38d
Show file tree

Hide file tree

Showing 7 changed files with 133 additions and 383 deletions.
diff --git a/app/helloworld/src/main.rs b/app/helloworld/src/main.rs
@@ -2,7 +2,7 @@
 #![no_main]
 extern crate alloc;
 
-use core::{hint::spin_loop, time::Duration};
+use core::time::Duration;
 
 use alloc::string::ToString;
 use log::info;

diff --git a/crates/sparreal-kernel/src/globals/mod.rs b/crates/sparreal-kernel/src/globals/mod.rs
@@ -16,8 +16,6 @@ use crate::{
     platform::{self, cpu_list},
 };
 
-pub const STACK_SIZE: usize = 32 * 1024 * 1024;
-
 mod percpu;
 
 pub struct GlobalVal {

diff --git a/crates/sparreal-kernel/src/platform_if/mod.rs b/crates/sparreal-kernel/src/platform_if/mod.rs
@@ -1,5 +1,3 @@
-use core::ffi::c_void;
-
 pub use driver_interface::DriverRegisterListRef;
 use sparreal_macros::api_trait;
 

diff --git a/crates/sparreal-kernel/src/task/tcb.rs b/crates/sparreal-kernel/src/task/tcb.rs
@@ -9,18 +9,10 @@ use core::{
 use alloc::{boxed::Box, string::String};
 use log::debug;
 
-use crate::{
-    globals::{STACK_SIZE, global_val},
-    mem::VirtAddr,
-    platform,
-    platform_if::PlatformImpl,
-    task::schedule::*,
-};
+use crate::{platform, platform_if::PlatformImpl, task::schedule::*};
 
 use super::{TaskConfig, TaskError};
 
-const TCB_ALIGN: usize = 16;
-
 #[repr(transparent)]
 #[derive(Clone, Copy)]
 pub struct TaskControlBlock(*mut u8);

diff --git a/crates/sparreal-rt/src/arch/aarch64/context.rs b/crates/sparreal-rt/src/arch/aarch64/context.rs
@@ -3,7 +3,6 @@ use core::{
     fmt::{self, Debug},
 };
 
-use log::debug;
 use sparreal_kernel::task::TaskControlBlock;
 
 #[repr(C, align(0x10))]
@@ -99,8 +98,8 @@ extern "C" fn __store_context() {
     }
 }
 
-#[inline(never)]
-pub fn tcb_switch(prev: &mut TaskControlBlock, next: &mut TaskControlBlock) {
+#[inline(always)]
+fn __ctx_store_x_q() {
     unsafe {
         asm!(
             "
@@ -120,8 +119,12 @@ pub fn tcb_switch(prev: &mut TaskControlBlock, next: &mut TaskControlBlock) {
 	stp	X3,X4,   [sp,#-0x10]!
     stp	X1,X2,   [sp,#-0x10]!
     mrs	x9,     SPSR_EL1
-    stp x9, x0, [sp,#-0x10]!
+    stp x9, x0, [sp,#-0x10]!"
+        );
 
+        #[cfg(hard_float)]
+        asm!(
+            "
     stp q30, q31,  [sp,#-0x20]!
     stp q28, q29,  [sp,#-0x20]!
     stp q26, q27,  [sp,#-0x20]!
@@ -141,21 +144,74 @@ pub fn tcb_switch(prev: &mut TaskControlBlock, next: &mut TaskControlBlock) {
     mrs     x9,  fpcr
     mrs     x10, fpsr
     stp x9,  x10,  [sp,#-0x10]!
+        "
+        );
+    }
+}
 
+/// return `x9` is sp, `x10` is lr
+#[inline(always)]
+fn store_pc_is_lr() {
+    __ctx_store_x_q();
+    unsafe {
+        asm!(
+            "
     mov x10, lr
     mov x9, sp
     sub x9, x9,   #0x10
-	stp x9, x10,  [sp,#-0x10]!"
+	stp x9, x10,  [sp,#-0x10]!
+        "
         );
-        asm!("mov {0}, x9", out(reg) prev.sp, options(nostack, nomem));
-        let sp = next.sp;
+    }
+}
 
-        asm!("mov sp, {0}", in(reg) sp, options(nostack, nomem));
+#[inline(always)]
+pub(super) fn store_pc_is_elr() {
+    __ctx_store_x_q();
+    unsafe {
+        asm!(
+            "
+    mrs x10, ELR_EL1
+    mov x9, sp
+    sub x9, x9,   #0x10
+	stp x9, x10,  [sp,#-0x10]!
+        "
+        );
+    }
+}
+
+/// return `x9` is sp, `x10` is lr
+#[inline(always)]
+fn restore_pc_is_lr() {
+    unsafe {
+        asm!(
+            "
+    ldp x9, lr, [sp], #0x10
+        "
+        );
+    }
+    __ctx_restore_x_q();
+}
 
+#[inline(always)]
+pub(super) fn restore_pc_is_elr() {
+    unsafe {
         asm!(
             "
-            ldp x9, lr, [sp], #0x10
+    ldp X0, X10,    [sp], #0x10
+    msr	ELR_EL1,    X10
+        "
+        );
+    }
+    __ctx_restore_x_q();
+}
 
+#[inline(always)]
+fn __ctx_restore_x_q() {
+    unsafe {
+        #[cfg(hard_float)]
+        asm!(
+            "
     ldp    x9,  x10, [sp], #0x10
     msr    fpcr, x9
     msr    fpsr, x10
@@ -175,7 +231,11 @@ pub fn tcb_switch(prev: &mut TaskControlBlock, next: &mut TaskControlBlock) {
     ldp    q26, q27, [sp], #0x20
     ldp    q28, q29, [sp], #0x20
     ldp    q30, q31, [sp], #0x20
+            "
+        );
 
+        asm!(
+            "
     ldp X9,X0,      [sp], #0x10
     msr	SPSR_EL1,   X9
 	ldp	X1,X2,      [sp], #0x10
@@ -193,9 +253,19 @@ pub fn tcb_switch(prev: &mut TaskControlBlock, next: &mut TaskControlBlock) {
 	ldp	X25,X26,    [sp], #0x10
 	ldp	X27,X28,    [sp], #0x10
 	ldp	X29,X30,    [sp], #0x10
-            ret
-        ",
-            options(nostack, nomem)
-        )
+        "
+        );
     }
 }
+
+#[inline(never)]
+pub fn tcb_switch(prev: &mut TaskControlBlock, next: &mut TaskControlBlock) {
+    store_pc_is_lr();
+
+    unsafe {
+        asm!("mov {0}, x9", out(reg) prev.sp, options(nostack, nomem));
+        asm!("mov sp, {0}", in(reg)  next.sp, options(nostack, nomem));
+    }
+
+    restore_pc_is_lr();
+}
diff --git a/crates/sparreal-rt/src/arch/aarch64/mod.rs b/crates/sparreal-rt/src/arch/aarch64/mod.rs
@@ -1,4 +1,4 @@
-use core::{arch::asm, ffi::c_void};
+use core::arch::asm;
 
 use aarch64_cpu::registers::*;
 use context::{Context, tcb_switch};
@@ -87,8 +87,6 @@ impl Platform for PlatformImpl {
 
         debug!("next: {:?}", next_ctx);
 
-
-
         tcb_switch(&mut prev, &mut next);
     }