Works?

Author: tannewt

py/compile.c

@@ -221,7 +221,7 @@ static void mp_emit_common_start_pass(mp_emit_common_t *emit, pass_kind_t pass)
         if (emit->ct_cur_child == 0) {
             emit->children = NULL;
         } else {
-            emit->children = m_new0(mp_raw_code_t *, emit->ct_cur_child);
+            emit->children = m_malloc_helper(sizeof(mp_raw_code_t *) * (emit->ct_cur_child), M_MALLOC_ENSURE_ZEROED | M_MALLOC_RAISE_ERROR | M_MALLOC_COLLECT);
         }
     }
     emit->ct_cur_child = 0;

py/emitbc.c

@@ -76,7 +76,7 @@ struct _emit_t {
 };
 
 emit_t *emit_bc_new(mp_emit_common_t *emit_common) {
-    emit_t *emit = m_new0(emit_t, 1);
+    emit_t *emit = m_new_struct_with_collect(emit_t, 1);
     emit->emit_common = emit_common;
     return emit;
 }

py/emitglue.c

@@ -54,7 +54,7 @@ mp_uint_t mp_verbose_flag = 0;
 #endif
 
 mp_raw_code_t *mp_emit_glue_new_raw_code(void) {
-    mp_raw_code_t *rc = m_new0(mp_raw_code_t, 1);
+    mp_raw_code_t *rc = m_malloc_helper(sizeof(mp_raw_code_t), M_MALLOC_ENSURE_ZEROED | M_MALLOC_RAISE_ERROR | M_MALLOC_COLLECT);
     rc->kind = MP_CODE_RESERVED;
     #if MICROPY_PY_SYS_SETTRACE
     rc->line_of_definition = 0;

py/gc.c

@@ -154,6 +154,8 @@ void __attribute__ ((noinline)) gc_log_change(uint32_t start_block, uint32_t len
 #pragma GCC pop_options
 #endif
 
+static bool debug_collect = false;
+
 // TODO waste less memory; currently requires that all entries in alloc_table have a corresponding block in pool
 static void gc_setup_area(mp_state_mem_area_t *area, void *start, void *end) {
     // calculate parameters for GC (T=total, A=alloc table, F=finaliser table, L=leaf table, P=pool; all in bytes):
@@ -486,7 +488,7 @@ static void MP_NO_INSTRUMENT PLACE_IN_ITCM(gc_mark_subtree)(size_t block)
         #endif
 
         // Only scan the block's children if it's not a leaf
-        if (true || should_scan) {
+        if (debug_collect || should_scan) {
             // console_uart_printf("scanning block %p[%d]\n", area, block);
             // check this block's children
             void **ptrs = (void **)PTR_FROM_BLOCK(area, block);
@@ -830,6 +832,8 @@ bool gc_alloc_possible(void) {
     return MP_STATE_MEM(area).gc_pool_start != 0;
 }
 
+static size_t count9be0 = 0;
+
 void *gc_alloc(size_t n_bytes, unsigned int alloc_flags) {
     bool has_finaliser = alloc_flags & GC_ALLOC_FLAG_HAS_FINALISER;
     size_t n_blocks = ((n_bytes + BYTES_PER_BLOCK - 1) & (~(BYTES_PER_BLOCK - 1))) / BYTES_PER_BLOCK;
@@ -1018,10 +1022,17 @@ void *gc_alloc(size_t n_bytes, unsigned int alloc_flags) {
     memorymonitor_track_allocation(end_block - start_block + 1);
     #endif
 
-    // if ((size_t)ret_ptr == 0x11024380) {
-    //     console_uart_printf("gc_alloc(%d, %01x) = %p\n", n_bytes, alloc_flags, ret_ptr);
-    //     asm("bkpt");
-    // }
+    if (debug_collect) {
+        if ((size_t)ret_ptr == 0x1101b490) {
+            if (count9be0 == 1) {
+                asm ("bkpt");
+            }
+            console_uart_printf("count9be0 = %d\n", count9be0);
+            count9be0++;
+        }
+
+        console_uart_printf("gc_alloc(%d, %01x) = %p\n", n_bytes, alloc_flags, ret_ptr);
+    }
 
     return ret_ptr;
 }
@@ -1347,7 +1358,9 @@ void *gc_realloc(void *ptr_in, size_t n_bytes, bool allow_move) {
     // can't resize inplace; try to find a new contiguous chain
     void *ptr_out = gc_alloc(n_bytes, alloc_flags);
 
-    console_uart_printf("gc_realloc: moving %p -> %p, %d -> %d bytes\n", ptr_in, ptr_out, n_blocks * BYTES_PER_BLOCK, n_bytes);
+    if (debug_collect) {
+        console_uart_printf("gc_realloc: moving %p -> %p, %d -> %d bytes\n", ptr_in, ptr_out, n_blocks * BYTES_PER_BLOCK, n_bytes);
+    }
     // check that the alloc succeeded
     if (ptr_out == NULL) {
         return NULL;

py/objmodule.c

@@ -134,8 +134,7 @@ mp_obj_t mp_obj_new_module(qstr module_name) {
     }
 
     // create new module object
-    mp_module_context_t *o = m_new_obj(mp_module_context_t);
-    o->module.base.type = &mp_type_module;
+    mp_module_context_t *o = mp_obj_malloc(mp_module_context_t, &mp_type_module);
     o->module.globals = MP_OBJ_TO_PTR(mp_obj_new_dict(MICROPY_MODULE_DICT_SIZE));
 
     // store __name__ entry in the module

py/scope.c

@@ -51,7 +51,7 @@ scope_t *scope_new(scope_kind_t kind, mp_parse_node_t pn, mp_uint_t emit_options
     MP_STATIC_ASSERT(MP_QSTR__lt_setcomp_gt_ <= UINT8_MAX);
     MP_STATIC_ASSERT(MP_QSTR__lt_genexpr_gt_ <= UINT8_MAX);
 
-    scope_t *scope = m_new0(scope_t, 1);
+    scope_t *scope = m_new_struct_with_collect(scope_t, 1);
     scope->kind = kind;
     scope->pn = pn;
     if (kind == SCOPE_FUNCTION || kind == SCOPE_CLASS) {