dengzhihao
/
CmBacktrace
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【完善】RTOS 平台的识别准确性。改良 addr2line 命令参数

Browse Source
pull/73/head
朱天龙 (Armink) 2 years ago
parent 8d07e7ba07
commit 4abadfa0c4
6 changed files with 80 additions and 36 deletions
Show Stats Download Patch File Download Diff File

2
cm_backtrace/Languages/en-US/cmb_en_US.h
Unescape Escape View File

@ -36,7 +36,7 @@
[PRINT_MAIN_STACK_INFO] = "====== Main stack information ======", [PRINT_MAIN_STACK_INFO] = "====== Main stack information ======",
[PRINT_THREAD_STACK_OVERFLOW] = "Error: Thread stack(%08x) was overflow", [PRINT_THREAD_STACK_OVERFLOW] = "Error: Thread stack(%08x) was overflow",
[PRINT_MAIN_STACK_OVERFLOW] = "Error: Main stack(%08x) was overflow", [PRINT_MAIN_STACK_OVERFLOW] = "Error: Main stack(%08x) was overflow",
[PRINT_CALL_STACK_INFO] = "Show more call stack info by run: addr2line -e %s%s -a -f %s", [PRINT_CALL_STACK_INFO] = "Show more call stack info by run: addr2line -e %s%s -afpiC %.*s",
[PRINT_CALL_STACK_ERR] = "Dump call stack has an error", [PRINT_CALL_STACK_ERR] = "Dump call stack has an error",
[PRINT_FAULT_ON_THREAD] = "Fault on thread %s", [PRINT_FAULT_ON_THREAD] = "Fault on thread %s",
[PRINT_FAULT_ON_HANDLER] = "Fault on interrupt or bare metal(no OS) environment", [PRINT_FAULT_ON_HANDLER] = "Fault on interrupt or bare metal(no OS) environment",

2
cm_backtrace/Languages/zh-CN/cmb_zh_CN.h
Unescape Escape View File

@ -36,7 +36,7 @@
[PRINT_MAIN_STACK_INFO] = "============ 主堆栈信息 ============", [PRINT_MAIN_STACK_INFO] = "============ 主堆栈信息 ============",
[PRINT_THREAD_STACK_OVERFLOW] = "错误：线程栈(%08x)发生溢出", [PRINT_THREAD_STACK_OVERFLOW] = "错误：线程栈(%08x)发生溢出",
[PRINT_MAIN_STACK_OVERFLOW] = "错误：主栈(%08x)发生溢出", [PRINT_MAIN_STACK_OVERFLOW] = "错误：主栈(%08x)发生溢出",
[PRINT_CALL_STACK_INFO] = "查看更多函数调用栈信息，请运行：addr2line -e %s%s -a -f %s", [PRINT_CALL_STACK_INFO] = "查看更多函数调用栈信息，请运行：addr2line -e %s%s -afpiC %.*s",
[PRINT_CALL_STACK_ERR] = "获取函数调用栈失败", [PRINT_CALL_STACK_ERR] = "获取函数调用栈失败",
[PRINT_FAULT_ON_THREAD] = "在线程(%s)中发生错误异常", [PRINT_FAULT_ON_THREAD] = "在线程(%s)中发生错误异常",
[PRINT_FAULT_ON_HANDLER] = "在中断或裸机环境下发生错误异常", [PRINT_FAULT_ON_HANDLER] = "在中断或裸机环境下发生错误异常",

2
cm_backtrace/Languages/zh-CN/cmb_zh_CN_UTF8.h
Unescape Escape View File

@ -36,7 +36,7 @@
[PRINT_MAIN_STACK_INFO] = "============ 主堆栈信息 ============", [PRINT_MAIN_STACK_INFO] = "============ 主堆栈信息 ============",
[PRINT_THREAD_STACK_OVERFLOW] = "错误：线程栈(%08x)发生溢出", [PRINT_THREAD_STACK_OVERFLOW] = "错误：线程栈(%08x)发生溢出",
[PRINT_MAIN_STACK_OVERFLOW] = "错误：主栈(%08x)发生溢出", [PRINT_MAIN_STACK_OVERFLOW] = "错误：主栈(%08x)发生溢出",
[PRINT_CALL_STACK_INFO] = "查看更多函数调用栈信息，请运行：addr2line -e %s%s -a -f %s", [PRINT_CALL_STACK_INFO] = "查看更多函数调用栈信息，请运行：addr2line -e %s%s -afpiC %.*s",
[PRINT_CALL_STACK_ERR] = "获取函数调用栈失败", [PRINT_CALL_STACK_ERR] = "获取函数调用栈失败",
[PRINT_FAULT_ON_THREAD] = "在线程(%s)中发生错误异常", [PRINT_FAULT_ON_THREAD] = "在线程(%s)中发生错误异常",
[PRINT_FAULT_ON_HANDLER] = "在中断或裸机环境下发生错误异常", [PRINT_FAULT_ON_HANDLER] = "在中断或裸机环境下发生错误异常",

78
cm_backtrace/cm_backtrace.c
Unescape Escape View File

@ -117,9 +117,9 @@ static const char * const print_info[] = {
#endif #endif
}; };
static char fw_name[CMB_NAME_MAX] = {0}; static char fw_name[CMB_NAME_MAX + 1] = {0};
static char hw_ver[CMB_NAME_MAX] = {0}; static char hw_ver[CMB_NAME_MAX + 1] = {0};
static char sw_ver[CMB_NAME_MAX] = {0}; static char sw_ver[CMB_NAME_MAX + 1] = {0};
static uint32_t main_stack_start_addr = 0; static uint32_t main_stack_start_addr = 0;
static size_t main_stack_size = 0; static size_t main_stack_size = 0;
static uint32_t code_start_addr = 0; static uint32_t code_start_addr = 0;
@ -187,13 +187,14 @@ void cm_backtrace_firmware_info(void) {
* @param start_addr stack start address * @param start_addr stack start address
* @param size stack size * @param size stack size
*/ */
static void get_cur_thread_stack_info(uint32_t sp, uint32_t *start_addr, size_t *size) { static void get_cur_thread_stack_info(uint32_t *sp, uint32_t *start_addr, size_t *size) {
CMB_ASSERT(start_addr); CMB_ASSERT(start_addr);
CMB_ASSERT(size); CMB_ASSERT(size);
#if (CMB_OS_PLATFORM_TYPE == CMB_OS_PLATFORM_RTT) #if (CMB_OS_PLATFORM_TYPE == CMB_OS_PLATFORM_RTT)
*start_addr = (uint32_t) rt_thread_self()->stack_addr; *start_addr = (uint32_t) rt_thread_self()->stack_addr;
*size = rt_thread_self()->stack_size; *size = rt_thread_self()->stack_size;
*sp = (uint32_t)rt_thread_self()->sp;
#elif (CMB_OS_PLATFORM_TYPE == CMB_OS_PLATFORM_UCOSII) #elif (CMB_OS_PLATFORM_TYPE == CMB_OS_PLATFORM_UCOSII)
extern OS_TCB *OSTCBCur; extern OS_TCB *OSTCBCur;
@ -248,6 +249,8 @@ static const char *get_cur_thread_name(void) {
* dump current stack information * dump current stack information
*/ */
static void dump_stack(uint32_t stack_start_addr, size_t stack_size, uint32_t *stack_pointer) { static void dump_stack(uint32_t stack_start_addr, size_t stack_size, uint32_t *stack_pointer) {
uint32_t deep = CMB_DUMP_STACK_DEPTH_SIZE;
if (stack_is_overflow) { if (stack_is_overflow) {
if (on_thread_before_fault) { if (on_thread_before_fault) {
cmb_println(print_info[PRINT_THREAD_STACK_OVERFLOW], stack_pointer); cmb_println(print_info[PRINT_THREAD_STACK_OVERFLOW], stack_pointer);
@ -261,7 +264,7 @@ static void dump_stack(uint32_t stack_start_addr, size_t stack_size, uint32_t *s
} }
} }
cmb_println(print_info[PRINT_THREAD_STACK_INFO]); cmb_println(print_info[PRINT_THREAD_STACK_INFO]);
for (; (uint32_t) stack_pointer < stack_start_addr + stack_size; stack_pointer++) { for (; (uint32_t) stack_pointer < stack_start_addr + stack_size && deep; stack_pointer++, deep--) {
cmb_println(" addr: %08x data: %08x", stack_pointer, *stack_pointer); cmb_println(" addr: %08x data: %08x", stack_pointer, *stack_pointer);
} }
cmb_println("===================================="); cmb_println("====================================");
@ -288,6 +291,31 @@ static bool disassembly_ins_is_bl_blx(uint32_t addr) {
} }
} }
size_t cm_backtrace_call_stack_any(uint32_t *buffer, size_t size, uint32_t sp, uint32_t stack_start_addr, uint32_t stack_size)
{
uint32_t pc;
size_t depth = 0;
/* copy called function address */
for (; sp < stack_start_addr + stack_size; sp += sizeof(size_t)) {
/* the *sp value may be LR, so need decrease a word to PC */
pc = *((uint32_t *) sp) - sizeof(size_t);
/* the Cortex-M using thumb instruction, so the pc must be an odd number */
if (pc % 2 == 0) {
continue;
}
/* fix the PC address in thumb mode */
pc = *((uint32_t *) sp) - 1;
if ((pc >= code_start_addr + sizeof(size_t)) && (pc <= code_start_addr + code_size) && (depth < CMB_CALL_STACK_MAX_DEPTH)
/* check the the instruction before PC address is 'BL' or 'BLX' */
&& disassembly_ins_is_bl_blx(pc - sizeof(size_t)) && (depth < size)) {
/* the second depth function may be already saved, so need ignore repeat */
buffer[depth++] = pc;
}
}
return depth;
}
/** /**
* backtrace function call stack * backtrace function call stack
* *
@ -299,6 +327,10 @@ static bool disassembly_ins_is_bl_blx(uint32_t addr) {
*/ */
size_t cm_backtrace_call_stack(uint32_t *buffer, size_t size, uint32_t sp) { size_t cm_backtrace_call_stack(uint32_t *buffer, size_t size, uint32_t sp) {
uint32_t stack_start_addr = main_stack_start_addr, pc; uint32_t stack_start_addr = main_stack_start_addr, pc;
#ifdef CMB_USING_OS_PLATFORM
uint32_t tcb_sp;
#endif
size_t depth = 0, stack_size = main_stack_size; size_t depth = 0, stack_size = main_stack_size;
bool regs_saved_lr_is_valid = false; bool regs_saved_lr_is_valid = false;
@ -318,23 +350,19 @@ size_t cm_backtrace_call_stack(uint32_t *buffer, size_t size, uint32_t sp) {
#ifdef CMB_USING_OS_PLATFORM #ifdef CMB_USING_OS_PLATFORM
/* program is running on thread before fault */ /* program is running on thread before fault */
if (on_thread_before_fault) { if (on_thread_before_fault) {
get_cur_thread_stack_info(sp, &stack_start_addr, &stack_size); get_cur_thread_stack_info(&tcb_sp, &stack_start_addr, &stack_size);
} }
} else { } else {
/* OS environment */ /* OS environment */
if (cmb_get_sp() == cmb_get_psp()) { if (cmb_get_sp() == cmb_get_psp()) {
get_cur_thread_stack_info(sp, &stack_start_addr, &stack_size); get_cur_thread_stack_info(&tcb_sp, &stack_start_addr, &stack_size);
} }
#endif /* CMB_USING_OS_PLATFORM */ #endif /* CMB_USING_OS_PLATFORM */
} }
if (stack_is_overflow) { if (stack_is_overflow) {
if (sp < stack_start_addr) { sp = stack_start_addr;
sp = stack_start_addr;
} else if (sp > stack_start_addr + stack_size) {
sp = stack_start_addr + stack_size;
}
} }
/* copy called function address */ /* copy called function address */
@ -378,8 +406,8 @@ static void print_call_stack(uint32_t sp) {
} }
if (cur_depth) { if (cur_depth) {
call_stack_info[cur_depth * (8 + 1) - 1] = '\0'; cmb_println(print_info[PRINT_CALL_STACK_INFO], fw_name, CMB_ELF_FILE_EXTENSION_NAME, cur_depth * (8 + 1),
cmb_println(print_info[PRINT_CALL_STACK_INFO], fw_name, CMB_ELF_FILE_EXTENSION_NAME, call_stack_info); call_stack_info);
} else { } else {
cmb_println(print_info[PRINT_CALL_STACK_ERR]); cmb_println(print_info[PRINT_CALL_STACK_ERR]);
} }
@ -391,12 +419,13 @@ static void print_call_stack(uint32_t sp) {
* @param sp the stack pointer when on assert occurred * @param sp the stack pointer when on assert occurred
*/ */
void cm_backtrace_assert(uint32_t sp) { void cm_backtrace_assert(uint32_t sp) {
CMB_ASSERT(init_ok);
#ifdef CMB_USING_OS_PLATFORM #ifdef CMB_USING_OS_PLATFORM
uint32_t tcb_sp;
uint32_t cur_stack_pointer = cmb_get_sp(); uint32_t cur_stack_pointer = cmb_get_sp();
#endif #endif
CMB_ASSERT(init_ok);
cmb_println(""); cmb_println("");
cm_backtrace_firmware_info(); cm_backtrace_firmware_info();
@ -415,7 +444,7 @@ void cm_backtrace_assert(uint32_t sp) {
#ifdef CMB_USING_DUMP_STACK_INFO #ifdef CMB_USING_DUMP_STACK_INFO
uint32_t stack_start_addr; uint32_t stack_start_addr;
size_t stack_size; size_t stack_size;
get_cur_thread_stack_info(sp, &stack_start_addr, &stack_size); get_cur_thread_stack_info(&tcb_sp, &stack_start_addr, &stack_size);
dump_stack(stack_start_addr, stack_size, (uint32_t *) sp); dump_stack(stack_start_addr, stack_size, (uint32_t *) sp);
#endif /* CMB_USING_DUMP_STACK_INFO */ #endif /* CMB_USING_DUMP_STACK_INFO */
@ -570,7 +599,7 @@ static uint32_t statck_del_fpu_regs(uint32_t fault_handler_lr, uint32_t sp) {
* @param fault_handler_sp the stack pointer on fault handler * @param fault_handler_sp the stack pointer on fault handler
*/ */
void cm_backtrace_fault(uint32_t fault_handler_lr, uint32_t fault_handler_sp) { void cm_backtrace_fault(uint32_t fault_handler_lr, uint32_t fault_handler_sp) {
uint32_t stack_pointer = fault_handler_sp, saved_regs_addr = stack_pointer; uint32_t stack_pointer = fault_handler_sp, saved_regs_addr = stack_pointer, tcb_stack_pointer = 0;
const char *regs_name[] = { "R0 ", "R1 ", "R2 ", "R3 ", "R12", "LR ", "PC ", "PSR" }; const char *regs_name[] = { "R0 ", "R1 ", "R2 ", "R3 ", "R12", "LR ", "PC ", "PSR" };
#ifdef CMB_USING_DUMP_STACK_INFO #ifdef CMB_USING_DUMP_STACK_INFO
@ -595,7 +624,7 @@ void cm_backtrace_fault(uint32_t fault_handler_lr, uint32_t fault_handler_sp) {
saved_regs_addr = stack_pointer = cmb_get_psp(); saved_regs_addr = stack_pointer = cmb_get_psp();
#ifdef CMB_USING_DUMP_STACK_INFO #ifdef CMB_USING_DUMP_STACK_INFO
get_cur_thread_stack_info(stack_pointer, &stack_start_addr, &stack_size); get_cur_thread_stack_info(&tcb_stack_pointer, &stack_start_addr, &stack_size);
#endif /* CMB_USING_DUMP_STACK_INFO */ #endif /* CMB_USING_DUMP_STACK_INFO */
} else { } else {
@ -617,14 +646,21 @@ void cm_backtrace_fault(uint32_t fault_handler_lr, uint32_t fault_handler_sp) {
#ifdef CMB_USING_DUMP_STACK_INFO #ifdef CMB_USING_DUMP_STACK_INFO
/* check stack overflow */ /* check stack overflow */
if (stack_pointer < stack_start_addr || stack_pointer > stack_start_addr + stack_size) { if (stack_pointer < stack_start_addr || stack_pointer > stack_start_addr + stack_size) {
cmb_println("stack_pointer: 0x%08x, stack_start_addr: 0x%08x, stack_end_addr: 0x%08x", stack_pointer, stack_start_addr,
stack_start_addr + stack_size);
stack_is_overflow = true; stack_is_overflow = true;
#if (CMB_OS_PLATFORM_TYPE == CMB_OS_PLATFORM_RTT)
if (on_thread_before_fault) {
/* change the stack start adder to TCB->sp when stack is overflow */
stack_pointer = tcb_stack_pointer;
}
#endif
} }
/* dump stack information */ /* dump stack information */
dump_stack(stack_start_addr, stack_size, (uint32_t *) stack_pointer); dump_stack(stack_start_addr, stack_size, (uint32_t *) stack_pointer);
#endif /* CMB_USING_DUMP_STACK_INFO */ #endif /* CMB_USING_DUMP_STACK_INFO */
/* the stack frame may be get failed when it is overflow */ {
if (!stack_is_overflow) {
/* dump register */ /* dump register */
cmb_println(print_info[PRINT_REGS_TITLE]); cmb_println(print_info[PRINT_REGS_TITLE]);

4
cm_backtrace/cmb_cfg.h
Unescape Escape View File

@ -38,9 +38,9 @@
/* OS platform type, must config when CMB_USING_OS_PLATFORM is enable */ /* OS platform type, must config when CMB_USING_OS_PLATFORM is enable */
/* #define CMB_OS_PLATFORM_TYPE CMB_OS_PLATFORM_RTT or CMB_OS_PLATFORM_UCOSII or CMB_OS_PLATFORM_UCOSIII or CMB_OS_PLATFORM_FREERTOS or CMB_OS_PLATFORM_RTX5 */ /* #define CMB_OS_PLATFORM_TYPE CMB_OS_PLATFORM_RTT or CMB_OS_PLATFORM_UCOSII or CMB_OS_PLATFORM_UCOSIII or CMB_OS_PLATFORM_FREERTOS or CMB_OS_PLATFORM_RTX5 */
/* cpu platform type, must config by user */ /* cpu platform type, must config by user */
#define CMB_CPU_PLATFORM_TYPE /* CMB_CPU_ARM_CORTEX_M0 or CMB_CPU_ARM_CORTEX_M3 or CMB_CPU_ARM_CORTEX_M4 or CMB_CPU_ARM_CORTEX_M7 */ #define CMB_CPU_PLATFORM_TYPE /* CMB_CPU_ARM_CORTEX_M0 or CMB_CPU_ARM_CORTEX_M3 or CMB_CPU_ARM_CORTEX_M4 or CMB_CPU_ARM_CORTEX_M7 or CMB_CPU_ARM_CORTEX_M33 */
/* enable dump stack information */ /* enable dump stack information */
/* #define CMB_USING_DUMP_STACK_INFO */ /* #define CMB_USING_DUMP_STACK_INFO */
/* language of print information */ /* language of print information */
/* #define CMB_PRINT_LANGUAGE CMB_PRINT_LANGUAGE_ENGLISH(default) or CMB_PRINT_LANGUAGE_CHINESE */ /* #define CMB_PRINT_LANGUAGE CMB_PRINT_LANGUAGE_ENGLISH(default) or CMB_PRINT_LANGUAGE_CHINESE or CMB_PRINT_LANGUAGE_CHINESE_UTF8 */
#endif /* _CMB_CFG_H_ */ #endif /* _CMB_CFG_H_ */

18
cm_backtrace/cmb_def.h
Unescape Escape View File

@ -34,7 +34,7 @@
#include <stdlib.h> #include <stdlib.h>
/* library software version number */ /* library software version number */
#define CMB_SW_VERSION "1.4.1" #define CMB_SW_VERSION "1.4.2"
#define CMB_CPU_ARM_CORTEX_M0 0 #define CMB_CPU_ARM_CORTEX_M0 0
#define CMB_CPU_ARM_CORTEX_M3 1 #define CMB_CPU_ARM_CORTEX_M3 1
@ -102,9 +102,17 @@
#error "not supported compiler" #error "not supported compiler"
#endif #endif
/* supported function call stack max depth, default is 16 */ /* supported function call stack max depth, default is 32 */
#ifndef CMB_CALL_STACK_MAX_DEPTH #ifndef CMB_CALL_STACK_MAX_DEPTH
#define CMB_CALL_STACK_MAX_DEPTH 16 #define CMB_CALL_STACK_MAX_DEPTH 32
#endif
/*
* The maximum print depth in case of exception prevents
* too much stack information from printing and insufficient log space
*/
#ifndef CMB_DUMP_STACK_DEPTH_SIZE
#define CMB_DUMP_STACK_DEPTH_SIZE (16)
#endif #endif
/* system handler control and state register */ /* system handler control and state register */
@ -302,7 +310,7 @@ if (!(EXPR)) \
} }
/* ELF(Executable and Linking Format) file extension name for each compiler */ /* ELF(Executable and Linking Format) file extension name for each compiler */
#if defined(__ARMCC_VERSION) #if defined(__CC_ARM) || defined(__CLANG_ARM) || defined(__ARMCC_VERSION)
#define CMB_ELF_FILE_EXTENSION_NAME ".axf" #define CMB_ELF_FILE_EXTENSION_NAME ".axf"
#elif defined(__ICCARM__) #elif defined(__ICCARM__)
#define CMB_ELF_FILE_EXTENSION_NAME ".out" #define CMB_ELF_FILE_EXTENSION_NAME ".out"
@ -358,7 +366,7 @@ if (!(EXPR)) \
mov r0, sp mov r0, sp
bx lr bx lr
} }
#elif defined(__clang__) #elif defined(__CLANG_ARM)
__attribute__( (always_inline) ) static __inline uint32_t cmb_get_msp(void) { __attribute__( (always_inline) ) static __inline uint32_t cmb_get_msp(void) {
uint32_t result; uint32_t result;
__asm volatile ("mrs %0, msp" : "=r" (result) ); __asm volatile ("mrs %0, msp" : "=r" (result) );

Write Preview
Loading…
Cancel
Save