andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

error_handling: save few stack values for HardFault too

This commit is contained in:
Andrey Gusakov 2025-01-22 18:59:45 +03:00 committed by rusefillc
parent 71e2bc9f74
commit e80d753390
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/controllers/core/error_handling.cpp
View File

@ -314,7 +314,7 @@ static void errorHandlerSaveStack(backupErrorState *err, uint32_t *sp)
}
}
void logHardFault(uint32_t type, uintptr_t faultAddress, port_extctx* ctx, uint32_t csfr) {
void logHardFault(uint32_t type, uintptr_t faultAddress, void* sp, port_extctx* ctx, uint32_t csfr) {
criticalShutdown();
#if EFI_BACKUP_SRAM
auto bkpram = getBackupSram();
@ -325,6 +325,8 @@ void logHardFault(uint32_t type, uintptr_t faultAddress, port_extctx* ctx, uint3
err->Csfr = csfr;
memcpy(&err->FaultCtx, ctx, sizeof(port_extctx));
err->Cookie = ErrorCookie::HardFault;
// copy stack last as it can be corrupted and cause another exeption
errorHandlerSaveStack(err, (uint32_t *)sp);
}
#endif // EFI_BACKUP_SRAM
}

2
firmware/controllers/core/log_hard_fault.h
View File

@ -9,7 +9,7 @@ extern "C"
#if EFI_PROD_CODE
#include <hal.h>
void logHardFault(uint32_t type, uintptr_t faultAddress, port_extctx* ctx, uint32_t csfr);
void logHardFault(uint32_t type, uintptr_t faultAddress, void* sp, port_extctx* ctx, uint32_t csfr);
#endif // EFI_PROD_CODE
#ifdef __cplusplus

8
firmware/hw_layer/main_hardfault.c
View File

@ -29,7 +29,7 @@ typedef enum {
UsageFault = 6,
} FaultType;
void logHardFault(uint32_t type, uintptr_t faultAddress, struct port_extctx* ctx, uint32_t csfr);
void logHardFault(uint32_t type, uintptr_t faultAddress, void* sp, struct port_extctx* ctx, uint32_t csfr);
void HardFault_Handler_C(void* sp) {
//Copy to local variables (not pointers) to allow GDB "i loc" to directly show the info
@ -56,7 +56,7 @@ void HardFault_Handler_C(void* sp) {
(void)isFaultOnStacking;
(void)isFaultAddressValid;
logHardFault(faultType, faultAddress, &ctx, SCB->CFSR >> SCB_CFSR_BUSFAULTSR_Pos);
logHardFault(faultType, faultAddress, sp, &ctx, SCB->CFSR >> SCB_CFSR_BUSFAULTSR_Pos);
// check if debugger is connected
if (CoreDebug->DHCSR & CoreDebug_DHCSR_C_DEBUGEN_Msk)
@ -90,7 +90,7 @@ void UsageFault_Handler_C(void* sp) {
(void)isUnalignedAccessFault;
(void)isDivideByZeroFault;
logHardFault(faultType, 0, &ctx, SCB->CFSR);
logHardFault(faultType, 0, sp, &ctx, SCB->CFSR);
// check if debugger is connected
if (CoreDebug->DHCSR & CoreDebug_DHCSR_C_DEBUGEN_Msk)
@ -125,7 +125,7 @@ void MemManage_Handler_C(void* sp) {
(void)isExceptionStackingFault;
(void)isFaultAddressValid;
logHardFault(faultType, faultAddress, &ctx, SCB->CFSR);
logHardFault(faultType, faultAddress, sp, &ctx, SCB->CFSR);
// check if debugger is connected
if (CoreDebug->DHCSR & CoreDebug_DHCSR_C_DEBUGEN_Msk)