sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/risc-v: Correct handling of QPFPU and DPFPU

Browse Source 
If QPFPU enabled we will never enter the expected QPFPU branch since
option QPFPU depend on DPFPU.

Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
This commit is contained in:
Huang Qi 2022-03-09 09:10:44 +08:00 committed by Petro Karashchenko
parent b690262aac
commit 8dedf1d9af
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/risc-v/include/irq.h
View File

@ -183,10 +183,10 @@
#define INT_XCPT_SIZE (INT_REG_SIZE * INT_XCPT_REGS) #define INT_XCPT_SIZE (INT_REG_SIZE * INT_XCPT_REGS)
#ifdef CONFIG_ARCH_RV32 #ifdef CONFIG_ARCH_RV32
# if defined(CONFIG_ARCH_DPFPU) # if defined(CONFIG_ARCH_QPFPU)
# define FPU_REG_SIZE 2
# elif defined(CONFIG_ARCH_QPFPU)
# define FPU_REG_SIZE 4 # define FPU_REG_SIZE 4
# elif defined(CONFIG_ARCH_DPFPU)
# define FPU_REG_SIZE 2
# elif defined(CONFIG_ARCH_FPU) # elif defined(CONFIG_ARCH_FPU)
# define FPU_REG_SIZE 1 # define FPU_REG_SIZE 1
# endif # endif

8
arch/risc-v/src/common/riscv_fpu.S
View File

@ -48,12 +48,12 @@
#define FS_CLEAN 0x4000 #define FS_CLEAN 0x4000
#define FS_DIRTY 0x6000 #define FS_DIRTY 0x6000
#if defined(CONFIG_ARCH_DPFPU) #if defined(CONFIG_ARCH_QPFPU)
# define FLOAD fld
# define FSTORE fsd
#elif defined(CONFIG_ARCH_QPFPU)
# define FLOAD flq # define FLOAD flq
# define FSTORE fsq # define FSTORE fsq
#elif defined(CONFIG_ARCH_DPFPU)
# define FLOAD fld
# define FSTORE fsd
#else #else
# define FLOAD flw # define FLOAD flw
# define FSTORE fsw # define FSTORE fsw