diff options
| author | Damien George | 2020-02-11 13:17:41 +1100 |
|---|---|---|
| committer | Damien George | 2020-02-13 11:03:37 +1100 |
| commit | 97eca38c4f03e76bd464fb25974544a043af2a9e (patch) | |
| tree | 9141a63cb6e1e414330d0a93e11ceedc955f4c27 /ports | |
| parent | 7679e3be96f7e0996faa89678beaf423d7c25999 (diff) | |
py: Add mp_raise_type helper macro and use it where appropriate.
This provides a more consistent C-level API to raise exceptions, ie moving
away from nlr_raise towards mp_raise_XXX. It also reduces code size by a
small amount on some ports.
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/cc3200/mods/pybsleep.c | 2 | ||||
| -rw-r--r-- | ports/esp32/modmachine.c | 2 | ||||
| -rw-r--r-- | ports/nrf/modules/machine/modmachine.c | 2 | ||||
| -rw-r--r-- | ports/nrf/modules/random/modrandom.c | 2 | ||||
| -rw-r--r-- | ports/stm32/modmachine.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/ports/cc3200/mods/pybsleep.c b/ports/cc3200/mods/pybsleep.c index b5990e926..09b325333 100644 --- a/ports/cc3200/mods/pybsleep.c +++ b/ports/cc3200/mods/pybsleep.c @@ -477,7 +477,7 @@ void pyb_sleep_suspend_exit (void) { MAP_IntPendSet(INT_PRCM); // force an exception to go back to the point where suspend mode was entered - nlr_raise(mp_obj_new_exception(&mp_type_SystemExit)); + mp_raise_type(&mp_type_SystemExit); } STATIC void PRCMInterruptHandler (void) { diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c index 6e0d0593a..234809fd5 100644 --- a/ports/esp32/modmachine.c +++ b/ports/esp32/modmachine.c @@ -196,7 +196,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset); STATIC mp_obj_t machine_soft_reset(void) { pyexec_system_exit = PYEXEC_FORCED_EXIT; - nlr_raise(mp_obj_new_exception(&mp_type_SystemExit)); + mp_raise_type(&mp_type_SystemExit); } STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_soft_reset_obj, machine_soft_reset); diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c index 1436495fc..7620d1fc0 100644 --- a/ports/nrf/modules/machine/modmachine.c +++ b/ports/nrf/modules/machine/modmachine.c @@ -147,7 +147,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset); STATIC mp_obj_t machine_soft_reset(void) { pyexec_system_exit = PYEXEC_FORCED_EXIT; - nlr_raise(mp_obj_new_exception(&mp_type_SystemExit)); + mp_raise_type(&mp_type_SystemExit); } MP_DEFINE_CONST_FUN_OBJ_0(machine_soft_reset_obj, machine_soft_reset); diff --git a/ports/nrf/modules/random/modrandom.c b/ports/nrf/modules/random/modrandom.c index a1395bce6..702148c5d 100644 --- a/ports/nrf/modules/random/modrandom.c +++ b/ports/nrf/modules/random/modrandom.c @@ -155,7 +155,7 @@ STATIC mp_obj_t mod_random_choice(mp_obj_t seq) { if (len > 0) { return mp_obj_subscr(seq, mp_obj_new_int(randbelow(len)), MP_OBJ_SENTINEL); } else { - nlr_raise(mp_obj_new_exception(&mp_type_IndexError)); + mp_raise_type(&mp_type_IndexError); } } STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_random_choice_obj, mod_random_choice); diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c index 19f58a98d..8ea136b95 100644 --- a/ports/stm32/modmachine.c +++ b/ports/stm32/modmachine.c @@ -249,7 +249,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset); STATIC mp_obj_t machine_soft_reset(void) { pyexec_system_exit = PYEXEC_FORCED_EXIT; - nlr_raise(mp_obj_new_exception(&mp_type_SystemExit)); + mp_raise_type(&mp_type_SystemExit); } MP_DEFINE_CONST_FUN_OBJ_0(machine_soft_reset_obj, machine_soft_reset); |