WIP selective collect

Author: tannewt

main.c

@@ -1134,6 +1134,7 @@ int __attribute__((used)) main(void) {
 }
 
 void gc_collect(void) {
+    uint32_t start_time = supervisor_ticks_ms32();
     gc_collect_start();
 
     mp_uint_t regs[10];
@@ -1175,6 +1176,9 @@ void gc_collect(void) {
     // range.
     gc_collect_root((void **)sp, ((mp_uint_t)port_stack_get_top() - sp) / sizeof(mp_uint_t));
     gc_collect_end();
+    uint32_t end_time = supervisor_ticks_ms32();
+    uint32_t duration = end_time - start_time;
+    console_uart_printf("GC took %dms\r\n", duration);
 }
 
 // Ports may provide an implementation of this function if it is needed
@@ -1196,12 +1200,14 @@ static void NORETURN __fatal_error(const char *msg) {
     #if CIRCUITPY_DEBUG == 0
     reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
     #endif
+    console_uart_printf(msg);
+    console_uart_printf("\r\n");
     while (true) {
     }
 }
 
 void MP_WEAK __assert_func(const char *file, int line, const char *func, const char *expr) {
-    mp_printf(&mp_plat_print, "Assertion '%s' failed, at file %s:%d\n", expr, file, line);
+    console_uart_printf("Assertion '%s' failed, at file %s:%d\r\n", expr, file, line);
     __fatal_error("Assertion failed");
 }
 #endif

ports/raspberrypi/boards/adafruit_fruit_jam/mpconfigboard.h

@@ -17,9 +17,9 @@
 #define DEFAULT_SPI_BUS_MOSI (&pin_GPIO31)
 #define DEFAULT_SPI_BUS_MISO (&pin_GPIO28)
 
-#define DEFAULT_USB_HOST_DATA_PLUS (&pin_GPIO1)
-#define DEFAULT_USB_HOST_DATA_MINUS (&pin_GPIO2)
-#define DEFAULT_USB_HOST_5V_POWER (&pin_GPIO11)
+// #define DEFAULT_USB_HOST_DATA_PLUS (&pin_GPIO1)
+// #define DEFAULT_USB_HOST_DATA_MINUS (&pin_GPIO2)
+// #define DEFAULT_USB_HOST_5V_POWER (&pin_GPIO11)
 
 #define DEFAULT_DVI_BUS_CLK_DN (&pin_GPIO12)
 #define DEFAULT_DVI_BUS_CLK_DP (&pin_GPIO13)
@@ -39,9 +39,9 @@
 
 #define CIRCUITPY_PSRAM_CHIP_SELECT (&pin_GPIO47)
 
-// #define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO44)
-// #define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO45)
+#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO44)
+#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO45)
 
-// #define CIRCUITPY_DEBUG_TINYUSB 0
+#define CIRCUITPY_DEBUG_TINYUSB 1
 
 #define CIRCUITPY_SAVES_PARTITION_SIZE (2 * 1024 * 1024)

ports/raspberrypi/supervisor/port.c

@@ -438,8 +438,11 @@ void reset_to_bootloader(void) {
 }
 
 void reset_cpu(void) {
-    watchdog_reboot(0, SRAM_END, 0);
-    watchdog_start_tick(12);
+    console_uart_printf("reset cpu\n");
+    gpio_init(29);
+    gpio_set_dir(29, GPIO_OUT);
+    gpio_set_function(29, GPIO_FUNC_SIO);
+    gpio_put(29, 1);
 
     while (true) {
         __wfi();
@@ -570,7 +573,10 @@ __attribute__((used)) void __not_in_flash_func(isr_hardfault)(void) {
     // Only safe mode from core 0 which is running CircuitPython. Core 1 faulting
     // should not be fatal to CP. (Fingers crossed.)
     if (get_core_num() == 0) {
+        console_uart_printf("Hard fault on core 0\n");
         reset_into_safe_mode(SAFE_MODE_HARD_FAULT);
+    } else {
+        console_uart_printf("Core 1 faulting\n");
     }
     while (true) {
         asm ("nop;");

ports/unix/mpconfigport.h

@@ -112,6 +112,7 @@ typedef long mp_off_t;
 
 // Always enable GC.
 #define MICROPY_ENABLE_GC           (1)
+#define MICROPY_ENABLE_SELECTIVE_COLLECT (1)
 
 #if !(defined(MICROPY_GCREGS_SETJMP) || defined(__x86_64__) || defined(__i386__) || defined(__thumb2__) || defined(__thumb__) || defined(__arm__))
 // Fall back to setjmp() implementation for discovery of GC pointers in registers.

py/bc.h

@@ -302,14 +302,14 @@ static inline void mp_module_context_alloc_tables(mp_module_context_t *context,
     #if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
     size_t nq = (n_qstr * sizeof(qstr_short_t) + sizeof(mp_uint_t) - 1) / sizeof(mp_uint_t);
     size_t no = n_obj;
-    mp_uint_t *mem = m_new(mp_uint_t, nq + no);
+    mp_uint_t *mem = m_malloc_items(nq + no);
     context->constants.qstr_table = (qstr_short_t *)mem;
     context->constants.obj_table = (mp_obj_t *)(mem + nq);
     #else
     if (n_obj == 0) {
         context->constants.obj_table = NULL;
     } else {
-        context->constants.obj_table = m_new(mp_obj_t, n_obj);
+        context->constants.obj_table = m_malloc_items(n_obj);
     }
     #endif
 }

py/circuitpy_mpconfig.h

@@ -62,6 +62,7 @@ extern void common_hal_mcu_enable_interrupts(void);
 #define MICROPY_EMIT_X64                 (0)
 #define MICROPY_ENABLE_DOC_STRING        (0)
 #define MICROPY_ENABLE_FINALISER         (1)
+#define MICROPY_ENABLE_SELECTIVE_COLLECT (1)
 #define MICROPY_ENABLE_GC                (1)
 #define MICROPY_ENABLE_PYSTACK           (1)
 #define MICROPY_TRACKED_ALLOC            (CIRCUITPY_SSL_MBEDTLS)

py/compile.c

@@ -3688,7 +3688,7 @@ void mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_file, bool
 
 mp_obj_t mp_compile(mp_parse_tree_t *parse_tree, qstr source_file, bool is_repl) {
     mp_compiled_module_t cm;
-    cm.context = m_new_obj(mp_module_context_t);
+    cm.context = m_malloc_with_collect(sizeof(mp_module_context_t));
     cm.context->module.globals = mp_globals_get();
     mp_compile_to_raw_code(parse_tree, source_file, is_repl, &cm);
     // return function that executes the outer module