TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-08-14 10:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

improved runtime error handling

Browse Source
This commit is contained in:
Bernd Herzog
2023-03-18 22:41:26 +01:00
parent ed1c2e1c03
commit b83f43793c
6 changed files with 75 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
firmware/baseband/debug.cpp
View File

@@ -33,7 +33,8 @@ void write_m4_panic_msg(const char *panic_message, struct extctx *ctxp) {
}
else {
shared_memory.bb_data.data[0] = 1;
memcpy(&shared_memory.bb_data.data[4], ctxp, sizeof(struct extctx));
*((uint32_t *)&shared_memory.bb_data.data[4]) = SCB->CFSR;
memcpy(&shared_memory.bb_data.data[8], ctxp, sizeof(struct extctx));
}
for(size_t i=0; i<sizeof(shared_memory.m4_panic_msg); i++) {
@@ -54,6 +55,10 @@ void port_halt(void) {
dbg_panic_msg = "system halted";
write_m4_panic_msg(dbg_panic_msg, nullptr);
while (true) {
HALT_IF_DEBUGGING();
}
}
#endif
@@ -85,7 +90,6 @@ CH_IRQ_HANDLER(HardFaultVector) {
#if CH_DBG_ENABLED
regarm_t _saved_lr;
asm volatile ("mov %0, lr" : "=r" (_saved_lr) : : "memory");
CH_IRQ_PROLOGUE();
struct extctx *ctxp;
port_lock_from_isr();
@@ -95,12 +99,18 @@ CH_IRQ_HANDLER(HardFaultVector) {
else
ctxp = (struct extctx *)__get_MSP();
write_m4_panic_msg("Hard Fault", ctxp);
volatile uint32_t stack_space_left = get_free_stack_space();
if (stack_space_left < 16)
write_m4_panic_msg("Stack Overflow", ctxp);
else write_m4_panic_msg("Hard Fault", ctxp);
port_disable();
while (true);
CH_IRQ_EPILOGUE();
while (true) {
HALT_IF_DEBUGGING();
}
#else
chSysHalt();
#endif

21
firmware/baseband/debug.hpp
View File

@@ -22,4 +22,25 @@
#ifndef __DEBUG_H__
#define __DEBUG_H__
#include <ch.h>
extern uint32_t __process_stack_base__;
extern uint32_t __process_stack_end__;
#define CRT0_STACKS_FILL_PATTERN 0x55555555
inline uint32_t get_free_stack_space(){
uint32_t *p;
for (p = &__process_stack_base__; *p == CRT0_STACKS_FILL_PATTERN && p < &__process_stack_end__; p++);
auto stack_space_left = p - &__process_stack_base__;
return stack_space_left;
}
#define HALT_IF_DEBUGGING() \
do { \
if ((*(volatile uint32_t *)0xE000EDF0) & (1 << 0)) { \
__asm__ __volatile__("bkpt 1"); \
} \
} while (0)
#endif/*__DEBUG_H__*/