libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[libcpu] discard rt_current_thread (#8976) 

* [libcpu] rv64: discard rt_current_thread

* arm: using rt_thread_self to fetch current TCB
This commit is contained in:
Shell 2024-05-26 22:00:17 +08:00 committed by GitHub
parent 1a1514640a
commit 397cdcd132
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/lwp/arch/risc-v/rv64/lwp_gcc.S
View File

@ -35,7 +35,7 @@ arch_start_umode:
// load kstack for user process // load kstack for user process
csrw sscratch, a3 csrw sscratch, a3
li t0, SSTATUS_SPP | SSTATUS_SIE // set as user mode, close interrupt li t0, SSTATUS_SPP | SSTATUS_SIE // set as user mode, close interrupt
csrc sstatus, t0 csrc sstatus, t0
li t0, SSTATUS_SPIE // enable interrupt when return to user mode li t0, SSTATUS_SPIE // enable interrupt when return to user mode
csrs sstatus, t0 csrs sstatus, t0
@ -112,7 +112,7 @@ arch_signal_quit:
mv sp, a0 mv sp, a0
/* restore user sp before enter trap */ /* restore user sp before enter trap */
addi a0, sp, CTX_REG_NR * REGBYTES addi a0, sp, CTX_REG_NR * REGBYTES
csrw sscratch, a0 csrw sscratch, a0
@ -234,8 +234,7 @@ __restore_sp_from_sscratch: // from kernel
j __move_stack_context j __move_stack_context
__restore_sp_from_tcb: // from user __restore_sp_from_tcb: // from user
la a0, rt_current_thread jal rt_thread_self
LOAD a0, 0(a0)
jal get_thread_kernel_stack_top jal get_thread_kernel_stack_top
mv t0, a0 mv t0, a0
@ -272,7 +271,7 @@ copy_context_loop:
call syscall_handler call syscall_handler
j arch_syscall_exit j arch_syscall_exit
START_POINT_END(syscall_entry) START_POINT_END(syscall_entry)
.global arch_syscall_exit .global arch_syscall_exit
arch_syscall_exit: arch_syscall_exit:
CLOSE_INTERRUPT CLOSE_INTERRUPT

3
libcpu/arm/cortex-m33/context_gcc.S
View File

@ -196,8 +196,7 @@ contex_ns_load:
#if defined (RT_USING_MEM_PROTECTION) #if defined (RT_USING_MEM_PROTECTION)
PUSH {r0-r3, r12, lr} PUSH {r0-r3, r12, lr}
LDR r1, =rt_current_thread BL rt_thread_self
LDR r0, [r1]
BL rt_hw_mpu_table_switch BL rt_hw_mpu_table_switch
POP {r0-r3, r12, lr} POP {r0-r3, r12, lr}
#endif #endif

3
libcpu/arm/cortex-m7/context_gcc.S
View File

@ -156,8 +156,7 @@ switch_to_thread:
#if defined (RT_USING_MEM_PROTECTION) #if defined (RT_USING_MEM_PROTECTION)
PUSH {r0-r3, r12, lr} PUSH {r0-r3, r12, lr}
LDR r1, =rt_current_thread BL rt_thread_self
LDR r0, [r1]
BL rt_hw_mpu_table_switch BL rt_hw_mpu_table_switch
POP {r0-r3, r12, lr} POP {r0-r3, r12, lr}
#endif #endif

10
libcpu/risc-v/t-head/c906/context_gcc.S
View File

@ -17,11 +17,10 @@
rt_hw_context_switch_to: rt_hw_context_switch_to:
LOAD sp, (a0) LOAD sp, (a0)
la s0, rt_current_thread jal rt_thread_self
LOAD s1, (s0) mv s1, a0
#ifdef RT_USING_SMART #ifdef RT_USING_SMART
mv a0, s1
jal lwp_aspace_switch jal lwp_aspace_switch
#endif #endif
@ -50,11 +49,10 @@ rt_hw_context_switch:
//restore to thread context //restore to thread context
LOAD sp, (a1) LOAD sp, (a1)
la s0, rt_current_thread jal rt_thread_self
LOAD s1, (s0) mv s1, a0
#ifdef RT_USING_SMART #ifdef RT_USING_SMART
mv a0, s1
jal lwp_aspace_switch jal lwp_aspace_switch
#endif #endif

10
libcpu/risc-v/virt64/context_gcc.S
View File

@ -75,11 +75,10 @@
rt_hw_context_switch_to: rt_hw_context_switch_to:
LOAD sp, (a0) LOAD sp, (a0)
la s0, rt_current_thread jal rt_thread_self
LOAD s1, (s0) mv s1, a0
#ifdef RT_USING_SMART #ifdef RT_USING_SMART
mv a0, s1
jal lwp_aspace_switch jal lwp_aspace_switch
#endif #endif
@ -103,11 +102,10 @@ rt_hw_context_switch:
LOAD sp, (a1) LOAD sp, (a1)
// restore Address Space // restore Address Space
la s0, rt_current_thread jal rt_thread_self
LOAD s1, (s0) mv s1, a0
#ifdef RT_USING_SMART #ifdef RT_USING_SMART
mv a0, s1
jal lwp_aspace_switch jal lwp_aspace_switch
#endif #endif