Skip to content

Commit

Permalink
Fix RV64 context_restore bug when F/D extension is enabled
Browse files Browse the repository at this point in the history 
Signed-off-by: Jim Huang <[email protected]>
  • Loading branch information
@Jer6y @jserv
Jer6y authored and jserv committed Nov 21, 2024
1 parent 51e2a04 commit 0670e81
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
8 changes: 8 additions & 0 deletions ports/risc-v64/gnu/src/tx_thread_context_restore.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,10 @@ _tx_thread_context_restore:
LOAD t0, 30*REGBYTES(sp) // Recover mepc
csrw mepc, t0 // Setup mepc
li t0, 0x1880 // Prepare MPIP
#if defined(__riscv_float_abi_single) || defined(__riscv_float_abi_double)
li t1, 1 << 13
or t0, t1, t0
#endif
csrw mstatus, t0 // Enable MPIP

LOAD x1, 28*REGBYTES(sp) // Recover RA
Expand Down Expand Up @@ -259,6 +263,10 @@ _tx_thread_no_preempt_restore:
LOAD t0, 240(sp) // Recover mepc
csrw mepc, t0 // Setup mepc
li t0, 0x1880 // Prepare MPIP
#if defined(__riscv_float_abi_single) || defined(__riscv_float_abi_double)
li t1, 1 << 13
or t0, t1, t0
#endif
csrw mstatus, t0 // Enable MPIP

LOAD x1, 28*REGBYTES(sp) // Recover RA
Expand Down
4 changes: 4 additions & 0 deletions ports/risc-v64/gnu/src/tx_thread_schedule.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,10 @@ _tx_thread_schedule_loop:
LOAD t0, 30*REGBYTES(sp) // Recover mepc
csrw mepc, t0 // Store mepc
li t0, 0x1880 // Prepare MPIP
#if defined(__riscv_float_abi_single) || defined(__riscv_float_abi_double)
li t1, 1 << 13
or t0, t1, t0
#endif
csrw mstatus, t0 // Enable MPIP

LOAD x1, 28*REGBYTES(sp) // Recover RA
Expand Down

0 comments on commit 0670e81

Please sign in to comment.