Skip to content

Commit 00a44fa

Browse files
tdicolatdicola
committed
Merge remote-tracking branch 'micropython/master'
Conflicts: README.md - Kept Adafruit README.md intact. py/emitglue.c - Added xtensa architecture as an OR of the define. zephyr/README.md - Fixed spelling mistake.
2 parents 1f13f87 + 3967ca7 commit 00a44fa

File tree

170 files changed

+1961
-787
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+1961
-787
lines changed

‎cc3200/hal/cc3200_hal.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,6 @@ void mp_hal_delay_ms(mp_uint_t delay) {
130130
}
131131
}
132132

133-
NORETURN void mp_hal_raise(int errno) {
134-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, mp_obj_new_int(errno)));
135-
}
136-
137133
void mp_hal_set_interrupt_char (int c) {
138134
mpexception_set_interrupt_char (c);
139135
}

‎cc3200/hal/cc3200_hal.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
extern void HAL_SystemInit (void);
6363
extern void HAL_SystemDeInit (void);
6464
extern void HAL_IncrementTick(void);
65-
extern NORETURN void mp_hal_raise(int errno);
6665
extern void mp_hal_set_interrupt_char (int c);
6766

6867
#endif /* CC3200_LAUNCHXL_HAL_CC3200_HAL_H_ */

‎cc3200/misc/mpirq.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ void mp_irq_remove (const mp_obj_t parent) {
112112

113113
uint mp_irq_translate_priority (uint priority) {
114114
if (priority < 1 || priority > MP_ARRAY_SIZE(mp_irq_priorities)) {
115-
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
115+
mp_raise_ValueError(mpexception_value_invalid_arguments);
116116
}
117117
return mp_irq_priorities[priority - 1];
118118
}

‎cc3200/mods/modmachine.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ STATIC mp_obj_t machine_main(mp_obj_t main) {
130130
if (MP_OBJ_IS_STR(main)) {
131131
MP_STATE_PORT(machine_config_main) = main;
132132
} else {
133-
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
133+
mp_raise_ValueError(mpexception_value_invalid_arguments);
134134
}
135135
return mp_const_none;
136136
}

‎cc3200/mods/modnetwork.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ STATIC mp_obj_t network_server_make_new(const mp_obj_type_t *type, mp_uint_t n_a
101101
// check the server id
102102
if (args[0].u_obj != MP_OBJ_NULL) {
103103
if (mp_obj_get_int(args[0].u_obj) != 0) {
104-
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_resource_not_avaliable));
104+
mp_raise_msg(&mp_type_OSError, mpexception_os_resource_not_avaliable);
105105
}
106106
}
107107

‎cc3200/mods/moduhashlib.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ STATIC void hash_update_internal(mp_obj_t self_in, mp_obj_t data, bool digest) {
9393
self->digested = false;
9494
}
9595
} else {
96-
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_request_not_possible));
96+
mp_raise_msg(&mp_type_OSError, mpexception_os_request_not_possible);
9797
}
9898
}
9999

@@ -106,7 +106,7 @@ STATIC mp_obj_t hash_read (mp_obj_t self_in) {
106106
}
107107
} else if (self->c_size < self->b_size) {
108108
// it's a fixed len block which is still incomplete
109-
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_request_not_possible));
109+
mp_raise_msg(&mp_type_OSError, mpexception_os_request_not_possible);
110110
}
111111

112112
if (!self->digested) {

‎cc3200/mods/moduos.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ STATIC void mount (mp_obj_t device, const char *path, uint pathlen, bool readonl
158158
#endif
159159
// cannot mount twice or on existing paths
160160
if (f_stat(path, &fno) == FR_OK || osmount_find_by_device(device)) {
161-
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_request_not_possible));
161+
mp_raise_msg(&mp_type_OSError, mpexception_os_request_not_possible);
162162
}
163163

164164
// create a new object
@@ -196,7 +196,7 @@ STATIC void mount (mp_obj_t device, const char *path, uint pathlen, bool readonl
196196
if (f_mount(&self->fatfs, self->path, 1) != FR_OK) {
197197
// remove it and raise
198198
mp_obj_list_remove(&MP_STATE_PORT(mount_obj_list), self);
199-
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_operation_failed));
199+
mp_raise_msg(&mp_type_OSError, mpexception_os_operation_failed);
200200
}
201201

202202
// mount succeeded, increment the count
@@ -252,7 +252,7 @@ STATIC mp_obj_t os_chdir(mp_obj_t path_in) {
252252
}
253253

254254
if (res != FR_OK) {
255-
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_operation_failed));
255+
mp_raise_msg(&mp_type_OSError, mpexception_os_operation_failed);
256256
}
257257

258258
return mp_const_none;
@@ -263,7 +263,7 @@ STATIC mp_obj_t os_getcwd(void) {
263263
char buf[MICROPY_ALLOC_PATH_MAX + 1];
264264
FRESULT res = f_getcwd(buf, sizeof buf);
265265
if (res != FR_OK) {
266-
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(fresult_to_errno_table[res])));
266+
mp_raise_OSError(fresult_to_errno_table[res]);
267267
}
268268
return mp_obj_new_str(buf, strlen(buf), false);
269269
}
@@ -303,7 +303,7 @@ STATIC mp_obj_t os_listdir(mp_uint_t n_args, const mp_obj_t *args) {
303303

304304
res = f_opendir(&dir, path); /* Open the directory */
305305
if (res != FR_OK) {
306-
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_operation_failed));
306+
mp_raise_msg(&mp_type_OSError, mpexception_os_operation_failed);
307307
}
308308

309309
for ( ; ; ) {
@@ -335,10 +335,10 @@ STATIC mp_obj_t os_mkdir(mp_obj_t path_o) {
335335
case FR_OK:
336336
return mp_const_none;
337337
case FR_EXIST:
338-
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_request_not_possible));
338+
mp_raise_msg(&mp_type_OSError, mpexception_os_request_not_possible);
339339
break;
340340
default:
341-
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_operation_failed));
341+
mp_raise_msg(&mp_type_OSError, mpexception_os_operation_failed);
342342
}
343343
}
344344
STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_mkdir_obj, os_mkdir);
@@ -351,7 +351,7 @@ STATIC mp_obj_t os_rename(mp_obj_t path_in, mp_obj_t path_out) {
351351
case FR_OK:
352352
return mp_const_none;
353353
default:
354-
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_operation_failed));
354+
mp_raise_msg(&mp_type_OSError, mpexception_os_operation_failed);
355355
}
356356
}
357357
STATIC MP_DEFINE_CONST_FUN_OBJ_2(os_rename_obj, os_rename);
@@ -363,7 +363,7 @@ STATIC mp_obj_t os_remove(mp_obj_t path_o) {
363363
case FR_OK:
364364
return mp_const_none;
365365
default:
366-
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_operation_failed));
366+
mp_raise_msg(&mp_type_OSError, mpexception_os_operation_failed);
367367
}
368368
}
369369
STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_remove_obj, os_remove);
@@ -394,7 +394,7 @@ STATIC mp_obj_t os_stat(mp_obj_t path_in) {
394394
fno.ftime = 0;
395395
fno.fattrib = AM_DIR;
396396
} else if ((res = f_stat(path, &fno)) != FR_OK) {
397-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(fresult_to_errno_table[res])));
397+
mp_raise_OSError(fresult_to_errno_table[res]);
398398
}
399399

400400
mp_obj_tuple_t *t = mp_obj_new_tuple(10, NULL);
@@ -481,7 +481,7 @@ STATIC mp_obj_t os_mount(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *k
481481
return mp_const_none;
482482

483483
invalid_args:
484-
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_value_invalid_arguments));
484+
mp_raise_msg(&mp_type_OSError, mpexception_value_invalid_arguments);
485485
}
486486
MP_DEFINE_CONST_FUN_OBJ_KW(os_mount_obj, 2, os_mount);
487487

@@ -490,15 +490,15 @@ STATIC mp_obj_t os_unmount(mp_obj_t path_o) {
490490

491491
// '/flash' cannot be unmounted, also not the current working directory
492492
if (path_equal(path, "/flash")) {
493-
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_request_not_possible));
493+
mp_raise_msg(&mp_type_OSError, mpexception_os_request_not_possible);
494494
}
495495

496496
// now unmount it
497497
os_fs_mount_t *mount_obj;
498498
if ((mount_obj = osmount_find_by_path(path))) {
499499
unmount (mount_obj);
500500
} else {
501-
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
501+
mp_raise_msg(&mp_type_ValueError, mpexception_value_invalid_arguments);
502502
}
503503

504504
return mp_const_none;
@@ -515,7 +515,7 @@ STATIC mp_obj_t os_mkfs(mp_obj_t device) {
515515
path = mp_obj_str_get_str(device);
516516
// otherwise the relative path check will pass...
517517
if (path[0] != '/') {
518-
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_value_invalid_arguments));
518+
mp_raise_msg(&mp_type_OSError, mpexception_value_invalid_arguments);
519519
}
520520
} else {
521521
// mount it briefly
@@ -541,7 +541,7 @@ STATIC mp_obj_t os_mkfs(mp_obj_t device) {
541541
}
542542

543543
if (res != FR_OK) {
544-
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_operation_failed));
544+
mp_raise_msg(&mp_type_OSError, mpexception_os_operation_failed);
545545
}
546546
return mp_const_none;
547547
}

‎cc3200/mods/modusocket.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type, mp_uint_t n_args, mp_
156156
// create the socket
157157
int _errno;
158158
if (wlan_socket_socket(s, &_errno) != 0) {
159-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-_errno)));
159+
mp_raise_OSError(-_errno);
160160
}
161161
// add the socket to the list
162162
modusocket_socket_add(s->sock_base.sd, true);
@@ -182,7 +182,7 @@ STATIC mp_obj_t socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
182182
// call the NIC to bind the socket
183183
int _errno;
184184
if (wlan_socket_bind(self, ip, port, &_errno) != 0) {
185-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-_errno)));
185+
mp_raise_OSError(-_errno);
186186
}
187187
return mp_const_none;
188188
}
@@ -200,7 +200,7 @@ STATIC mp_obj_t socket_listen(mp_uint_t n_args, const mp_obj_t *args) {
200200

201201
int _errno;
202202
if (wlan_socket_listen(self, backlog, &_errno) != 0) {
203-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-_errno)));
203+
mp_raise_OSError(-_errno);
204204
}
205205
return mp_const_none;
206206
}
@@ -220,7 +220,7 @@ STATIC mp_obj_t socket_accept(mp_obj_t self_in) {
220220
mp_uint_t port;
221221
int _errno;
222222
if (wlan_socket_accept(self, socket2, ip, &port, &_errno) != 0) {
223-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-_errno)));
223+
mp_raise_OSError(-_errno);
224224
}
225225

226226
// add the socket to the list
@@ -248,7 +248,7 @@ STATIC mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
248248
if (!self->sock_base.cert_req && _errno == SL_ESECSNOVERIFY) {
249249
return mp_const_none;
250250
}
251-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-_errno)));
251+
mp_raise_OSError(-_errno);
252252
}
253253
return mp_const_none;
254254
}
@@ -262,7 +262,7 @@ STATIC mp_obj_t socket_send(mp_obj_t self_in, mp_obj_t buf_in) {
262262
int _errno;
263263
mp_int_t ret = wlan_socket_send(self, bufinfo.buf, bufinfo.len, &_errno);
264264
if (ret < 0) {
265-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-_errno)));
265+
mp_raise_OSError(-_errno);
266266
}
267267
return mp_obj_new_int_from_uint(ret);
268268
}
@@ -278,9 +278,9 @@ STATIC mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
278278
mp_int_t ret = wlan_socket_recv(self, (byte*)vstr.buf, len, &_errno);
279279
if (ret < 0) {
280280
if (_errno == EAGAIN && self->sock_base.has_timeout) {
281-
nlr_raise(mp_obj_new_exception_msg(&mp_type_TimeoutError, "timed out"));
281+
mp_raise_msg(&mp_type_TimeoutError, "timed out");
282282
}
283-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-_errno)));
283+
mp_raise_OSError(-_errno);
284284
}
285285
if (ret == 0) {
286286
return mp_const_empty_bytes;
@@ -307,7 +307,7 @@ STATIC mp_obj_t socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t addr_
307307
int _errno;
308308
mp_int_t ret = wlan_socket_sendto(self, bufinfo.buf, bufinfo.len, ip, port, &_errno);
309309
if (ret < 0) {
310-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-_errno)));
310+
mp_raise_OSError(-_errno);
311311
}
312312
return mp_obj_new_int(ret);
313313
}
@@ -324,9 +324,9 @@ STATIC mp_obj_t socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
324324
mp_int_t ret = wlan_socket_recvfrom(self, (byte*)vstr.buf, vstr.len, ip, &port, &_errno);
325325
if (ret < 0) {
326326
if (_errno == EAGAIN && self->sock_base.has_timeout) {
327-
nlr_raise(mp_obj_new_exception_msg(&mp_type_TimeoutError, "timed out"));
327+
mp_raise_msg(&mp_type_TimeoutError, "timed out");
328328
}
329-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-_errno)));
329+
mp_raise_OSError(-_errno);
330330
}
331331
mp_obj_t tuple[2];
332332
if (ret == 0) {
@@ -364,7 +364,7 @@ STATIC mp_obj_t socket_setsockopt(mp_uint_t n_args, const mp_obj_t *args) {
364364

365365
int _errno;
366366
if (wlan_socket_setsockopt(self, level, opt, optval, optlen, &_errno) != 0) {
367-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-_errno)));
367+
mp_raise_OSError(-_errno);
368368
}
369369
return mp_const_none;
370370
}
@@ -384,7 +384,7 @@ STATIC mp_obj_t socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
384384
}
385385
int _errno;
386386
if (wlan_socket_settimeout(self, timeout, &_errno) != 0) {
387-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-_errno)));
387+
mp_raise_OSError(-_errno);
388388
}
389389
return mp_const_none;
390390
}
@@ -408,7 +408,7 @@ STATIC mp_obj_t socket_makefile(mp_uint_t n_args, const mp_obj_t *args) {
408408
if (n_args > 1) {
409409
const char *mode = mp_obj_str_get_str(args[1]);
410410
if (strcmp(mode, "rb") && strcmp(mode, "wb")) {
411-
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
411+
mp_raise_ValueError(mpexception_value_invalid_arguments);
412412
}
413413
}
414414
return self;
@@ -504,7 +504,7 @@ STATIC mp_obj_t mod_usocket_getaddrinfo(mp_obj_t host_in, mp_obj_t port_in) {
504504
uint8_t out_ip[MOD_NETWORK_IPV4ADDR_BUF_SIZE];
505505
int32_t result = wlan_gethostbyname(host, hlen, out_ip, AF_INET);
506506
if (result < 0) {
507-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-result)));
507+
mp_raise_OSError(-result);
508508
}
509509
mp_obj_tuple_t *tuple = mp_obj_new_tuple(5, NULL);
510510
tuple->items[0] = MP_OBJ_NEW_SMALL_INT(AF_INET);

‎cc3200/mods/modussl.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@ STATIC mp_obj_t mod_ssl_wrap_socket(mp_uint_t n_args, const mp_obj_t *pos_args,
131131
return ssl_sock;
132132

133133
socket_error:
134-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
134+
mp_raise_OSError(_errno);
135135

136136
arg_error:
137-
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, mpexception_value_invalid_arguments));
137+
mp_raise_ValueError(mpexception_value_invalid_arguments);
138138
}
139139
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_ssl_wrap_socket_obj, 0, mod_ssl_wrap_socket);
140140

‎cc3200/mods/modutime.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <string.h>
3030

3131
#include "py/mpconfig.h"
32-
#include "py/nlr.h"
32+
#include "py/runtime.h"
3333
#include "py/obj.h"
3434
#include "py/smallint.h"
3535
#include "py/mphal.h"
@@ -109,7 +109,7 @@ STATIC mp_obj_t time_mktime(mp_obj_t tuple) {
109109

110110
// localtime generates a tuple of len 8. CPython uses 9, so we accept both.
111111
if (len < 8 || len > 9) {
112-
nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, mpexception_num_type_invalid_arguments));
112+
mp_raise_TypeError(mpexception_num_type_invalid_arguments);
113113
}
114114

115115
return mp_obj_new_int_from_uint(timeutils_mktime(mp_obj_get_int(elem[0]), mp_obj_get_int(elem[1]), mp_obj_get_int(elem[2]),

0 commit comments

Comments
 (0)