Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_ChibiOS: increase the number of memory regions for crashdump 

also checks num region overruns for bss and heap
This commit is contained in:
bugobliterator 2024-10-13 15:52:45 +08:00 committed by Andrew Tridgell
parent c3affa4e94
commit 2524583dda
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_HAL_ChibiOS/hwdef/common/crashdump.c
View File

@ -97,7 +97,7 @@ const CrashCatcherMemoryRegion* CrashCatcher_GetMemoryRegions(void);
const CrashCatcherMemoryRegion* CrashCatcher_GetMemoryRegions(void) const CrashCatcherMemoryRegion* CrashCatcher_GetMemoryRegions(void)
{ {
// do a full dump if on serial // do a full dump if on serial
static CrashCatcherMemoryRegion regions[60] = { static CrashCatcherMemoryRegion regions[80] = {
{(uint32_t)&__ram0_start__, (uint32_t)&__ram0_end__, CRASH_CATCHER_BYTE}, {(uint32_t)&__ram0_start__, (uint32_t)&__ram0_end__, CRASH_CATCHER_BYTE},
{(uint32_t)&ch_system, (uint32_t)&ch_system + sizeof(ch_system), CRASH_CATCHER_BYTE}}; {(uint32_t)&ch_system, (uint32_t)&ch_system + sizeof(ch_system), CRASH_CATCHER_BYTE}};
uint32_t total_dump_size = dump_size + buf_off + REMAINDER_MEM_REGION_SIZE; uint32_t total_dump_size = dump_size + buf_off + REMAINDER_MEM_REGION_SIZE;
@ -138,7 +138,7 @@ const CrashCatcherMemoryRegion* CrashCatcher_GetMemoryRegions(void)
// log statically alocated memory // log statically alocated memory
int32_t bss_size = ((uint32_t)&__bss_end__) - ((uint32_t)&__bss_base__); int32_t bss_size = ((uint32_t)&__bss_end__) - ((uint32_t)&__bss_base__);
int32_t available_space = stm32_crash_dump_max_size() - total_dump_size; int32_t available_space = stm32_crash_dump_max_size() - total_dump_size;
if (available_space < 0) { if (available_space < 0 || curr_region >= (ARRAY_SIZE(regions) - 1)) {
// we can't log anymore than this // we can't log anymore than this
goto finalise; goto finalise;
} }
@ -157,7 +157,7 @@ const CrashCatcherMemoryRegion* CrashCatcher_GetMemoryRegions(void)
// dump the Heap as well as much as we can // dump the Heap as well as much as we can
int32_t heap_size = ((uint32_t)&__heap_end__) - ((uint32_t)&__heap_base__); int32_t heap_size = ((uint32_t)&__heap_end__) - ((uint32_t)&__heap_base__);
available_space = stm32_crash_dump_max_size() - total_dump_size; available_space = stm32_crash_dump_max_size() - total_dump_size;
if (available_space < 0) { if (available_space < 0 || curr_region >= (ARRAY_SIZE(regions) - 1)) {
// we can't log anymore than this // we can't log anymore than this
goto finalise; goto finalise;
} }