This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 3f021d5429da49a1919da90fa746c19d8817d770 Author: Yanfeng Liu <[email protected]> AuthorDate: Thu Aug 8 06:18:26 2024 +0800 riscv/fork: fix fp/s0 field position The fp/s0 field position shall be in line with the macro FORK_FP_OFFSET/FORK_S0_OFFSET. Signed-off-by: Yanfeng Liu <[email protected]> --- arch/risc-v/src/common/riscv_fork.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/risc-v/src/common/riscv_fork.h b/arch/risc-v/src/common/riscv_fork.h index 26a2ec5925..bfb2560f1f 100644 --- a/arch/risc-v/src/common/riscv_fork.h +++ b/arch/risc-v/src/common/riscv_fork.h @@ -119,6 +119,11 @@ struct fork_s { /* CPU registers */ +#ifdef CONFIG_RISCV_FRAMEPOINTER + uintreg_t fp; /* Frame pointer */ +#else + uintreg_t s0; /* Saved register s0 */ +#endif uintreg_t s1; /* Saved register s1 */ uintreg_t s2; /* Saved register s2 */ uintreg_t s3; /* Saved register s3 */ @@ -130,11 +135,6 @@ struct fork_s uintreg_t s9; /* Saved register s9 */ uintreg_t s10; /* Saved register s10 */ uintreg_t s11; /* Saved register s11 */ -#ifdef CONFIG_RISCV_FRAMEPOINTER - uintreg_t fp; /* Frame pointer */ -#else - uintreg_t s0; /* Saved register s0 */ -#endif uintreg_t sp; /* Stack pointer */ uintreg_t ra; /* Return address */ #ifdef RISCV_SAVE_GP
