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

还原为__ARMCC_VERSION判断AC6

Browse Source
pull/29/head
zmmfly 6 years ago
parent 6d31b3bb60
commit c1ae19b098
2 changed files with 45 additions and 57 deletions
Show Stats Download Patch File Download Diff File

90
cm_backtrace/cm_backtrace.c
Unescape Escape View File

@ -35,11 +35,7 @@
#error "must be C99 or higher. try to add '-std=c99' to compile parameters" #error "must be C99 or higher. try to add '-std=c99' to compile parameters"
#endif #endif
<<<<<<< HEAD #if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6120001))
#if defined(__CC_ARM) || defined(__CLANG_ARM)
=======
#if defined(__CC_ARM)
>>>>>>> parent of 735020f... 添加AC6预定义支持
#define SECTION_START(_name_) _name_##$$Base #define SECTION_START(_name_) _name_##$$Base
#define SECTION_END(_name_) _name_##$$Limit #define SECTION_END(_name_) _name_##$$Limit
#define IMAGE_SECTION_START(_name_) Image$$##_name_##$$Base #define IMAGE_SECTION_START(_name_) Image$$##_name_##$$Base
@ -147,44 +143,44 @@ static const char * const print_info[] = {
[PRINT_MMAR] = "The memory management fault occurred address is %08x", [PRINT_MMAR] = "The memory management fault occurred address is %08x",
[PRINT_BFAR] = "The bus fault occurred address is %08x", [PRINT_BFAR] = "The bus fault occurred address is %08x",
#elif (CMB_PRINT_LANGUAGE == CMB_PRINT_LANGUAGE_CHINESE) #elif (CMB_PRINT_LANGUAGE == CMB_PRINT_LANGUAGE_CHINESE)
[PRINT_MAIN_STACK_CFG_ERROR] = "错误：无法获取主栈信息，请检查主栈的相关配置", [PRINT_MAIN_STACK_CFG_ERROR] = "错误：无法获取主栈信息，请检查主栈的相关配置",
[PRINT_FIRMWARE_INFO] = "固件名称：%s，硬件版本号：%s，软件版本号：%s", [PRINT_FIRMWARE_INFO] = "固件名称：%s，硬件版本号：%s，软件版本号：%s",
[PRINT_ASSERT_ON_THREAD] = "在线程(%s)中发生断言", [PRINT_ASSERT_ON_THREAD] = "在线程(%s)中发生断言",
[PRINT_ASSERT_ON_HANDLER] = "在中断或裸机环境下发生断言", [PRINT_ASSERT_ON_HANDLER] = "在中断或裸机环境下发生断言",
[PRINT_THREAD_STACK_INFO] = "=========== 线程堆栈信息 ===========", [PRINT_THREAD_STACK_INFO] = "=========== 线程堆栈信息 ===========",
[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 -a -f %.*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] = "在中断或裸机环境下发生错误异常",
[PRINT_REGS_TITLE] = "========================= 寄存器信息 =========================", [PRINT_REGS_TITLE] = "========================= 寄存器信息 =========================",
[PRINT_HFSR_VECTBL] = "发生硬错误，原因：取中断向量时出错", [PRINT_HFSR_VECTBL] = "发生硬错误，原因：取中断向量时出错",
[PRINT_MFSR_IACCVIOL] = "发生存储器管理错误，原因：企图从不允许访问的区域取指令", [PRINT_MFSR_IACCVIOL] = "发生存储器管理错误，原因：企图从不允许访问的区域取指令",
[PRINT_MFSR_DACCVIOL] = "发生存储器管理错误，原因：企图从不允许访问的区域读、写数据", [PRINT_MFSR_DACCVIOL] = "发生存储器管理错误，原因：企图从不允许访问的区域读、写数据",
[PRINT_MFSR_MUNSTKERR] = "发生存储器管理错误，原因：出栈时企图访问不被允许的区域", [PRINT_MFSR_MUNSTKERR] = "发生存储器管理错误，原因：出栈时企图访问不被允许的区域",
[PRINT_MFSR_MSTKERR] = "发生存储器管理错误，原因：入栈时企图访问不被允许的区域", [PRINT_MFSR_MSTKERR] = "发生存储器管理错误，原因：入栈时企图访问不被允许的区域",
[PRINT_MFSR_MLSPERR] = "发生存储器管理错误，原因：惰性保存浮点状态时发生错误", [PRINT_MFSR_MLSPERR] = "发生存储器管理错误，原因：惰性保存浮点状态时发生错误",
[PRINT_BFSR_IBUSERR] = "发生总线错误，原因：指令总线错误", [PRINT_BFSR_IBUSERR] = "发生总线错误，原因：指令总线错误",
[PRINT_BFSR_PRECISERR] = "发生总线错误，原因：精确的数据总线错误", [PRINT_BFSR_PRECISERR] = "发生总线错误，原因：精确的数据总线错误",
[PRINT_BFSR_IMPREISERR] = "发生总线错误，原因：不精确的数据总线错误", [PRINT_BFSR_IMPREISERR] = "发生总线错误，原因：不精确的数据总线错误",
[PRINT_BFSR_UNSTKERR] = "发生总线错误，原因：出栈时发生错误", [PRINT_BFSR_UNSTKERR] = "发生总线错误，原因：出栈时发生错误",
[PRINT_BFSR_STKERR] = "发生总线错误，原因：入栈时发生错误", [PRINT_BFSR_STKERR] = "发生总线错误，原因：入栈时发生错误",
[PRINT_BFSR_LSPERR] = "发生总线错误，原因：惰性保存浮点状态时发生错误", [PRINT_BFSR_LSPERR] = "发生总线错误，原因：惰性保存浮点状态时发生错误",
[PRINT_UFSR_UNDEFINSTR] = "发生用法错误，原因：企图执行未定义指令", [PRINT_UFSR_UNDEFINSTR] = "发生用法错误，原因：企图执行未定义指令",
[PRINT_UFSR_INVSTATE] = "发生用法错误，原因：试图切换到 ARM 状态", [PRINT_UFSR_INVSTATE] = "发生用法错误，原因：试图切换到 ARM 状态",
[PRINT_UFSR_INVPC] = "发生用法错误，原因：无效的异常返回码", [PRINT_UFSR_INVPC] = "发生用法错误，原因：无效的异常返回码",
[PRINT_UFSR_NOCP] = "发生用法错误，原因：企图执行协处理器指令", [PRINT_UFSR_NOCP] = "发生用法错误，原因：企图执行协处理器指令",
[PRINT_UFSR_UNALIGNED] = "发生用法错误，原因：企图执行非对齐访问", [PRINT_UFSR_UNALIGNED] = "发生用法错误，原因：企图执行非对齐访问",
[PRINT_UFSR_DIVBYZERO0] = "发生用法错误，原因：企图执行除 0 操作", [PRINT_UFSR_DIVBYZERO0] = "发生用法错误，原因：企图执行除 0 操作",
[PRINT_DFSR_HALTED] = "发生调试错误，原因：NVIC 停机请求", [PRINT_DFSR_HALTED] = "发生调试错误，原因：NVIC 停机请求",
[PRINT_DFSR_BKPT] = "发生调试错误，原因：执行 BKPT 指令", [PRINT_DFSR_BKPT] = "发生调试错误，原因：执行 BKPT 指令",
[PRINT_DFSR_DWTTRAP] = "发生调试错误，原因：数据监测点匹配", [PRINT_DFSR_DWTTRAP] = "发生调试错误，原因：数据监测点匹配",
[PRINT_DFSR_VCATCH] = "发生调试错误，原因：发生向量捕获", [PRINT_DFSR_VCATCH] = "发生调试错误，原因：发生向量捕获",
[PRINT_DFSR_EXTERNAL] = "发生调试错误，原因：外部调试请求", [PRINT_DFSR_EXTERNAL] = "发生调试错误，原因：外部调试请求",
[PRINT_MMAR] = "发生存储器管理错误的地址：%08x", [PRINT_MMAR] = "发生存储器管理错误的地址：%08x",
[PRINT_BFAR] = "发生总线错误的地址：%08x", [PRINT_BFAR] = "发生总线错误的地址：%08x",
#else #else
#error "CMB_PRINT_LANGUAGE defined error in 'cmb_cfg.h'" #error "CMB_PRINT_LANGUAGE defined error in 'cmb_cfg.h'"
#endif #endif
@ -217,11 +213,7 @@ void cm_backtrace_init(const char *firmware_name, const char *hardware_ver, cons
strncpy(hw_ver, hardware_ver, CMB_NAME_MAX); strncpy(hw_ver, hardware_ver, CMB_NAME_MAX);
strncpy(sw_ver, software_ver, CMB_NAME_MAX); strncpy(sw_ver, software_ver, CMB_NAME_MAX);
<<<<<<< HEAD #if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6120001))
#if defined(__CC_ARM)
=======
#if defined(__CC_ARM) || defined(__CLANG_ARM)
>>>>>>> fb2ce800e341910fdfc3e4b5081a9f4655da530f
main_stack_start_addr = (uint32_t)&CSTACK_BLOCK_START(CMB_CSTACK_BLOCK_NAME); main_stack_start_addr = (uint32_t)&CSTACK_BLOCK_START(CMB_CSTACK_BLOCK_NAME);
main_stack_size = (uint32_t)&CSTACK_BLOCK_END(CMB_CSTACK_BLOCK_NAME) - main_stack_start_addr; main_stack_size = (uint32_t)&CSTACK_BLOCK_END(CMB_CSTACK_BLOCK_NAME) - main_stack_start_addr;
code_start_addr = (uint32_t)&CODE_SECTION_START(CMB_CODE_SECTION_NAME); code_start_addr = (uint32_t)&CODE_SECTION_START(CMB_CODE_SECTION_NAME);
@ -442,7 +434,7 @@ static void print_call_stack(uint32_t sp) {
cur_depth = cm_backtrace_call_stack(call_stack_buf, CMB_CALL_STACK_MAX_DEPTH, sp); cur_depth = cm_backtrace_call_stack(call_stack_buf, CMB_CALL_STACK_MAX_DEPTH, sp);
for (i = 0; i < cur_depth; i++) { for (i = 0; i < cur_depth; i++) {
sprintf(call_stack_info + i * (8 + 1), "%08lx", call_stack_buf[i]); sprintf(call_stack_info + i * (8 + 1), "%08x", call_stack_buf[i]);
call_stack_info[i * (8 + 1) + 8] = ' '; call_stack_info[i * (8 + 1) + 8] = ' ';
} }

12
cm_backtrace/cmb_def.h
Unescape Escape View File

@ -60,11 +60,7 @@
#endif #endif
<<<<<<< HEAD #if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6120001))
#if defined(__CC_ARM) || defined(__CLANG_ARM)
=======
#if defined(__CC_ARM)
>>>>>>> parent of 735020f... 添加AC6预定义支持
/* C stack block name, default is STACK */ /* C stack block name, default is STACK */
#ifndef CMB_CSTACK_BLOCK_NAME #ifndef CMB_CSTACK_BLOCK_NAME
#define CMB_CSTACK_BLOCK_NAME STACK #define CMB_CSTACK_BLOCK_NAME STACK
@ -275,7 +271,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(__CC_ARM) || defined(__CLANG_ARM) #if defined(__CC_ARM) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6120001))
#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"
@ -316,7 +312,7 @@ if (!(EXPR)) \
#endif /* (defined(CMB_USING_BARE_METAL_PLATFORM) && defined(CMB_USING_OS_PLATFORM)) */ #endif /* (defined(CMB_USING_BARE_METAL_PLATFORM) && defined(CMB_USING_OS_PLATFORM)) */
/* include or export for supported cmb_get_msp, cmb_get_psp and cmb_get_sp function */ /* include or export for supported cmb_get_msp, cmb_get_psp and cmb_get_sp function */
#if defined(__CC_ARM) || defined(__CLANG_ARM) #if defined(__CC_ARM)
static __inline __asm uint32_t cmb_get_msp(void) { static __inline __asm uint32_t cmb_get_msp(void) {
mrs r0, msp mrs r0, msp
bx lr bx lr
@ -349,7 +345,7 @@ if (!(EXPR)) \
__asm("bx lr"); __asm("bx lr");
} }
#pragma diag_default=Pe940 #pragma diag_default=Pe940
#elif defined(__GNUC__) #elif defined(__GNUC__) || (defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6120001))
__attribute__( ( always_inline ) ) static inline uint32_t cmb_get_msp(void) { __attribute__( ( always_inline ) ) static inline uint32_t cmb_get_msp(void) {
register uint32_t result; register uint32_t result;
__asm volatile ("MRS %0, msp\n" : "=r" (result) ); __asm volatile ("MRS %0, msp\n" : "=r" (result) );

Write Preview
Loading…
Cancel
Save