michaelh/zephyr
1
0
Fork 0
Code Releases Activity

riscv: fix wrong access width in assembly code

Browse source 
The thread->base.user_options field is an uint8_t. Access it using lb.
A "copy" of it is made into __esf.fp_state. Make that field an uint8_t
too and access it with lb/sb.

_callee_saved.fcsr is an uint32_t. Access it with lw/sw.
Ditto for is_user_mode.

Signed-off-by: Nicolas Pitre <npitre@baylibre.com>
This commit is contained in:
Nicolas Pitre 2022-02-21 23:18:20 -05:00 • committed by Anas Nashif
commit 94f39e5a80
2 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

40
arch/riscv/core/isr.S
View file

@ -60,18 +60,18 @@
op fs11, _thread_offset_to_fs11(reg) ; op fs11, _thread_offset_to_fs11(reg) ;
#define STORE_FP_CALLEE_SAVED(reg) \ #define STORE_FP_CALLEE_SAVED(reg) \
frcsr t2 ;\ frcsr t2 ;\
RV_OP_STOREREG t2, _thread_offset_to_fcsr(reg) ;\ sw t2, _thread_offset_to_fcsr(reg) ;\
DO_FP_CALLEE_SAVED(RV_OP_STOREFPREG, reg) DO_FP_CALLEE_SAVED(RV_OP_STOREFPREG, reg)
#define LOAD_FP_CALLEE_SAVED(reg) \ #define LOAD_FP_CALLEE_SAVED(reg) \
RV_OP_LOADREG t2, _thread_offset_to_fcsr(reg) ;\ lw t2, _thread_offset_to_fcsr(reg) ;\
fscsr t2 ;\ fscsr t2 ;\
DO_FP_CALLEE_SAVED(RV_OP_LOADFPREG, reg) DO_FP_CALLEE_SAVED(RV_OP_LOADFPREG, reg)
#define COPY_ESF_FP_STATE(to_reg, from_reg, temp) \ #define COPY_ESF_FP_STATE(to_reg, from_reg, temp) \
RV_OP_LOADREG temp, __z_arch_esf_t_fp_state_OFFSET(from_reg) ;\ lb temp, __z_arch_esf_t_fp_state_OFFSET(from_reg) ;\
RV_OP_STOREREG temp, __z_arch_esf_t_fp_state_OFFSET(to_reg) ; sb temp, __z_arch_esf_t_fp_state_OFFSET(to_reg) ;
#define COPY_ESF_FP(to_reg, from_reg, temp) \ #define COPY_ESF_FP(to_reg, from_reg, temp) \
RV_OP_LOADREG temp, __z_arch_esf_t_ft0_OFFSET(from_reg) ;\ RV_OP_LOADREG temp, __z_arch_esf_t_ft0_OFFSET(from_reg) ;\
@ -304,9 +304,9 @@ SECTION_FUNC(exception.entry, __irq_wrapper)
/* Assess whether floating-point registers need to be saved. */ /* Assess whether floating-point registers need to be saved. */
la t0, _kernel la t0, _kernel
RV_OP_LOADREG t0, _kernel_offset_to_current(t0) RV_OP_LOADREG t0, _kernel_offset_to_current(t0)
RV_OP_LOADREG t0, _thread_offset_to_user_options(t0) lb t0, _thread_offset_to_user_options(t0)
andi t0, t0, K_FP_REGS andi t0, t0, K_FP_REGS
RV_OP_STOREREG t0, __z_arch_esf_t_fp_state_OFFSET(sp) sb t0, __z_arch_esf_t_fp_state_OFFSET(sp)
beqz t0, skip_store_fp_caller_saved beqz t0, skip_store_fp_caller_saved
STORE_FP_CALLER_SAVED(sp) STORE_FP_CALLER_SAVED(sp)
@ -352,7 +352,7 @@ skip_store_fp_caller_saved:
#if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING) #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
/* Assess whether floating-point registers need to be saved. */ /* Assess whether floating-point registers need to be saved. */
RV_OP_LOADREG t2, _thread_offset_to_user_options(t1) lb t2, _thread_offset_to_user_options(t1)
andi t2, t2, K_FP_REGS andi t2, t2, K_FP_REGS
beqz t2, skip_store_fp_callee_saved_user beqz t2, skip_store_fp_callee_saved_user
STORE_FP_CALLEE_SAVED(t1) STORE_FP_CALLEE_SAVED(t1)
@ -362,7 +362,7 @@ skip_store_fp_callee_saved_user:
is_priv_sp: is_priv_sp:
/* Clear user mode variable */ /* Clear user mode variable */
la t0, is_user_mode la t0, is_user_mode
sb zero, 0(t0) sw zero, 0(t0)
#endif /* CONFIG_USERSPACE */ #endif /* CONFIG_USERSPACE */
/* /*
@ -489,7 +489,7 @@ not_user_syscall:
csrr t0, mscratch csrr t0, mscratch
addi sp, sp, -__z_arch_esf_t_SIZEOF addi sp, sp, -__z_arch_esf_t_SIZEOF
#if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING) #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
RV_OP_LOADREG t1, __z_arch_esf_t_fp_state_OFFSET(t0) lb t1, __z_arch_esf_t_fp_state_OFFSET(t0)
beqz t1, skip_fp_move_kernel_syscall beqz t1, skip_fp_move_kernel_syscall
COPY_ESF_FP(sp, t0, t1) COPY_ESF_FP(sp, t0, t1)
skip_fp_move_kernel_syscall: skip_fp_move_kernel_syscall:
@ -562,7 +562,7 @@ is_user_syscall:
csrr t0, mscratch csrr t0, mscratch
addi sp, sp, -__z_arch_esf_t_SIZEOF addi sp, sp, -__z_arch_esf_t_SIZEOF
#if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING) #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
RV_OP_LOADREG t1, __z_arch_esf_t_fp_state_OFFSET(t0) lb t1, __z_arch_esf_t_fp_state_OFFSET(t0)
beqz t1, skip_fp_copy_user_syscall beqz t1, skip_fp_copy_user_syscall
COPY_ESF_FP(sp, t0, t1) COPY_ESF_FP(sp, t0, t1)
skip_fp_copy_user_syscall: skip_fp_copy_user_syscall:
@ -636,7 +636,7 @@ no_reschedule_user_fault:
csrr t0, mscratch csrr t0, mscratch
addi sp, sp, -__z_arch_esf_t_SIZEOF addi sp, sp, -__z_arch_esf_t_SIZEOF
#if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING) #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
RV_OP_LOADREG t1, __z_arch_esf_t_fp_state_OFFSET(t0) lb t1, __z_arch_esf_t_fp_state_OFFSET(t0)
beqz t1, skip_fp_copy_return_user_syscall beqz t1, skip_fp_copy_return_user_syscall
COPY_ESF_FP(sp, t0, t1) COPY_ESF_FP(sp, t0, t1)
skip_fp_copy_return_user_syscall: skip_fp_copy_return_user_syscall:
@ -785,7 +785,7 @@ on_thread_stack:
csrr t0, mscratch csrr t0, mscratch
addi sp, sp, -__z_arch_esf_t_SIZEOF addi sp, sp, -__z_arch_esf_t_SIZEOF
#if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING) #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
RV_OP_LOADREG t1, __z_arch_esf_t_fp_state_OFFSET(t0) lb t1, __z_arch_esf_t_fp_state_OFFSET(t0)
beqz t1, skip_fp_move_irq beqz t1, skip_fp_move_irq
COPY_ESF_FP(sp, t0, t1) COPY_ESF_FP(sp, t0, t1)
skip_fp_move_irq: skip_fp_move_irq:
@ -859,7 +859,7 @@ reschedule:
#if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING) #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
/* Assess whether floating-point registers need to be saved. */ /* Assess whether floating-point registers need to be saved. */
RV_OP_LOADREG t2, _thread_offset_to_user_options(t1) lb t2, _thread_offset_to_user_options(t1)
andi t2, t2, K_FP_REGS andi t2, t2, K_FP_REGS
beqz t2, skip_store_fp_callee_saved beqz t2, skip_store_fp_callee_saved
STORE_FP_CALLEE_SAVED(t1) STORE_FP_CALLEE_SAVED(t1)
@ -905,7 +905,7 @@ skip_callee_saved_reg:
#if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING) #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
/* Determine if we need to restore floating-point registers. */ /* Determine if we need to restore floating-point registers. */
RV_OP_LOADREG t2, _thread_offset_to_user_options(t1) lb t2, _thread_offset_to_user_options(t1)
andi t2, t2, K_FP_REGS andi t2, t2, K_FP_REGS
beqz t2, skip_load_fp_callee_saved beqz t2, skip_load_fp_callee_saved
@ -956,7 +956,7 @@ skip_load_fp_callee_saved:
/* Set user mode variable */ /* Set user mode variable */
li t2, 0x1 li t2, 0x1
la t3, is_user_mode la t3, is_user_mode
sb t2, 0(t3) sw t2, 0(t3)
kernel_swap: kernel_swap:
#endif /* CONFIG_USERSPACE */ #endif /* CONFIG_USERSPACE */
@ -994,7 +994,7 @@ no_reschedule_resched:
* to happen before restoring integer registers to avoid stomping on * to happen before restoring integer registers to avoid stomping on
* t0. * t0.
*/ */
RV_OP_LOADREG t0, __z_arch_esf_t_fp_state_OFFSET(sp) lb t0, __z_arch_esf_t_fp_state_OFFSET(sp)
beqz t0, skip_load_fp_caller_saved_resched beqz t0, skip_load_fp_caller_saved_resched
LOAD_FP_CALLER_SAVED(sp) LOAD_FP_CALLER_SAVED(sp)
@ -1025,7 +1025,7 @@ no_reschedule:
/* Set user mode variable */ /* Set user mode variable */
li t1, 0x1 li t1, 0x1
la t0, is_user_mode la t0, is_user_mode
sb t1, 0(t0) sw t1, 0(t0)
la t0, irq_flag la t0, irq_flag
lb t0, 0(t0) lb t0, 0(t0)
@ -1059,7 +1059,7 @@ no_enter_user:
* to happen before restoring integer registers to avoid stomping on * to happen before restoring integer registers to avoid stomping on
* t0. * t0.
*/ */
RV_OP_LOADREG t0, __z_arch_esf_t_fp_state_OFFSET(sp) lb t0, __z_arch_esf_t_fp_state_OFFSET(sp)
beqz t0, skip_load_fp_caller_saved beqz t0, skip_load_fp_caller_saved
LOAD_FP_CALLER_SAVED(sp) LOAD_FP_CALLER_SAVED(sp)

2
include/arch/riscv/exp.h
View file

@ -74,7 +74,7 @@ struct __esf {
ulong_t mstatus; /* machine status register */ ulong_t mstatus; /* machine status register */
#if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING) #if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
ulong_t fp_state; /* Floating-point saved context state. */ uint8_t fp_state; /* Floating-point saved context state. */
RV_FP_TYPE ft0; /* Caller-saved temporary floating register */ RV_FP_TYPE ft0; /* Caller-saved temporary floating register */
RV_FP_TYPE ft1; /* Caller-saved temporary floating register */ RV_FP_TYPE ft1; /* Caller-saved temporary floating register */
RV_FP_TYPE ft2; /* Caller-saved temporary floating register */ RV_FP_TYPE ft2; /* Caller-saved temporary floating register */