Mirrors/unleashed-firmware
2
0
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware synced 2024-11-27 06:50:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

downgrade check.c/.h - see desc

Browse source 
(Furi: smaller crash routine) causes crashes when furi_halt is called, why? I donT knoW
This is temporary solution until real bug will be found
This commit is contained in:
MX 2022-10-29 19:15:46 +03:00
parent 8e4595e4f7
commit 2d3469e057
No known key found for this signature in database
GPG key ID: 6C4C311DFD4B4AB5
3 changed files with 39 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
firmware/targets/f7/api_symbols.csv
View file

@ -1,5 +1,5 @@
entry,status,name,type,params
Version,+,8.2,,
Version,+,8.21,,
Header,+,applications/services/bt/bt_service/bt.h,,
Header,+,applications/services/cli/cli.h,,
Header,+,applications/services/cli/cli_vcp.h,,
@ -4254,6 +4254,7 @@ Variable,-,ITM_RxBuffer,volatile int32_t,
Variable,-,MSIRangeTable,const uint32_t[16],
Variable,-,SmpsPrescalerTable,const uint32_t[4][6],
Variable,+,SystemCoreClock,uint32_t,
Variable,-,__furi_check_message,const char*,
Variable,+,_ctype_,const char[],
Variable,+,_global_impure_ptr,_reent*,
Variable,+,_impure_ptr,_reent*,

1 entry status name type params
2 Version + 8.2 8.21
3 Header + applications/services/bt/bt_service/bt.h
4 Header + applications/services/cli/cli.h
5 Header + applications/services/cli/cli_vcp.h
4254 Variable - MSIRangeTable const uint32_t[16]
4255 Variable - SmpsPrescalerTable const uint32_t[4][6]
4256 Variable + SystemCoreClock uint32_t
4257 Variable - __furi_check_message const char*
4258 Variable + _ctype_ const char[]
4259 Variable + _global_impure_ptr _reent*
4260 Variable + _impure_ptr _reent*

58
furi/core/check.c
View file

@ -14,28 +14,6 @@
PLACE_IN_SECTION("MB_MEM2") const char* __furi_check_message = NULL;
PLACE_IN_SECTION("MB_MEM2") uint32_t __furi_check_registers[12] = {0};
/** Load r12 value to __furi_check_message and store registers to __furi_check_registers */
#define GET_MESSAGE_AND_STORE_REGISTERS() \
asm volatile("ldr r11, =__furi_check_message \n" \
"str r12, [r11] \n" \
"ldr r12, =__furi_check_registers \n" \
"stm r12, {r0-r11} \n" \
: \
: \
: "memory");
// Restore registers and halt MCU
#define RESTORE_REGISTERS_AND_HALT_MCU() \
asm volatile("ldr r12, =__furi_check_registers \n" \
"ldm r12, {r0-r11} \n" \
"loop%=: \n" \
"bkpt 0x00 \n" \
"wfi \n" \
"b loop%= \n" \
: \
: \
: "memory");
extern size_t xPortGetTotalHeapSize(void);
extern size_t xPortGetFreeHeapSize(void);
extern size_t xPortGetMinimumEverFreeHeapSize(void);
@ -77,11 +55,27 @@ static void __furi_print_name(bool isr) {
}
}
FURI_NORETURN void __furi_crash() {
__disable_irq();
GET_MESSAGE_AND_STORE_REGISTERS();
static FURI_NORETURN void __furi_halt_mcu() {
register const void* r12 asm("r12") = (void*)__furi_check_registers;
asm volatile("ldm r12, {r0-r11} \n"
#ifdef FURI_DEBUG
"bkpt 0x00 \n"
#endif
"loop%=: \n"
"wfi \n"
"b loop%= \n"
:
: "r"(r12)
: "memory");
__builtin_unreachable();
}
bool isr = FURI_IS_IRQ_MODE();
FURI_NORETURN void __furi_crash() {
register const void* r12 asm("r12") = (void*)__furi_check_registers;
asm volatile("stm r12, {r0-r11} \n" : : "r"(r12) : "memory");
bool isr = FURI_IS_ISR();
__disable_irq();
if(__furi_check_message == NULL) {
__furi_check_message = "Fatal Error";
@ -99,7 +93,7 @@ FURI_NORETURN void __furi_crash() {
#ifdef FURI_DEBUG
furi_hal_console_puts("\r\nSystem halted. Connect debugger for more info\r\n");
furi_hal_console_puts("\033[0m\r\n");
RESTORE_REGISTERS_AND_HALT_MCU();
__furi_halt_mcu();
#else
furi_hal_rtc_set_fault_data((uint32_t)__furi_check_message);
furi_hal_console_puts("\r\nRebooting system.\r\n");
@ -110,10 +104,11 @@ FURI_NORETURN void __furi_crash() {
}
FURI_NORETURN void __furi_halt() {
__disable_irq();
GET_MESSAGE_AND_STORE_REGISTERS();
register const void* r12 asm("r12") = (void*)__furi_check_registers;
asm volatile("stm r12, {r0-r11} \n" : : "r"(r12) : "memory");
bool isr = FURI_IS_IRQ_MODE();
bool isr = FURI_IS_ISR();
__disable_irq();
if(__furi_check_message == NULL) {
__furi_check_message = "System halt requested.";
@ -124,6 +119,5 @@ FURI_NORETURN void __furi_halt() {
furi_hal_console_puts(__furi_check_message);
furi_hal_console_puts("\r\nSystem halted. Bye-bye!\r\n");
furi_hal_console_puts("\033[0m\r\n");
RESTORE_REGISTERS_AND_HALT_MCU();
__builtin_unreachable();
__furi_halt_mcu();
}

34
furi/core/check.h
View file

@ -1,16 +1,3 @@
/**
* @file check.h
*
* Furi crash and assert functions.
*
* The main problem with crashing is that you can't do anything without disturbing registers,
* and if you disturb registers, you won't be able to see the correct register values in the debugger.
*
* Current solution works around it by passing the message through r12 and doing some magic with registers in crash function.
* r0-r10 are stored in the ram2 on crash routine start and restored at the end.
* The only register that is going to be lost is r11.
*
*/
#pragma once
#ifdef __cplusplus
@ -21,6 +8,9 @@ extern "C" {
#define FURI_NORETURN noreturn
#endif
/** Pointer to pass message to __furi_crash and __furi_halt */
extern const char* __furi_check_message;
/** Crash system */
FURI_NORETURN void __furi_crash();
@ -28,19 +18,17 @@ FURI_NORETURN void __furi_crash();
FURI_NORETURN void __furi_halt();
/** Crash system with message. Show message after reboot. */
#define furi_crash(message) \
do { \
register const void* r12 asm("r12") = (void*)message; \
asm volatile("sukima%=:" : : "r"(r12)); \
__furi_crash(); \
#define furi_crash(message) \
do { \
__furi_check_message = message; \
__furi_crash(); \
} while(0)
/** Halt system with message. */
#define furi_halt(message) \
do { \
register const void* r12 asm("r12") = (void*)message; \
asm volatile("sukima%=:" : : "r"(r12)); \
__furi_halt(); \
#define furi_halt(message) \
do { \
__furi_check_message = message; \
__furi_halt(); \
} while(0)
/** Check condition and crash if check failed */