Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-21 00:58:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

actual proper fix of furi_halt

Browse Source
This commit is contained in:
MX
2022-10-29 19:36:40 +03:00
parent ddc6265920
commit 296bdfd433
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
furi/core/check.c
+19 -4
View File
@@ -24,8 +24,8 @@ PLACE_IN_SECTION("MB_MEM2") uint32_t __furi_check_registers[12] = {0};
: \ : \
: "memory"); : "memory");
// Restore registers and halt MCU // Restore registers and halt MCU with bkpt debug state
#define RESTORE_REGISTERS_AND_HALT_MCU() \ #define RESTORE_REGISTERS_AND_HALT_MCU_DEBUG() \
asm volatile("ldr r12, =__furi_check_registers \n" \ asm volatile("ldr r12, =__furi_check_registers \n" \
"ldm r12, {r0-r11} \n" \ "ldm r12, {r0-r11} \n" \
"loop%=: \n" \ "loop%=: \n" \
@@ -36,6 +36,17 @@ PLACE_IN_SECTION("MB_MEM2") uint32_t __furi_check_registers[12] = {0};
: \ : \
: "memory"); : "memory");
// Restore registers and halt MCU without bkpt debug mode
#define RESTORE_REGISTERS_AND_HALT_MCU_RELEASE() \
asm volatile("ldr r12, =__furi_check_registers \n" \
"ldm r12, {r0-r11} \n" \
"loop%=: \n" \
"wfi \n" \
"b loop%= \n" \
: \
: \
: "memory");
extern size_t xPortGetTotalHeapSize(void); extern size_t xPortGetTotalHeapSize(void);
extern size_t xPortGetFreeHeapSize(void); extern size_t xPortGetFreeHeapSize(void);
extern size_t xPortGetMinimumEverFreeHeapSize(void); extern size_t xPortGetMinimumEverFreeHeapSize(void);
@@ -99,7 +110,7 @@ FURI_NORETURN void __furi_crash() {
#ifdef FURI_DEBUG #ifdef FURI_DEBUG
furi_hal_console_puts("\r\nSystem halted. Connect debugger for more info\r\n"); furi_hal_console_puts("\r\nSystem halted. Connect debugger for more info\r\n");
furi_hal_console_puts("\033[0m\r\n"); furi_hal_console_puts("\033[0m\r\n");
RESTORE_REGISTERS_AND_HALT_MCU(); RESTORE_REGISTERS_AND_HALT_MCU_DEBUG();
#else #else
furi_hal_rtc_set_fault_data((uint32_t)__furi_check_message); furi_hal_rtc_set_fault_data((uint32_t)__furi_check_message);
furi_hal_console_puts("\r\nRebooting system.\r\n"); furi_hal_console_puts("\r\nRebooting system.\r\n");
@@ -124,6 +135,10 @@ FURI_NORETURN void __furi_halt() {
furi_hal_console_puts(__furi_check_message); furi_hal_console_puts(__furi_check_message);
furi_hal_console_puts("\r\nSystem halted. Bye-bye!\r\n"); furi_hal_console_puts("\r\nSystem halted. Bye-bye!\r\n");
furi_hal_console_puts("\033[0m\r\n"); furi_hal_console_puts("\033[0m\r\n");
RESTORE_REGISTERS_AND_HALT_MCU(); #ifdef FURI_DEBUG
RESTORE_REGISTERS_AND_HALT_MCU_DEBUG();
#else
RESTORE_REGISTERS_AND_HALT_MCU_RELEASE();
#endif
__builtin_unreachable(); __builtin_unreachable();
} }