diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-07-29 23:15:35 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-07-29 23:15:35 +0100 |
| commit | 07133415d26d740b866f4542222bb92c06c863d1 (patch) | |
| tree | fa160e4e73cf93fe7b70eaec9ed881eb0fecb7b5 /py/modmicropython.c | |
| parent | d0f5e61ab58892ecd3b0838adeea3cde330da3f1 (diff) | |
| parent | 5b7fd20fea6d4329bb3ab45f63df41f46f242688 (diff) | |
| download | micropython-07133415d26d740b866f4542222bb92c06c863d1.tar.gz micropython-07133415d26d740b866f4542222bb92c06c863d1.zip | |
Merge pull request #738 from dhylands/except-args
Add support for storing args during an exception raised by an irq.
Diffstat (limited to 'py/modmicropython.c')
| -rw-r--r-- | py/modmicropython.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/py/modmicropython.c b/py/modmicropython.c index 0d559c42a2..78beb88afa 100644 --- a/py/modmicropython.c +++ b/py/modmicropython.c @@ -51,6 +51,10 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_mem_current_obj, mp_micropython_ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_mem_peak_obj, mp_micropython_mem_peak); #endif +#if MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF && (MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE == 0) +STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_alloc_emergency_exception_buf_obj, mp_alloc_emergency_exception_buf); +#endif + STATIC const mp_map_elem_t mp_module_micropython_globals_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_micropython) }, #if MICROPY_MEM_STATS @@ -58,6 +62,9 @@ STATIC const mp_map_elem_t mp_module_micropython_globals_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_mem_current), (mp_obj_t)&mp_micropython_mem_current_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_mem_peak), (mp_obj_t)&mp_micropython_mem_peak_obj }, #endif +#if MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF && (MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE == 0) + { MP_OBJ_NEW_QSTR(MP_QSTR_alloc_emergency_exception_buf), (mp_obj_t)&mp_alloc_emergency_exception_buf_obj }, +#endif }; STATIC const mp_obj_dict_t mp_module_micropython_globals = { |