smoke tests on RP2040 and nRF52840 (BLE periph tested

dhalbert · dhalbert · commit a6a308ce57be · 2024-07-27T11:22:02.000-04:00
diff --git a/extmod/modjson.c b/extmod/modjson.c
@@ -441,7 +441,8 @@ STATIC mp_obj_t mod_json_loads(mp_obj_t obj) {
     mp_get_buffer_raise(obj, &bufinfo, MP_BUFFER_READ);
     vstr_t vstr = {bufinfo.len, bufinfo.len, (char *)bufinfo.buf, true};
     mp_obj_stringio_t sio = {{&mp_type_stringio}, &vstr, 0, MP_OBJ_NULL};
-    return mod_json_load(MP_OBJ_FROM_PTR(&sio), false);
+    // CIRCUITPY-CHANGE
+    return _mod_json_load(MP_OBJ_FROM_PTR(&sio), false);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_json_loads_obj, mod_json_loads);
 
diff --git a/extmod/modselect.c b/extmod/modselect.c
@@ -407,8 +407,8 @@ STATIC mp_uint_t poll_set_poll_until_ready_or_timeout(poll_set_t *poll_set, size
         // CIRCUITPY-CHANGE: check for ctrl-C interrupt
         if (mp_hal_is_interrupted()) {
             return 0;
-
-        // CIRCUITPY-CHANGE: mp_event_wait_* do RUN_BACKGROUND_TASKS
+        }
+        // CIRCUITPY-CHANGE: mp_event_wait_ms() and mp_event_wait_indefinite() will do RUN_BACKGROUND_TASKS
         if (has_timeout) {
             mp_event_wait_ms(timeout - elapsed);
         } else {
diff --git a/py/misc.h b/py/misc.h
@@ -34,6 +34,9 @@
 #include <stdint.h>
 #include <stddef.h>
 
+// CIRCUITPY-CHANGE: include directly instead of depending on previous includes
+#include "mpconfig.h"
+
 typedef unsigned char byte;
 typedef unsigned int uint;
 
@@ -135,6 +138,9 @@ size_t m_get_peak_bytes_allocated(void);
 // align ptr to the nearest multiple of "alignment"
 #define MP_ALIGN(ptr, alignment) (void *)(((uintptr_t)(ptr) + ((alignment) - 1)) & ~((alignment) - 1))
 
+// CIRCUITPY-CHANGE
+#define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER))
+
 /** unichar / UTF-8 *********************************************/
 
 #if MICROPY_PY_BUILTINS_STR_UNICODE
diff --git a/py/vm.c b/py/vm.c
@@ -1445,7 +1445,7 @@ unwind_jump:;
             // - constant GeneratorExit object, because it's const
             // - exceptions re-raised by END_FINALLY
             // - exceptions re-raised explicitly by "raise"
-            // CIRCUITPY-CHANGE: MICROPY_CONST_GENERATOREXIT_OBJ check; true just helps formatting. 
+            // CIRCUITPY-CHANGE: MICROPY_CONST_GENERATOREXIT_OBJ check; true just helps formatting.
             if ( true
                 #if MICROPY_CONST_GENERATOREXIT_OBJ
                 && nlr.ret_val != &mp_const_GeneratorExit_obj
@@ -1498,7 +1498,7 @@ unwind_jump:;
                 mp_obj_t ret_val_obj = MP_OBJ_FROM_PTR(nlr.ret_val);
                 #if MICROPY_CPYTHON_EXCEPTION_CHAIN
                 if (active_exception != MP_OBJ_NULL && active_exception != ret_val_obj) {
-                    mp_store_attr(obj, MP_QSTR___context__, active_exception);
+                    mp_store_attr(ret_val_obj, MP_QSTR___context__, active_exception);
                 }
                 #endif
                 // push exception object so it can be handled by bytecode

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,8 @@ STATIC mp_obj_t mod_json_loads(mp_obj_t obj) {`
`441`	`441`	`mp_get_buffer_raise(obj, &bufinfo, MP_BUFFER_READ);`
`442`	`442`	`vstr_t vstr = {bufinfo.len, bufinfo.len, (char *)bufinfo.buf, true};`
`443`	`443`	`mp_obj_stringio_t sio = {{&mp_type_stringio}, &vstr, 0, MP_OBJ_NULL};`
`444`		`- return mod_json_load(MP_OBJ_FROM_PTR(&sio), false);`
	`444`	`+ // CIRCUITPY-CHANGE`
	`445`	`+ return _mod_json_load(MP_OBJ_FROM_PTR(&sio), false);`
`445`	`446`	`}`
`446`	`447`	`STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_json_loads_obj, mod_json_loads);`
`447`	`448`