726dcdb60a
I have a function where it should be impossible to reach the end, so I put in a safe-mode reset at the bottom:
```
int find_unused_slot(void) {
// precondition: you already verified that a slot was available
for (int i=0; i<NUM_SLOTS; i++) {
if( slot_free(i)) {
return i;
}
}
safe_mode_reset(MICROPY_FATAL_ERROR);
}
```
However, the compiler still gave a diagnostic, because safe_mode_reset was not declared NORETURN.
So I started by teaching the compiler that reset_into_safe_mode never returned. This leads at least one level deeper due to reset_cpu needing to be a NORETURN function. Each port is a little different in this area. I also marked reset_to_bootloader as NORETURN.
Additional notes:
* stm32's reset_to_bootloader was not implemented, but now does a bare reset. Most stm32s are not fitted with uf2 bootloaders anyway.
* ditto cxd56
* esp32s2 did not implement reset_cpu at all. I used esp_restart(). (not tested)
* litex did not implement reset_cpu at all. I used reboot_ctrl_write. But notably this is what reset_to_bootloader already did, so one or the other must be incorrect (not tested). reboot_ctrl_write cannot be declared NORETURN, as it returns unless the special value 0xac is written), so a new unreachable forever-loop is added.
* cxd56's reset is via a boardctl() call which can't generically be declared NORETURN, so a new unreacahble "for(;;)" forever-loop is added.
* In several places, NVIC_SystemReset is redeclared with NORETURN applied. This is accepted just fine by gcc. I chose this as preferable to editing the multiple copies of CMSIS headers where it is normally declared.
* the stub safe_mode reset simply aborts. This is used in mpy-cross.
58 lines
1.9 KiB
C
58 lines
1.9 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#ifndef MICROPY_INCLUDED_SUPERVISOR_SAFE_MODE_H
|
|
#define MICROPY_INCLUDED_SUPERVISOR_SAFE_MODE_H
|
|
|
|
#include "py/mpconfig.h"
|
|
|
|
typedef enum {
|
|
NO_SAFE_MODE = 0,
|
|
BROWNOUT,
|
|
HARD_CRASH,
|
|
USER_SAFE_MODE,
|
|
HEAP_OVERWRITTEN,
|
|
MANUAL_SAFE_MODE,
|
|
MICROPY_NLR_JUMP_FAIL,
|
|
MICROPY_FATAL_ERROR,
|
|
GC_ALLOC_OUTSIDE_VM,
|
|
PROGRAMMATIC_SAFE_MODE,
|
|
NORDIC_SOFT_DEVICE_ASSERT,
|
|
FLASH_WRITE_FAIL,
|
|
MEM_MANAGE,
|
|
WATCHDOG_RESET,
|
|
NO_HEAP,
|
|
} safe_mode_t;
|
|
|
|
safe_mode_t wait_for_safe_mode_reset(void);
|
|
|
|
void safe_mode_on_next_reset(safe_mode_t reason);
|
|
void reset_into_safe_mode(safe_mode_t reason) NORETURN;
|
|
|
|
void print_safe_mode_message(safe_mode_t reason);
|
|
|
|
#endif // MICROPY_INCLUDED_SUPERVISOR_SAFE_MODE_H
|