diff options
| author | Damien George | 2020-02-11 11:48:28 +1100 |
|---|---|---|
| committer | Damien George | 2020-02-13 11:52:40 +1100 |
| commit | ad7213d3c31bccb26a3f54f7492ccf4b0cc920f3 (patch) | |
| tree | 2ab64a805c05d790579052f557a8168061afcebe /ports/stm32/sdcard.c | |
| parent | 97eca38c4f03e76bd464fb25974544a043af2a9e (diff) | |
py: Add mp_raise_msg_varg helper and use it where appropriate.
This commit adds mp_raise_msg_varg(type, fmt, ...) as a helper for
nlr_raise(mp_obj_new_exception_msg_varg(type, fmt, ...)). It makes the
C-level API for raising exceptions more consistent, and reduces code size
on most ports:
bare-arm: +28 +0.042%
minimal x86: +100 +0.067%
unix x64: -56 -0.011%
unix nanbox: -300 -0.068%
stm32: -204 -0.054% PYBV10
cc3200: +0 +0.000%
esp8266: -64 -0.010% GENERIC
esp32: -104 -0.007% GENERIC
nrf: -136 -0.094% pca10040
samd: +0 +0.000% ADAFRUIT_ITSYBITSY_M4_EXPRESS
Diffstat (limited to 'ports/stm32/sdcard.c')
| -rw-r--r-- | ports/stm32/sdcard.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ports/stm32/sdcard.c b/ports/stm32/sdcard.c index c6832ceb8..632ea4342 100644 --- a/ports/stm32/sdcard.c +++ b/ports/stm32/sdcard.c @@ -768,7 +768,7 @@ STATIC mp_obj_t sd_read(mp_obj_t self, mp_obj_t block_num) { if (ret != 0) { m_del(uint8_t, dest, SDCARD_BLOCK_SIZE); - nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_Exception, "sdcard_read_blocks failed [%u]", ret)); + mp_raise_msg_varg(&mp_type_Exception, "sdcard_read_blocks failed [%u]", ret); } return mp_obj_new_bytearray_by_ref(SDCARD_BLOCK_SIZE, dest); @@ -780,13 +780,13 @@ STATIC mp_obj_t sd_write(mp_obj_t self, mp_obj_t block_num, mp_obj_t data) { mp_buffer_info_t bufinfo; mp_get_buffer_raise(data, &bufinfo, MP_BUFFER_READ); if (bufinfo.len % SDCARD_BLOCK_SIZE != 0) { - nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "writes must be a multiple of %d bytes", SDCARD_BLOCK_SIZE)); + mp_raise_msg_varg(&mp_type_ValueError, "writes must be a multiple of %d bytes", SDCARD_BLOCK_SIZE); } mp_uint_t ret = sdcard_write_blocks(bufinfo.buf, mp_obj_get_int(block_num), bufinfo.len / SDCARD_BLOCK_SIZE); if (ret != 0) { - nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_Exception, "sdcard_write_blocks failed [%u]", ret)); + mp_raise_msg_varg(&mp_type_Exception, "sdcard_write_blocks failed [%u]", ret); } return mp_const_none; |