all: Raise exceptions via mp_raise_XXX

  - Changed: ValueError, TypeError, NotImplementedError
  - OSError invocations unchanged, because the corresponding utility
    function takes ints, not strings like the long form invocation.
  - OverflowError, IndexError and RuntimeError etc. not changed for now
    until we decide whether to add new utility functions.

9 files changed, 23 insertions, 25 deletions

diff --git a/stmhal/dac.c b/stmhal/dac.c
index cdb3a9bcd..14bd59b41 100644
--- a/stmhal/dac.c
+++ b/stmhal/dac.c
@@ -119,7 +119,7 @@ STATIC uint32_t TIMx_Config(mp_obj_t timer) {
         return DAC_TRIGGER_T8_TRGO;
     #endif
     } else {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Timer does not support DAC triggering"));
+        mp_raise_ValueError("Timer does not support DAC triggering");
     }
 }
 
diff --git a/stmhal/i2c.c b/stmhal/i2c.c
index 3fcce327f..48a1e49af 100644
--- a/stmhal/i2c.c
+++ b/stmhal/i2c.c
@@ -670,7 +670,7 @@ STATIC mp_obj_t pyb_i2c_is_ready(mp_obj_t self_in, mp_obj_t i2c_addr_o) {
     pyb_i2c_obj_t *self = self_in;
 
     if (!in_master_mode(self)) {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "I2C must be a master"));
+        mp_raise_TypeError("I2C must be a master");
     }
 
     mp_uint_t i2c_addr = mp_obj_get_int(i2c_addr_o) << 1;
@@ -693,7 +693,7 @@ STATIC mp_obj_t pyb_i2c_scan(mp_obj_t self_in) {
     pyb_i2c_obj_t *self = self_in;
 
     if (!in_master_mode(self)) {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "I2C must be a master"));
+        mp_raise_TypeError("I2C must be a master");
     }
 
     mp_obj_t list = mp_obj_new_list(0, NULL);
@@ -754,7 +754,7 @@ STATIC mp_obj_t pyb_i2c_send(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_
             if (use_dma) {
                 dma_deinit(self->tx_dma_descr);
             }
-            nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "addr argument required"));
+            mp_raise_TypeError("addr argument required");
         }
         mp_uint_t i2c_addr = args[1].u_int << 1;
         if (!use_dma) {
@@ -830,7 +830,7 @@ STATIC mp_obj_t pyb_i2c_recv(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_
     HAL_StatusTypeDef status;
     if (in_master_mode(self)) {
         if (args[1].u_int == PYB_I2C_MASTER_ADDRESS) {
-            nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "addr argument required"));
+            mp_raise_TypeError("addr argument required");
         }
         mp_uint_t i2c_addr = args[1].u_int << 1;
         if (!use_dma) {
@@ -897,7 +897,7 @@ STATIC mp_obj_t pyb_i2c_mem_read(mp_uint_t n_args, const mp_obj_t *pos_args, mp_
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(pyb_i2c_mem_read_allowed_args), pyb_i2c_mem_read_allowed_args, args);
 
     if (!in_master_mode(self)) {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "I2C must be a master"));
+        mp_raise_TypeError("I2C must be a master");
     }
 
     // get the buffer to read into
@@ -965,7 +965,7 @@ STATIC mp_obj_t pyb_i2c_mem_write(mp_uint_t n_args, const mp_obj_t *pos_args, mp
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(pyb_i2c_mem_read_allowed_args), pyb_i2c_mem_read_allowed_args, args);
 
     if (!in_master_mode(self)) {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "I2C must be a master"));
+        mp_raise_TypeError("I2C must be a master");
     }
 
     // get the buffer to write from
diff --git a/stmhal/modmachine.c b/stmhal/modmachine.c
index c5444ec98..cb7957681 100644
--- a/stmhal/modmachine.c
+++ b/stmhal/modmachine.c
@@ -258,7 +258,7 @@ STATIC mp_obj_t machine_freq(mp_uint_t n_args, const mp_obj_t *args) {
         mp_int_t wanted_sysclk = mp_obj_get_int(args[0]) / 1000000;
 
         #if defined(MCU_SERIES_L4)
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError, "machine.freq set not supported yet"));
+        mp_raise_NotImplementedError("machine.freq set not supported yet");
         #endif
 
         // default PLL parameters that give 48MHz on PLL48CK
@@ -318,7 +318,7 @@ STATIC mp_obj_t machine_freq(mp_uint_t n_args, const mp_obj_t *args) {
                     goto set_clk;
                 }
             }
-            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "can't make valid freq"));
+            mp_raise_ValueError("can't make valid freq");
         }
 
     set_clk:
diff --git a/stmhal/moduos.c b/stmhal/moduos.c
index 77a60c0cb..e02f6aefa 100644
--- a/stmhal/moduos.c
+++ b/stmhal/moduos.c
@@ -121,7 +121,7 @@ STATIC mp_obj_t os_dupterm(mp_uint_t n_args, const mp_obj_t *args) {
         } else if (mp_obj_get_type(args[0]) == &pyb_uart_type) {
             MP_STATE_PORT(pyb_stdio_uart) = args[0];
         } else {
-            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "need a UART object"));
+            mp_raise_ValueError("need a UART object");
         }
         return mp_const_none;
     }
diff --git a/stmhal/pin.c b/stmhal/pin.c
index 0dce0c1c0..8d4e80022 100644
--- a/stmhal/pin.c
+++ b/stmhal/pin.c
@@ -120,7 +120,7 @@ const pin_obj_t *pin_find(mp_obj_t user_obj) {
         pin_obj = mp_call_function_1(MP_STATE_PORT(pin_class_mapper), user_obj);
         if (pin_obj != mp_const_none) {
             if (!MP_OBJ_IS_TYPE(pin_obj, &pin_type)) {
-                nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Pin.mapper didn't return a Pin object"));
+                mp_raise_ValueError("Pin.mapper didn't return a Pin object");
             }
             if (pin_class_debug) {
                 printf("Pin.mapper maps ");
diff --git a/stmhal/rtc.c b/stmhal/rtc.c
index 4efc56d5c..6cb6ef047 100644
--- a/stmhal/rtc.c
+++ b/stmhal/rtc.c
@@ -575,7 +575,7 @@ mp_obj_t pyb_rtc_wakeup(mp_uint_t n_args, const mp_obj_t *args) {
                     wut -= 0x10000;
                     if (wut > 0x10000) {
                         // wut still too large
-                        nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "wakeup value too large"));
+                        mp_raise_ValueError("wakeup value too large");
                     }
                 }
             }
@@ -685,12 +685,10 @@ mp_obj_t pyb_rtc_calibration(mp_uint_t n_args, const mp_obj_t *args) {
                 }
                 return mp_obj_new_int(cal & 1);
             } else {
-                nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
-                               "calibration value out of range"));
+                mp_raise_ValueError("calibration value out of range");
             }
 #else
-            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError,
-                "calibration value out of range"));
+            mp_raise_ValueError("calibration value out of range");
 #endif
         }
         if (cal > 0) {
diff --git a/stmhal/spi.c b/stmhal/spi.c
index 574fed073..d25e13f98 100644
--- a/stmhal/spi.c
+++ b/stmhal/spi.c
@@ -765,7 +765,7 @@ STATIC mp_obj_t pyb_spi_send_recv(mp_uint_t n_args, const mp_obj_t *pos_args, mp
             // recv argument given
             mp_get_buffer_raise(args[1].u_obj, &bufinfo_recv, MP_BUFFER_WRITE);
             if (bufinfo_recv.len != bufinfo_send.len) {
-                nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "recv must be same length as send"));
+                mp_raise_ValueError("recv must be same length as send");
             }
             o_ret = args[1].u_obj;
         }
diff --git a/stmhal/timer.c b/stmhal/timer.c
index 570558775..938e96597 100644
--- a/stmhal/timer.c
+++ b/stmhal/timer.c
@@ -278,7 +278,7 @@ STATIC uint32_t compute_prescaler_period_from_freq(pyb_timer_obj_t *self, mp_obj
         if (freq <= 0) {
             goto bad_freq;
             bad_freq:
-            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "must have positive freq"));
+            mp_raise_ValueError("must have positive freq");
         }
         period = source_freq / freq;
     }
@@ -429,7 +429,7 @@ STATIC void config_deadtime(pyb_timer_obj_t *self, mp_int_t ticks) {
 
 TIM_HandleTypeDef *pyb_timer_get_handle(mp_obj_t timer) {
     if (mp_obj_get_type(timer) != &pyb_timer_type) {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "need a Timer object"));
+        mp_raise_ValueError("need a Timer object");
     }
     pyb_timer_obj_t *self = timer;
     return &self->tim;
@@ -541,7 +541,7 @@ STATIC mp_obj_t pyb_timer_init_helper(pyb_timer_obj_t *self, mp_uint_t n_args, c
         init->Prescaler = args[1].u_int;
         init->Period = args[2].u_int;
     } else {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "must specify either freq, or prescaler and period"));
+        mp_raise_TypeError("must specify either freq, or prescaler and period");
     }
 
     init->CounterMode = args[3].u_int;
@@ -891,7 +891,7 @@ STATIC mp_obj_t pyb_timer_channel(mp_uint_t n_args, const mp_obj_t *pos_args, mp
     mp_obj_t pin_obj = args[2].u_obj;
     if (pin_obj != mp_const_none) {
         if (!MP_OBJ_IS_TYPE(pin_obj, &pin_type)) {
-            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "pin argument needs to be be a Pin type"));
+            mp_raise_ValueError("pin argument needs to be be a Pin type");
         }
         const pin_obj_t *pin = pin_obj;
         const pin_af_obj_t *af = pin_find_af(pin, AF_FN_TIM, self->tim_id);
@@ -1174,7 +1174,7 @@ STATIC mp_obj_t pyb_timer_callback(mp_obj_t self_in, mp_obj_t callback) {
         HAL_TIM_Base_Start_IT(&self->tim); // This will re-enable the IRQ
         HAL_NVIC_EnableIRQ(self->irqn);
     } else {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "callback must be None or a callable object"));
+        mp_raise_ValueError("callback must be None or a callable object");
     }
     return mp_const_none;
 }
@@ -1331,7 +1331,7 @@ STATIC mp_obj_t pyb_timer_channel_callback(mp_obj_t self_in, mp_obj_t callback)
                 break;
         }
     } else {
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "callback must be None or a callable object"));
+        mp_raise_ValueError("callback must be None or a callable object");
     }
     return mp_const_none;
 }
diff --git a/stmhal/usb.c b/stmhal/usb.c
index 9bf351f49..e2cbd6745 100644
--- a/stmhal/usb.c
+++ b/stmhal/usb.c
@@ -319,7 +319,7 @@ STATIC mp_obj_t pyb_usb_mode(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_
     return mp_const_none;
 
 bad_mode:
-    nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "bad USB mode"));
+    mp_raise_ValueError("bad USB mode");
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usb_mode_obj, 0, pyb_usb_mode);
 
@@ -590,7 +590,7 @@ STATIC mp_obj_t pyb_usb_hid_send(mp_obj_t self_in, mp_obj_t report_in) {
         mp_obj_t *items;
         mp_obj_get_array(report_in, &bufinfo.len, &items);
         if (bufinfo.len > sizeof(temp_buf)) {
-            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "tuple/list too large for HID report; use bytearray instead"));
+            mp_raise_ValueError("tuple/list too large for HID report; use bytearray instead");
         }
         for (int i = 0; i < bufinfo.len; i++) {
             temp_buf[i] = mp_obj_get_int(items[i]);