ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

print_error_report: Don't care about osRtxStackFillPattern and dump whole remaining.

pull/11332/head
Andrew Chong 2019-08-27 13:32:16 +08:00
parent 248746113f
commit 575bd31060
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.astylerc
View File

@ -34,4 +34,4 @@ attach-classes
# Extend longer lines, define maximum 120 value. This results in aligned code, # Extend longer lines, define maximum 120 value. This results in aligned code,
# otherwise the lines are broken and not consistent # otherwise the lines are broken and not consistent
max-continuation-indent=120 # max-continuation-indent=120

21
platform/source/mbed_error.c
View File

@ -577,28 +577,9 @@ static void print_error_report(const mbed_error_ctx *ctx, const char *error_msg,
#endif #endif
#if MBED_STACK_DUMP_ENABLED && defined(MBED_CONF_RTOS_PRESENT) #if MBED_STACK_DUMP_ENABLED && defined(MBED_CONF_RTOS_PRESENT)
/** The internal threshold to detect the end of the stack.
* The stack is filled with osRtxStackFillPattern at the end.
* However, it is possible that the call stack parameters can theoretically have consecutive osRtxStackFillPattern instances.
* For the best effort stack end detection, we will consider STACK_END_MARK_CNT consecutive osRtxStackFillPattern instances as the stack end. */
#define STACK_END_MARK_CNT 3
#define STACK_DUMP_WIDTH 8 #define STACK_DUMP_WIDTH 8
mbed_error_printf("\n\nStack Dump:"); mbed_error_printf("\n\nStack Dump:");
// Find the stack end. uint32_t st_end = ctx->thread_stack_mem + ctx->thread_stack_size;
int stack_end_cnt = 0;
uint32_t st_end = ctx->thread_current_sp;
for (; st_end <= ctx->thread_stack_mem + ctx->thread_stack_size; st_end += sizeof(int)) {
uint32_t st_val = *((uint32_t *)st_end);
if (st_val == osRtxStackFillPattern) {
stack_end_cnt++;
} else {
stack_end_cnt = 0;
}
if (stack_end_cnt >= STACK_END_MARK_CNT) {
st_end -= (STACK_END_MARK_CNT - 1) * sizeof(int);
break;
}
}
for (uint32_t st = ctx->thread_current_sp; st <= st_end; st += sizeof(int) * STACK_DUMP_WIDTH) { for (uint32_t st = ctx->thread_current_sp; st <= st_end; st += sizeof(int) * STACK_DUMP_WIDTH) {
mbed_error_printf("\n0x%08" PRIX32 ":", st); mbed_error_printf("\n0x%08" PRIX32 ":", st);
for (int i = 0; i < STACK_DUMP_WIDTH; i++) { for (int i = 0; i < STACK_DUMP_WIDTH; i++) {