Skip to content

Commit e525c38

Browse files
[libcpu][cortex-a] Refactor FPU stack initialization for maintainability (#10919)
* Initial plan * [libcpu][cortex-a] Improve FPU stack initialization implementation Co-authored-by: BernardXiong <1241087+BernardXiong@users.noreply.github.com> * [libcpu][cortex-a] Replace FPU init loop with rt_memset Co-authored-by: BernardXiong <1241087+BernardXiong@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: BernardXiong <1241087+BernardXiong@users.noreply.github.com>
1 parent 284081f commit e525c38

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

libcpu/arm/cortex-a/cpuport.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@ struct rt_hw_stack
7272
#define E_Bit (1<<9)
7373
#define J_Bit (1<<24)
7474

75+
/* VFP/NEON register count for FPU context */
76+
#ifndef VFP_DATA_NR
77+
#define VFP_DATA_NR 64 /* 32 double-precision registers = 64 words */
78+
#endif
79+
7580
#ifdef RT_USING_SMP
7681
typedef union {
7782
unsigned long slock;

libcpu/arm/cortex-a/stack.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,13 @@ rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter,
6161
*(--stk) = 0; /* user sp*/
6262
#endif
6363
#ifdef RT_USING_FPU
64-
*(--stk) = 0; /* not use fpu*/
64+
/* FPU context initialization matches context_gcc.S restore order:
65+
* Stack layout (high to low): FPEXC -> FPSCR -> D16-D31 -> D0-D15
66+
*/
67+
stk -= VFP_DATA_NR;
68+
rt_memset(stk, 0, VFP_DATA_NR * sizeof(rt_uint32_t)); /* Initialize D0-D31 (64 words for 32 double regs) */
69+
*(--stk) = 0; /* FPSCR: Floating-Point Status and Control Register */
70+
*(--stk) = 0x40000000; /* FPEXC: Enable FPU (bit 30 = EN) */
6571
#endif
6672

6773
/* return task's current stack address */

0 commit comments

Comments
 (0)