1、【完善】故障处理回调的汇编文件;
2、【修复】Keil 编译环境下无法的问题。 Signed-off-by: armink <armink.ztl@gmail.com>
This commit is contained in:
@@ -195,10 +195,10 @@ void cm_backtrace_init(const char *firmware_name, const char *hardware_ver, cons
|
|||||||
strncpy(sw_ver, software_ver, CMB_NAME_MAX);
|
strncpy(sw_ver, software_ver, CMB_NAME_MAX);
|
||||||
|
|
||||||
#if defined(__CC_ARM)
|
#if defined(__CC_ARM)
|
||||||
main_stack_start_addr = (uint32_t)&CODE_SECTION_START(CMB_CODE_SECTION_NAME);
|
main_stack_start_addr = (uint32_t)&CSTACK_BLOCK_START(CMB_CSTACK_BLOCK_NAME);
|
||||||
main_stack_size = (uint32_t)&CODE_SECTION_END(CMB_CODE_SECTION_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)&CSTACK_BLOCK_START(CMB_CSTACK_BLOCK_NAME);
|
code_start_addr = (uint32_t)&CODE_SECTION_START(CMB_CODE_SECTION_NAME);
|
||||||
code_size = (uint32_t)&CSTACK_BLOCK_END(CMB_CSTACK_BLOCK_NAME) - code_start_addr;
|
code_size = (uint32_t)&CODE_SECTION_END(CMB_CODE_SECTION_NAME) - code_start_addr;
|
||||||
//TODO 待测试
|
//TODO 待测试
|
||||||
#elif defined(__ICCARM__)
|
#elif defined(__ICCARM__)
|
||||||
main_stack_start_addr = (uint32_t)__section_begin(CMB_CSTACK_BLOCK_NAME);
|
main_stack_start_addr = (uint32_t)__section_begin(CMB_CSTACK_BLOCK_NAME);
|
||||||
|
|||||||
@@ -259,7 +259,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)
|
#if defined(__CC_ARM)
|
||||||
#define CMB_ELF_FILE_EXTENSION_NAME ".o"
|
#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"
|
||||||
#elif defined(__GNUC__)
|
#elif defined(__GNUC__)
|
||||||
@@ -314,7 +314,7 @@ if (!(EXPR)) \
|
|||||||
bx lr
|
bx lr
|
||||||
}
|
}
|
||||||
static __inline __asm uint32_t __get_SP(void) {
|
static __inline __asm uint32_t __get_SP(void) {
|
||||||
mrs r0, sp
|
mov r0, sp
|
||||||
bx lr
|
bx lr
|
||||||
}
|
}
|
||||||
#elif defined(__ICCARM__)
|
#elif defined(__ICCARM__)
|
||||||
|
|||||||
@@ -1,54 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of the CmBacktrace Library.
|
|
||||||
*
|
|
||||||
* Copyright (c) 2016, Armink, <armink.ztl@gmail.com>
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining
|
|
||||||
* a copy of this software and associated documentation files (the
|
|
||||||
* 'Software'), to deal in the Software without restriction, including
|
|
||||||
* without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
|
||||||
* permit persons to whom the Software is furnished to do so, subject to
|
|
||||||
* the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be
|
|
||||||
* included in all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
||||||
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
||||||
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
||||||
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
||||||
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
||||||
*
|
|
||||||
* Function: Fault handler by assembly
|
|
||||||
* Created on: 2016-12-16
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if defined(__GNUC__)
|
|
||||||
|
|
||||||
#elif defined(__CC_ARM) || defined(__ICCARM__)
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
SECTION .text:CODE(2)
|
|
||||||
THUMB
|
|
||||||
REQUIRE8
|
|
||||||
PRESERVE8
|
|
||||||
|
|
||||||
#if 1
|
|
||||||
; NOTE: If use this file's HardFault_Handler, please comments the HardFault_Handler code on other file.
|
|
||||||
IMPORT cm_backtrace_fault
|
|
||||||
EXPORT HardFault_Handler
|
|
||||||
|
|
||||||
HardFault_Handler:
|
|
||||||
MOV r0, lr ; get lr
|
|
||||||
MOV r1, sp ; get stack pointer (current is MSP)
|
|
||||||
BL cm_backtrace_fault
|
|
||||||
|
|
||||||
Fault_loop
|
|
||||||
BL Fault_loop ;while(1)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
END
|
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
;/*
|
||||||
|
; * This file is part of the CmBacktrace Library.
|
||||||
|
; *
|
||||||
|
; * Copyright (c) 2016, Armink, <armink.ztl@gmail.com>
|
||||||
|
; *
|
||||||
|
; * Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
; * a copy of this software and associated documentation files (the
|
||||||
|
; * 'Software'), to deal in the Software without restriction, including
|
||||||
|
; * without limitation the rights to use, copy, modify, merge, publish,
|
||||||
|
; * distribute, sublicense, and/or sell copies of the Software, and to
|
||||||
|
; * permit persons to whom the Software is furnished to do so, subject to
|
||||||
|
; * the following conditions:
|
||||||
|
; *
|
||||||
|
; * The above copyright notice and this permission notice shall be
|
||||||
|
; * included in all copies or substantial portions of the Software.
|
||||||
|
; *
|
||||||
|
; * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
; * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
; * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||||
|
; * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
||||||
|
; * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||||
|
; * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||||
|
; * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
; *
|
||||||
|
; * Function: Fault handler by GCC assembly code
|
||||||
|
; * Created on: 2016-12-16
|
||||||
|
; */
|
||||||
|
|
||||||
|
.syntax unified
|
||||||
|
.thumb
|
||||||
|
.text
|
||||||
|
|
||||||
|
; NOTE: If use this file's HardFault_Handler, please comments the HardFault_Handler code on other file.
|
||||||
|
IMPORT cm_backtrace_fault
|
||||||
|
EXPORT HardFault_Handler
|
||||||
|
|
||||||
|
HardFault_Handler:
|
||||||
|
MOV r0, lr ; get lr
|
||||||
|
MOV r1, sp ; get stack pointer (current is MSP)
|
||||||
|
BL cm_backtrace_fault
|
||||||
|
|
||||||
|
Fault_Loop
|
||||||
|
BL Fault_Loop ;while(1)
|
||||||
|
|
||||||
|
END
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
;/*
|
||||||
|
; * This file is part of the CmBacktrace Library.
|
||||||
|
; *
|
||||||
|
; * Copyright (c) 2016, Armink, <armink.ztl@gmail.com>
|
||||||
|
; *
|
||||||
|
; * Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
; * a copy of this software and associated documentation files (the
|
||||||
|
; * 'Software'), to deal in the Software without restriction, including
|
||||||
|
; * without limitation the rights to use, copy, modify, merge, publish,
|
||||||
|
; * distribute, sublicense, and/or sell copies of the Software, and to
|
||||||
|
; * permit persons to whom the Software is furnished to do so, subject to
|
||||||
|
; * the following conditions:
|
||||||
|
; *
|
||||||
|
; * The above copyright notice and this permission notice shall be
|
||||||
|
; * included in all copies or substantial portions of the Software.
|
||||||
|
; *
|
||||||
|
; * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
; * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
; * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||||
|
; * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
||||||
|
; * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||||
|
; * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||||
|
; * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
; *
|
||||||
|
; * Function: Fault handler by EWARM assembly code
|
||||||
|
; * Created on: 2016-12-16
|
||||||
|
; */
|
||||||
|
|
||||||
|
SECTION .text:CODE(2)
|
||||||
|
THUMB
|
||||||
|
REQUIRE8
|
||||||
|
PRESERVE8
|
||||||
|
|
||||||
|
; NOTE: If use this file's HardFault_Handler, please comments the HardFault_Handler code on other file.
|
||||||
|
IMPORT cm_backtrace_fault
|
||||||
|
EXPORT HardFault_Handler
|
||||||
|
|
||||||
|
HardFault_Handler:
|
||||||
|
MOV r0, lr ; get lr
|
||||||
|
MOV r1, sp ; get stack pointer (current is MSP)
|
||||||
|
BL cm_backtrace_fault
|
||||||
|
|
||||||
|
Fault_Loop
|
||||||
|
BL Fault_Loop ;while(1)
|
||||||
|
|
||||||
|
END
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
;/*
|
||||||
|
; * This file is part of the CmBacktrace Library.
|
||||||
|
; *
|
||||||
|
; * Copyright (c) 2016, Armink, <armink.ztl@gmail.com>
|
||||||
|
; *
|
||||||
|
; * Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
; * a copy of this software and associated documentation files (the
|
||||||
|
; * 'Software'), to deal in the Software without restriction, including
|
||||||
|
; * without limitation the rights to use, copy, modify, merge, publish,
|
||||||
|
; * distribute, sublicense, and/or sell copies of the Software, and to
|
||||||
|
; * permit persons to whom the Software is furnished to do so, subject to
|
||||||
|
; * the following conditions:
|
||||||
|
; *
|
||||||
|
; * The above copyright notice and this permission notice shall be
|
||||||
|
; * included in all copies or substantial portions of the Software.
|
||||||
|
; *
|
||||||
|
; * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
; * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
; * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||||
|
; * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
||||||
|
; * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||||
|
; * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||||
|
; * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
; *
|
||||||
|
; * Function: Fault handler by MDK-ARM assembly code
|
||||||
|
; * Created on: 2016-12-16
|
||||||
|
; */
|
||||||
|
|
||||||
|
AREA |.text|, CODE, READONLY, ALIGN=2
|
||||||
|
THUMB
|
||||||
|
REQUIRE8
|
||||||
|
PRESERVE8
|
||||||
|
|
||||||
|
; NOTE: If use this file's HardFault_Handler, please comments the HardFault_Handler code on other file.
|
||||||
|
IMPORT cm_backtrace_fault
|
||||||
|
EXPORT HardFault_Handler
|
||||||
|
|
||||||
|
HardFault_Handler PROC
|
||||||
|
MOV r0, lr ; get lr
|
||||||
|
MOV r1, sp ; get stack pointer (current is MSP)
|
||||||
|
BL cm_backtrace_fault
|
||||||
|
|
||||||
|
Fault_Loop
|
||||||
|
BL Fault_Loop ;while(1)
|
||||||
|
ENDP
|
||||||
|
|
||||||
|
END
|
||||||
Reference in New Issue
Block a user