PowLu/TencentOS-tiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix hardfault backtrace support for iccarm

Browse Source
This commit is contained in:
daishengdong
2020-06-03 20:37:10 +08:00
parent f7195c79a7
commit 5861290e43
12 changed files with 80 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
arch/arm/arm-v6m/cortex-m0/iccarm/port_c.c
View File

@@ -76,43 +76,28 @@ __PORT__ void port_standby_mode_enter(void)
#endif #endif
#if TOS_CFG_FAULT_BACKTRACE_EN > 0u #if TOS_CFG_FAULT_BACKTRACE_EN > 0u
__PORT__ void port_fault_diagnosis(void) __PORT__ void port_fault_diagnosis(void)
{ {
k_fault_log_writer("fault diagnosis is not supported in CORTEX M0\n"); k_fault_log_writer("fault diagnosis is not supported in CORTEX M0\n");
} }
/*------------------ RealView Compiler -----------------*/
/* V5 */
#if defined(__CC_ARM)
__PORT__ __ASM__ void HardFault_Handler(void)
{
IMPORT fault_backtrace
MOV r0, lr
TST lr, #0x04
ITE EQ
MRSEQ r1, MSP
MRSNE r1, PSP
BL fault_backtrace
}
/*------------------ ARM Compiler V6 -------------------*/
#elif defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
__PORT__ void __NAKED__ HardFault_Handler(void) __PORT__ void __NAKED__ HardFault_Handler(void)
{ {
__ASM__ __VOLATILE__ ( __ASM__ __VOLATILE__ (
"MOV r0, lr\n\t" "MOV r0, lr\n\t"
"TST lr, #0x04\n\t" "MOVS r1, #0x04\n\t"
"ITE EQ\n\t" "TST r0, r1\n\t"
"MRSEQ r1, MSP\n\t" "BEQ _LD_MSP\n\t"
"MRSNE r1, PSP\n\t" "MRS r1, PSP\n\t"
"BL fault_backtrace\n\t" "B _EXIT\n"
"_LD_MSP:\n\t"
"MRS r1, MSP\n"
"_EXIT:\n\t"
"LDR r2, =fault_backtrace\n\t"
"BX r2\n\t"
); );
} }
#endif /* ARMCC VERSION */
#endif /* TOS_CFG_FAULT_BACKTRACE_EN */ #endif /* TOS_CFG_FAULT_BACKTRACE_EN */

37
arch/arm/arm-v7m/cortex-m0+/iccarm/port_c.c
View File

@@ -93,43 +93,28 @@ __PORT__ void port_standby_mode_enter(void)
#endif #endif
#if TOS_CFG_FAULT_BACKTRACE_EN > 0u #if TOS_CFG_FAULT_BACKTRACE_EN > 0u
__PORT__ void port_fault_diagnosis(void) __PORT__ void port_fault_diagnosis(void)
{ {
k_fault_log_writer("fault diagnosis is not supported in CORTEX M0+\n"); k_fault_log_writer("fault diagnosis is not supported in CORTEX M0+\n");
} }
/*------------------ RealView Compiler -----------------*/
/* V5 */
#if defined(__CC_ARM)
__PORT__ __ASM__ void HardFault_Handler(void)
{
IMPORT fault_backtrace
MOV r0, lr
TST lr, #0x04
ITE EQ
MRSEQ r1, MSP
MRSNE r1, PSP
BL fault_backtrace
}
/*------------------ ARM Compiler V6 -------------------*/
#elif defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
__PORT__ void __NAKED__ HardFault_Handler(void) __PORT__ void __NAKED__ HardFault_Handler(void)
{ {
__ASM__ __VOLATILE__ ( __ASM__ __VOLATILE__ (
"MOV r0, lr\n\t" "MOV r0, lr\n\t"
"TST lr, #0x04\n\t" "MOVS r1, #0x04\n\t"
"ITE EQ\n\t" "TST r0, r1\n\t"
"MRSEQ r1, MSP\n\t" "BEQ _LD_MSP\n\t"
"MRSNE r1, PSP\n\t" "MRS r1, PSP\n\t"
"BL fault_backtrace\n\t" "B _EXIT\n"
"_LD_MSP:\n\t"
"MRS r1, MSP\n"
"_EXIT:\n\t"
"LDR r2, =fault_backtrace\n\t"
"BX r2\n\t"
); );
} }
#endif /* ARMCC VERSION */
#endif /* TOS_CFG_FAULT_BACKTRACE_EN */ #endif /* TOS_CFG_FAULT_BACKTRACE_EN */

24
arch/arm/arm-v7m/cortex-m4/iccarm/port_c.c
View File

@@ -244,25 +244,6 @@ __PORT__ void port_fault_diagnosis(void)
port_fault_do_diagnosis(&regs); port_fault_do_diagnosis(&regs);
} }
/*------------------ RealView Compiler -----------------*/
/* V5 */
#if defined(__CC_ARM)
__PORT__ __ASM__ void HardFault_Handler(void)
{
IMPORT fault_backtrace
MOV r0, lr
TST lr, #0x04
ITE EQ
MRSEQ r1, MSP
MRSNE r1, PSP
BL fault_backtrace
}
/*------------------ ARM Compiler V6 -------------------*/
#elif defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
__PORT__ void __NAKED__ HardFault_Handler(void) __PORT__ void __NAKED__ HardFault_Handler(void)
{ {
__ASM__ __VOLATILE__ ( __ASM__ __VOLATILE__ (
@@ -271,11 +252,10 @@ __PORT__ void __NAKED__ HardFault_Handler(void)
"ITE EQ\n\t" "ITE EQ\n\t"
"MRSEQ r1, MSP\n\t" "MRSEQ r1, MSP\n\t"
"MRSNE r1, PSP\n\t" "MRSNE r1, PSP\n\t"
"BL fault_backtrace\n\t" "LDR r2, =fault_backtrace\n\t"
"BX r2\n\t"
); );
} }
#endif /* ARMCC VERSION */
#endif /* TOS_CFG_FAULT_BACKTRACE_EN */ #endif /* TOS_CFG_FAULT_BACKTRACE_EN */

24
arch/arm/arm-v7m/cortex-m7/iccarm/port_c.c
View File

@@ -227,25 +227,6 @@ __PORT__ void port_fault_diagnosis(void)
port_fault_do_diagnosis(&regs); port_fault_do_diagnosis(&regs);
} }
/*------------------ RealView Compiler -----------------*/
/* V5 */
#if defined(__CC_ARM)
__PORT__ __ASM__ void HardFault_Handler(void)
{
IMPORT fault_backtrace
MOV r0, lr
TST lr, #0x04
ITE EQ
MRSEQ r1, MSP
MRSNE r1, PSP
BL fault_backtrace
}
/*------------------ ARM Compiler V6 -------------------*/
#elif defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
__PORT__ void __NAKED__ HardFault_Handler(void) __PORT__ void __NAKED__ HardFault_Handler(void)
{ {
__ASM__ __VOLATILE__ ( __ASM__ __VOLATILE__ (
@@ -254,11 +235,10 @@ __PORT__ void __NAKED__ HardFault_Handler(void)
"ITE EQ\n\t" "ITE EQ\n\t"
"MRSEQ r1, MSP\n\t" "MRSEQ r1, MSP\n\t"
"MRSNE r1, PSP\n\t" "MRSNE r1, PSP\n\t"
"BL fault_backtrace\n\t" "LDR r2, =fault_backtrace\n\t"
"BX r2\n\t"
); );
} }
#endif /* ARMCC VERSION */
#endif /* TOS_CFG_FAULT_BACKTRACE_EN */ #endif /* TOS_CFG_FAULT_BACKTRACE_EN */

25
arch/arm/arm-v8m/cortex-m23/iccarm/port_c.c
View File

@@ -93,30 +93,12 @@ __PORT__ void port_standby_mode_enter(void)
#endif #endif
#if TOS_CFG_FAULT_BACKTRACE_EN > 0u #if TOS_CFG_FAULT_BACKTRACE_EN > 0u
__PORT__ void port_fault_diagnosis(void) __PORT__ void port_fault_diagnosis(void)
{ {
k_fault_log_writer("fault diagnosis is not supported in CORTEX M23\n"); k_fault_log_writer("fault diagnosis is not supported in CORTEX M23\n");
} }
/*------------------ RealView Compiler -----------------*/
/* V5 */
#if defined(__CC_ARM)
__PORT__ __ASM__ void HardFault_Handler(void)
{
IMPORT fault_backtrace
MOV r0, lr
TST lr, #0x04
ITE EQ
MRSEQ r1, MSP
MRSNE r1, PSP
BL fault_backtrace
}
/*------------------ ARM Compiler V6 -------------------*/
#elif defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
__PORT__ void __NAKED__ HardFault_Handler(void) __PORT__ void __NAKED__ HardFault_Handler(void)
{ {
__ASM__ __VOLATILE__ ( __ASM__ __VOLATILE__ (
@@ -125,11 +107,10 @@ __PORT__ void __NAKED__ HardFault_Handler(void)
"ITE EQ\n\t" "ITE EQ\n\t"
"MRSEQ r1, MSP\n\t" "MRSEQ r1, MSP\n\t"
"MRSNE r1, PSP\n\t" "MRSNE r1, PSP\n\t"
"BL fault_backtrace\n\t" "LDR r2, =fault_backtrace\n\t"
"BX r2\n\t"
); );
} }
#endif /* ARMCC VERSION */
#endif /* TOS_CFG_FAULT_BACKTRACE_EN */ #endif /* TOS_CFG_FAULT_BACKTRACE_EN */

2
board/ALIENTEK_Apollo_STM32F767/BSP/Src/stm32f7xx_it.c
View File

@@ -61,7 +61,7 @@ void NMI_Handler(void)
/** /**
* @brief This function handles Hard fault interrupt. * @brief This function handles Hard fault interrupt.
*/ */
void HardFault_Handler(void) void xHardFault_Handler(void)
{ {
/* USER CODE BEGIN HardFault_IRQn 0 */ /* USER CODE BEGIN HardFault_IRQn 0 */

3
board/ALIENTEK_Apollo_STM32F767/IAR/hello_world/ALIENTEK_Aploo_STM32F767.ewp
View File

@@ -1169,6 +1169,9 @@
<file> <file>
<name>$PROJ_DIR$\..\..\..\..\arch\arm\arm-v7m\common\tos_cpu.c</name> <name>$PROJ_DIR$\..\..\..\..\arch\arm\arm-v7m\common\tos_cpu.c</name>
</file> </file>
<file>
<name>$PROJ_DIR$\..\..\..\..\arch\arm\arm-v7m\common\tos_fault.c</name>
</file>
</group> </group>
<group> <group>
<name>kernel</name> <name>kernel</name>

2
board/ALIENTEK_Apollo_STM32F767/TOS-CONFIG/tos_config.h
View File

@@ -37,5 +37,7 @@
#define TOS_CFG_TIMER_AS_PROC 1u #define TOS_CFG_TIMER_AS_PROC 1u
#define TOS_CFG_FAULT_BACKTRACE_EN 1u
#endif #endif

2
board/NUCLEO_STM32L073RZ/BSP/Src/stm32l0xx_it.c
View File

@@ -82,7 +82,7 @@ void NMI_Handler(void)
/** /**
* @brief This function handles Hard fault interrupt. * @brief This function handles Hard fault interrupt.
*/ */
void HardFault_Handler(void) void HardFault_Handlerx(void)
{ {
/* USER CODE BEGIN HardFault_IRQn 0 */ /* USER CODE BEGIN HardFault_IRQn 0 */

50
board/NUCLEO_STM32L073RZ/IAR/hello_world/TencentOS_tiny.ewp
View File

@@ -66,7 +66,7 @@
</option> </option>
<option> <option>
<name>OGLastSavedByProductVersion</name> <name>OGLastSavedByProductVersion</name>
<state>8.30.1.17146</state> <state>8.32.1.18618</state>
</option> </option>
<option> <option>
<name>GeneralEnableMisra</name> <name>GeneralEnableMisra</name>
@@ -215,12 +215,12 @@
<name>ICCARM</name> <name>ICCARM</name>
<archiveVersion>2</archiveVersion> <archiveVersion>2</archiveVersion>
<data> <data>
<version>34</version> <version>35</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>1</debug> <debug>1</debug>
<option> <option>
<name>CCDefines</name> <name>CCDefines</name>
<state></state> <state>STM32L073xx</state>
</option> </option>
<option> <option>
<name>CCPreprocFile</name> <name>CCPreprocFile</name>
@@ -329,7 +329,7 @@
</option> </option>
<option> <option>
<name>OutputFile</name> <name>OutputFile</name>
<state></state> <state>$FILE_BNAME$.o</state>
</option> </option>
<option> <option>
<name>CCLibConfigHeader</name> <name>CCLibConfigHeader</name>
@@ -345,7 +345,15 @@
</option> </option>
<option> <option>
<name>CCIncludePath2</name> <name>CCIncludePath2</name>
<state></state> <state>$PROJ_DIR$\..\..\BSP\Inc</state>
<state>$PROJ_DIR$\..\..\..\..\arch\arm\arm-v7m\common\include</state>
<state>$PROJ_DIR$\..\..\..\..\arch\arm\arm-v7m\cortex-m0+\iccarm</state>
<state>$PROJ_DIR$\..\..\..\..\kernel\core\include</state>
<state>$PROJ_DIR$\..\..\..\..\osal\cmsis_os</state>
<state>$PROJ_DIR$\..\..\..\..\platform\vendor_bsp\st\CMSIS\Device\ST\STM32L0xx\Include</state>
<state>$PROJ_DIR$\..\..\TOS_CONFIG</state>
<state>$PROJ_DIR$\..\..\..\..\platform\vendor_bsp\st\STM32L0xx_HAL_Driver\Inc</state>
<state>$PROJ_DIR$\..\..\..\..\platform\vendor_bsp\st\CMSIS\Core\Include</state>
</option> </option>
<option> <option>
<name>CCStdIncCheck</name> <name>CCStdIncCheck</name>
@@ -463,6 +471,10 @@
<name>IccRTTI2</name> <name>IccRTTI2</name>
<state>0</state> <state>0</state>
</option> </option>
<option>
<name>OICompilerExtraOption</name>
<state>1</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
@@ -519,7 +531,7 @@
</option> </option>
<option> <option>
<name>ADefines</name> <name>ADefines</name>
<state></state> <state>STM32L073xx</state>
</option> </option>
<option> <option>
<name>AList</name> <name>AList</name>
@@ -611,7 +623,16 @@
</option> </option>
<option> <option>
<name>AUserIncludes</name> <name>AUserIncludes</name>
<state></state> <state>$PROJ_DIR$\..\..\TOS_CONFIG</state>
<state>$PROJ_DIR$\..\..\BSP\Inc</state>
<state>$PROJ_DIR$\..\..\..\..\arch\arm\arm-v7m\common\include</state>
<state>$PROJ_DIR$\..\..\..\..\arch\arm\arm-v7m\cortex-m0+\iccarm</state>
<state>$PROJ_DIR$\..\..\..\..\kernel\core\include</state>
<state>$PROJ_DIR$\..\..\..\..\osal\cmsis_os</state>
<state>$PROJ_DIR$\..\..\..\..\platform\vendor_bsp\st\CMSIS\Device\ST\STM32L0xx\Include</state>
<state>$PROJ_DIR$\..\..\TOS_CONFIG</state>
<state>$PROJ_DIR$\..\..\..\..\platform\vendor_bsp\st\STM32L0xx_HAL_Driver\Inc</state>
<state>$PROJ_DIR$\..\..\..\..\platform\vendor_bsp\st\CMSIS\Core\Include</state>
</option> </option>
<option> <option>
<name>AExtraOptionsCheckV2</name> <name>AExtraOptionsCheckV2</name>
@@ -683,7 +704,7 @@
<name>ILINK</name> <name>ILINK</name>
<archiveVersion>0</archiveVersion> <archiveVersion>0</archiveVersion>
<data> <data>
<version>21</version> <version>22</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>1</debug> <debug>1</debug>
<option> <option>
@@ -764,7 +785,7 @@
</option> </option>
<option> <option>
<name>IlinkIcfFile</name> <name>IlinkIcfFile</name>
<state>lnk0t.icf</state> <state>$TOOLKIT_DIR$\config\linker\ST\stm32l073xZ.icf</state>
</option> </option>
<option> <option>
<name>IlinkIcfFileSlave</name> <name>IlinkIcfFileSlave</name>
@@ -824,7 +845,7 @@
</option> </option>
<option> <option>
<name>IlinkProgramEntryLabel</name> <name>IlinkProgramEntryLabel</name>
<state></state> <state>__iar_program_start</state>
</option> </option>
<option> <option>
<name>DoFill</name> <name>DoFill</name>
@@ -997,7 +1018,11 @@
</option> </option>
<option> <option>
<name>IlinkTrustzoneImportLibraryOut</name> <name>IlinkTrustzoneImportLibraryOut</name>
<state>###Unitialized###</state> <state>TencentOS_tiny_import_lib.o</state>
</option>
<option>
<name>OILinkExtraOption</name>
<state>1</state>
</option> </option>
</data> </data>
</settings> </settings>
@@ -1141,6 +1166,9 @@
<file> <file>
<name>$PROJ_DIR$\..\..\..\..\arch\arm\arm-v7m\common\tos_cpu.c</name> <name>$PROJ_DIR$\..\..\..\..\arch\arm\arm-v7m\common\tos_cpu.c</name>
</file> </file>
<file>
<name>$PROJ_DIR$\..\..\..\..\arch\arm\arm-v7m\common\tos_fault.c</name>
</file>
</group> </group>
<group> <group>
<name>tos/cmsis-os</name> <name>tos/cmsis-os</name>

3
board/NUCLEO_STM32L073RZ/IAR/hello_world/TencentOS_tiny.ewt
View File

@@ -1298,6 +1298,9 @@
<file> <file>
<name>$PROJ_DIR$\..\..\..\..\arch\arm\arm-v7m\common\tos_cpu.c</name> <name>$PROJ_DIR$\..\..\..\..\arch\arm\arm-v7m\common\tos_cpu.c</name>
</file> </file>
<file>
<name>$PROJ_DIR$\..\..\..\..\arch\arm\arm-v7m\common\tos_fault.c</name>
</file>
</group> </group>
<group> <group>
<name>tos/cmsis-os</name> <name>tos/cmsis-os</name>

2
board/NUCLEO_STM32L073RZ/TOS_CONFIG/tos_config.h
View File

@@ -33,5 +33,7 @@
#define TOS_CFG_TIMER_AS_PROC 1u #define TOS_CFG_TIMER_AS_PROC 1u
#define TOS_CFG_FAULT_BACKTRACE_EN 1u // 配置TencentOS tiny是否开启异常栈回溯功能
#endif #endif