mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

py, gc: Revert ret_ptr to void*, casting to byte* for memset.

This commit is contained in:
Damien George 2014-06-13 22:33:31 +01:00
parent 63b2237323
commit c037694957
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
py/gc.c
View File

@ -400,14 +400,14 @@ found:
} }
// get pointer to first block // get pointer to first block
byte *ret_ptr = (byte*)(gc_pool_start + start_block * WORDS_PER_BLOCK); void *ret_ptr = (void*)(gc_pool_start + start_block * WORDS_PER_BLOCK);
// zero out the additional bytes of the newly allocated blocks // zero out the additional bytes of the newly allocated blocks
// This is needed because the blocks may have previously held pointers // This is needed because the blocks may have previously held pointers
// to the heap and will not be set to something else if the caller // to the heap and will not be set to something else if the caller
// doesn't actually use the entire block. As such they will continue // doesn't actually use the entire block. As such they will continue
// to point to the heap and may prevent other blocks from being reclaimed. // to point to the heap and may prevent other blocks from being reclaimed.
memset(ret_ptr + n_bytes, 0, (end_block - start_block + 1) * BYTES_PER_BLOCK - n_bytes); memset((byte*)ret_ptr + n_bytes, 0, (end_block - start_block + 1) * BYTES_PER_BLOCK - n_bytes);
#if MICROPY_ENABLE_FINALISER #if MICROPY_ENABLE_FINALISER
if (has_finaliser) { if (has_finaliser) {