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

py: Make m_malloc_fail() have void return type, since it doesn't return.

This commit is contained in:
Damien George 2017-08-31 17:00:14 +10:00
parent 6c9fca2aa9
commit ca21aed0a1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
py/malloc.c
View File

@ -74,7 +74,7 @@ STATIC void *realloc_ext(void *ptr, size_t n_bytes, bool allow_move) {
void *m_malloc(size_t num_bytes) { void *m_malloc(size_t num_bytes) {
void *ptr = malloc(num_bytes); void *ptr = malloc(num_bytes);
if (ptr == NULL && num_bytes != 0) { if (ptr == NULL && num_bytes != 0) {
return m_malloc_fail(num_bytes); m_malloc_fail(num_bytes);
} }
#if MICROPY_MEM_STATS #if MICROPY_MEM_STATS
MP_STATE_MEM(total_bytes_allocated) += num_bytes; MP_STATE_MEM(total_bytes_allocated) += num_bytes;
@ -100,7 +100,7 @@ void *m_malloc_maybe(size_t num_bytes) {
void *m_malloc_with_finaliser(size_t num_bytes) { void *m_malloc_with_finaliser(size_t num_bytes) {
void *ptr = malloc_with_finaliser(num_bytes); void *ptr = malloc_with_finaliser(num_bytes);
if (ptr == NULL && num_bytes != 0) { if (ptr == NULL && num_bytes != 0) {
return m_malloc_fail(num_bytes); m_malloc_fail(num_bytes);
} }
#if MICROPY_MEM_STATS #if MICROPY_MEM_STATS
MP_STATE_MEM(total_bytes_allocated) += num_bytes; MP_STATE_MEM(total_bytes_allocated) += num_bytes;
@ -115,7 +115,7 @@ void *m_malloc_with_finaliser(size_t num_bytes) {
void *m_malloc0(size_t num_bytes) { void *m_malloc0(size_t num_bytes) {
void *ptr = m_malloc(num_bytes); void *ptr = m_malloc(num_bytes);
if (ptr == NULL && num_bytes != 0) { if (ptr == NULL && num_bytes != 0) {
return m_malloc_fail(num_bytes); m_malloc_fail(num_bytes);
} }
// If this config is set then the GC clears all memory, so we don't need to. // If this config is set then the GC clears all memory, so we don't need to.
#if !MICROPY_GC_CONSERVATIVE_CLEAR #if !MICROPY_GC_CONSERVATIVE_CLEAR
@ -131,7 +131,7 @@ void *m_realloc(void *ptr, size_t new_num_bytes) {
#endif #endif
void *new_ptr = realloc(ptr, new_num_bytes); void *new_ptr = realloc(ptr, new_num_bytes);
if (new_ptr == NULL && new_num_bytes != 0) { if (new_ptr == NULL && new_num_bytes != 0) {
return m_malloc_fail(new_num_bytes); m_malloc_fail(new_num_bytes);
} }
#if MICROPY_MEM_STATS #if MICROPY_MEM_STATS
// At first thought, "Total bytes allocated" should only grow, // At first thought, "Total bytes allocated" should only grow,

2
py/misc.h
View File

@ -92,7 +92,7 @@ void *m_realloc(void *ptr, size_t new_num_bytes);
void *m_realloc_maybe(void *ptr, size_t new_num_bytes, bool allow_move); void *m_realloc_maybe(void *ptr, size_t new_num_bytes, bool allow_move);
void m_free(void *ptr); void m_free(void *ptr);
#endif #endif
NORETURN void *m_malloc_fail(size_t num_bytes); NORETURN void m_malloc_fail(size_t num_bytes);
#if MICROPY_MEM_STATS #if MICROPY_MEM_STATS
size_t m_get_total_bytes_allocated(void); size_t m_get_total_bytes_allocated(void);

2
py/runtime.c
View File

@ -1408,7 +1408,7 @@ mp_obj_t mp_parse_compile_execute(mp_lexer_t *lex, mp_parse_input_kind_t parse_i
#endif // MICROPY_ENABLE_COMPILER #endif // MICROPY_ENABLE_COMPILER
NORETURN void *m_malloc_fail(size_t num_bytes) { NORETURN void m_malloc_fail(size_t num_bytes) {
DEBUG_printf("memory allocation failed, allocating %u bytes\n", (uint)num_bytes); DEBUG_printf("memory allocation failed, allocating %u bytes\n", (uint)num_bytes);
#if MICROPY_ENABLE_GC #if MICROPY_ENABLE_GC
if (gc_is_locked()) { if (gc_is_locked()) {