diff options
Diffstat (limited to 'py/gc.c')
| -rw-r--r-- | py/gc.c | 42 |
1 files changed, 40 insertions, 2 deletions
@@ -1,9 +1,14 @@ #include <stdio.h> #include <string.h> +#include <stdbool.h> #include "mpconfig.h" #include "gc.h" +#include "misc.h" +#include "qstr.h" +#include "obj.h" + #if MICROPY_ENABLE_GC #if 0 // print debugging info @@ -20,7 +25,9 @@ typedef unsigned char byte; #define STACK_SIZE (64) // tunable; minimum is 1 STATIC byte *gc_alloc_table_start; +STATIC byte *gc_mpobj_table_start; STATIC machine_uint_t gc_alloc_table_byte_len; +STATIC machine_uint_t gc_mpobj_table_byte_len; STATIC machine_uint_t *gc_pool_start; STATIC machine_uint_t *gc_pool_end; @@ -58,6 +65,10 @@ STATIC machine_uint_t *gc_sp; #define ATB_HEAD_TO_MARK(block) do { gc_alloc_table_start[(block) / BLOCKS_PER_ATB] |= (AT_MARK << BLOCK_SHIFT(block)); } while (0) #define ATB_MARK_TO_HEAD(block) do { gc_alloc_table_start[(block) / BLOCKS_PER_ATB] &= (~(AT_TAIL << BLOCK_SHIFT(block))); } while (0) +#define ATB_SET_MPOBJ(block) do { gc_mpobj_table_start[(block) / 8] |= (1<<(block%8)); } while (0) +#define ATB_CLR_MPOBJ(block) do { gc_mpobj_table_start[(block) / 8] &= (~(1<<(block%8))); } while (0) +#define ATB_IS_MPOBJ(block) ((gc_mpobj_table_start[(block) / 8]>>(block%8))&0x01) + #define BLOCK_FROM_PTR(ptr) (((ptr) - (machine_uint_t)gc_pool_start) / BYTES_PER_BLOCK) #define PTR_FROM_BLOCK(block) (((block) * BYTES_PER_BLOCK + (machine_uint_t)gc_pool_start)) #define ATB_FROM_BLOCK(bl) ((bl) / BLOCKS_PER_ATB) @@ -72,7 +83,11 @@ void gc_init(void *start, void *end) { machine_uint_t total_word_len = (machine_uint_t*)end - (machine_uint_t*)start; gc_alloc_table_byte_len = total_word_len * BYTES_PER_WORD / (1 + BITS_PER_BYTE / 2 * BYTES_PER_BLOCK); gc_alloc_table_start = (byte*)start; - machine_uint_t gc_pool_block_len = gc_alloc_table_byte_len * BITS_PER_BYTE / 2; + + gc_mpobj_table_byte_len = (gc_alloc_table_byte_len * BITS_PER_BYTE / 2)/8; + gc_mpobj_table_start = gc_alloc_table_start+gc_alloc_table_byte_len; + + machine_uint_t gc_pool_block_len = (gc_alloc_table_byte_len * BITS_PER_BYTE / 2) -(gc_mpobj_table_byte_len / BYTES_PER_BLOCK); machine_uint_t gc_pool_word_len = gc_pool_block_len * WORDS_PER_BLOCK; gc_pool_start = (machine_uint_t*)end - gc_pool_word_len; gc_pool_end = end; @@ -80,6 +95,9 @@ void gc_init(void *start, void *end) { // clear ATBs memset(gc_alloc_table_start, 0, gc_alloc_table_byte_len); + // clear MPOBJ flags + memset(gc_mpobj_table_start, 0, gc_mpobj_table_byte_len); + // allocate first block because gc_pool_start points there and it will never // be freed, so allocating 1 block with null pointers will minimise memory loss ATB_FREE_TO_HEAD(0); @@ -156,6 +174,14 @@ STATIC void gc_sweep(void) { for (machine_uint_t block = 0; block < gc_alloc_table_byte_len * BLOCKS_PER_ATB; block++) { switch (ATB_GET_KIND(block)) { case AT_HEAD: + if (ATB_IS_MPOBJ(block)) { + ATB_CLR_MPOBJ(block); // clear mpobj flag + mp_obj_t *self = (mp_obj_t*)PTR_FROM_BLOCK(block); + mp_obj_type_t *type= mp_obj_get_type(self); + if (type->del != NULL) { + type->del(self); + } + } free_tail = 1; // fall through to free the head @@ -236,7 +262,7 @@ void gc_info(gc_info_t *info) { info->free *= BYTES_PER_BLOCK; } -void *gc_alloc(machine_uint_t n_bytes) { +void *_gc_alloc(machine_uint_t n_bytes, bool is_mpobj) { machine_uint_t n_blocks = ((n_bytes + BYTES_PER_BLOCK - 1) & (~(BYTES_PER_BLOCK - 1))) / BYTES_PER_BLOCK; DEBUG_printf("gc_alloc(" UINT_FMT " bytes -> " UINT_FMT " blocks)\n", n_bytes, n_blocks); @@ -279,6 +305,10 @@ found: // mark first block as used head ATB_FREE_TO_HEAD(start_block); + if (is_mpobj) { + ATB_SET_MPOBJ(start_block); + } + // mark rest of blocks as used tail // TODO for a run of many blocks can make this more efficient for (machine_uint_t bl = start_block + 1; bl <= end_block; bl++) { @@ -289,6 +319,14 @@ found: return (void*)(gc_pool_start + start_block * WORDS_PER_BLOCK); } +void *gc_alloc(machine_uint_t n_bytes) { + return _gc_alloc(n_bytes, false); +} + +void *gc_alloc_mp_obj(machine_uint_t n_bytes) { + return _gc_alloc(n_bytes, true); +} + // force the freeing of a piece of memory void gc_free(void *ptr_in) { machine_uint_t ptr = (machine_uint_t)ptr_in; |