Skip to content

[libcpu][cortex-m33]Added HardFault_Handler to save floating point registers #10624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rbb666 merged 1 commit into from
Aug 20, 2025
Merged

[libcpu][cortex-m33]Added HardFault_Handler to save floating point registers #10624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions libcpu/arm/cortex-m33/context_gcc.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,12 @@ HardFault_Handler:
MRS r0, psp /* get fault context from thread. */
get_sp_done:

#if defined (__VFP_FP__) && !defined(__SOFTFP__)
TST lr, #0x10 /* if(!EXC_RETURN[4]) */
IT EQ
VSTMDBEQ r0!, {d8 - d15} /* push FPU register s16~s31 */
#endif

STMFD r0!, {r4 - r11} /* push r4 - r11 register */

LDR r2, =rt_trustzone_current_context /* r2 = &rt_secure_current_context */
Expand Down
7 changes: 7 additions & 0 deletions libcpu/arm/cortex-m33/context_iar.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,13 @@ HardFault_Handler:
MRS r0, psp ; get fault context from thread.
get_sp_done

#if defined ( __ARMVFP__ )
TST lr, #0x10 ; if(!EXC_RETURN[4])
BNE skip_push_fpu
VSTMDB r0!, {d8 - d15} ; push FPU register s16~s31
skip_push_fpu
#endif

STMFD r0!, {r4 - r11} ; push r4 - r11 register

LDR r2, =rt_trustzone_current_context ; r2 = &rt_secure_current_context
Expand Down
11 changes: 8 additions & 3 deletions libcpu/arm/cortex-m33/context_rvds.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,12 +272,17 @@ rt_hw_interrupt_thread_switch PROC
HardFault_Handler PROC

; get current context
MRS r0, msp ;get fault context from handler
TST lr, #0x04 ;if(!EXC_RETURN[2])
MRS r0, msp ; get fault context from handler
TST lr, #0x04 ; if(!EXC_RETURN[2])
BEQ get_sp_done
MRS r0, psp ;get fault context from thread
MRS r0, psp ; get fault context from thread
get_sp_done

IF {FPU} != "SoftVFP"
TST lr, #0x10 ; if(!EXC_RETURN[4])
VSTMFDEQ r0!, {d8 - d15} ; push FPU register s16~s31
ENDIF

STMFD r0!, {r4 - r11} ; push r4 - r11 register

LDR r2, =rt_trustzone_current_context ; r2 = &rt_secure_current_context
Expand Down
Loading