py/gc: Remove commented-out functions.

These are old, unused, and most of them no longer compile. The `gc_test()` function is superseded by the test suite. Signed-off-by: Damien George <[email protected]>
picoscratch · Jul 19, 2024 · 5147dc5 · 5147dc5
1 parent 1548132
commit 5147dc5
Showing 1 changed file with 0 additions and 77 deletions.
diff --git a/py/gc.c b/py/gc.c
@@ -880,16 +880,6 @@ void *gc_alloc(size_t n_bytes, unsigned int alloc_flags) {
     return ret_ptr;
 }
 
-/*
-void *gc_alloc(mp_uint_t n_bytes) {
-    return _gc_alloc(n_bytes, false);
-}
-
-void *gc_alloc_with_finaliser(mp_uint_t n_bytes) {
-    return _gc_alloc(n_bytes, true);
-}
-*/
-
 // force the freeing of a piece of memory
 // TODO: freeing here does not call finaliser
 void gc_free(void *ptr) {
@@ -992,35 +982,6 @@ size_t gc_nbytes(const void *ptr) {
     return 0;
 }
 
-#if 0
-// old, simple realloc that didn't expand memory in place
-void *gc_realloc(void *ptr, mp_uint_t n_bytes) {
-    mp_uint_t n_existing = gc_nbytes(ptr);
-    if (n_bytes <= n_existing) {
-        return ptr;
-    } else {
-        bool has_finaliser;
-        if (ptr == NULL) {
-            has_finaliser = false;
-        } else {
-            #if MICROPY_ENABLE_FINALISER
-            has_finaliser = FTB_GET(BLOCK_FROM_PTR((mp_uint_t)ptr));
-            #else
-            has_finaliser = false;
-            #endif
-        }
-        void *ptr2 = gc_alloc(n_bytes, has_finaliser);
-        if (ptr2 == NULL) {
-            return ptr2;
-        }
-        memcpy(ptr2, ptr, n_existing);
-        gc_free(ptr);
-        return ptr2;
-    }
-}
-
-#else // Alternative gc_realloc impl
-
 void *gc_realloc(void *ptr_in, size_t n_bytes, bool allow_move) {
     // check for pure allocation
     if (ptr_in == NULL) {
@@ -1170,7 +1131,6 @@ void *gc_realloc(void *ptr_in, size_t n_bytes, bool allow_move) {
     gc_free(ptr_in);
     return ptr_out;
 }
-#endif // Alternative gc_realloc impl
 
 void gc_dump_info(const mp_print_t *print) {
     gc_info_t info;
@@ -1314,41 +1274,4 @@ void gc_dump_alloc_table(const mp_print_t *print) {
     GC_EXIT();
 }
 
-#if 0
-// For testing the GC functions
-void gc_test(void) {
-    mp_uint_t len = 500;
-    mp_uint_t *heap = malloc(len);
-    gc_init(heap, heap + len / sizeof(mp_uint_t));
-    void *ptrs[100];
-    {
-        mp_uint_t **p = gc_alloc(16, false);
-        p[0] = gc_alloc(64, false);
-        p[1] = gc_alloc(1, false);
-        p[2] = gc_alloc(1, false);
-        p[3] = gc_alloc(1, false);
-        mp_uint_t ***p2 = gc_alloc(16, false);
-        p2[0] = p;
-        p2[1] = p;
-        ptrs[0] = p2;
-    }
-    for (int i = 0; i < 25; i += 2) {
-        mp_uint_t *p = gc_alloc(i, false);
-        printf("p=%p\n", p);
-        if (i & 3) {
-            // ptrs[i] = p;
-        }
-    }
-
-    printf("Before GC:\n");
-    gc_dump_alloc_table(&mp_plat_print);
-    printf("Starting GC...\n");
-    gc_collect_start();
-    gc_collect_root(ptrs, sizeof(ptrs) / sizeof(void *));
-    gc_collect_end();
-    printf("After GC:\n");
-    gc_dump_alloc_table(&mp_plat_print);
-}
-#endif
-
 #endif // MICROPY_ENABLE_GC