Skip to content

修改port文件中FPU启用判断逻辑，断言钩子函数增加关调度保护，防止断言期间被调度 #24

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

Open
milo-9 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

修改port文件中FPU启用判断逻辑，断言钩子函数增加关调度保护，防止断言期间被调度 #24

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9546550
修改FPU启用判断
milo-9 Nov 4, 2025
5d9b760
完善断言钩子函数内部逻辑
milo-9 Nov 4, 2025
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
11 changes: 10 additions & 1 deletion cmb_port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,15 @@ void rt_cm_backtrace_exception_hook(void *context)
list_thread();
#endif

#if ((defined (__CC_ARM) && defined (__TARGET_FPU_VFP)) \
|| (defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050) && defined (__ARM_PCS_VFP)) \
|| (defined (__ICCARM__) && defined (__ARMVFP__)) \
|| (defined (__GNUC__) && defined (__VFP_FP__) && !defined (__SOFTFP__)) )
#define USE_FPU
#endif

/* the PSP is changed by RT-Thread HardFault_Handler, so restore it to HardFault context */
#if (defined (__VFP_FP__) && !defined(__SOFTFP__)) || (defined (__ARMVFP__)) || (defined(__ARM_PCS_VFP) || defined(__TARGET_FPU_VFP))
#ifdef USE_FPU
cmb_set_psp(cmb_get_psp() + 4 * 10);
#else
cmb_set_psp(cmb_get_psp() + 4 * 9);
Expand Down Expand Up @@ -239,6 +246,7 @@ void rt_cm_backtrace_exception_hook(void *context)

void rt_cm_backtrace_assert_hook(const char* ex, const char* func, rt_size_t line)
{
rt_enter_critical();
rt_interrupt_enter();

#ifdef RT_USING_FINSH
Expand All @@ -254,6 +262,7 @@ void rt_cm_backtrace_assert_hook(const char* ex, const char* func, rt_size_t lin
cmb_println("Current system tick: %ld", rt_tick_get());

rt_interrupt_leave();
rt_exit_critical();
}

RT_WEAK rt_err_t exception_hook(void *context) {
Expand Down