YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the ENABLED/DISABLED macros (#4515)

Browse Source 
The removal of these macros enabled cppcheck to reveal new errors.
These errors are also fixed by the patch.

JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu
This commit is contained in:
Robert Fancsik
2021-02-04 23:47:05 +01:00
committed by GitHub
parent e01c2549d7
commit 0628ae1e7b
337 changed files with 5186 additions and 5191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/jmem/jmem-allocator-internal.h
+6 -6
View File
@@ -28,7 +28,7 @@
* @{
* Valgrind-related options and headers
*/
#if ENABLED (JERRY_VALGRIND)
#if JERRY_VALGRIND
# include "memcheck.h"
# define JMEM_VALGRIND_NOACCESS_SPACE(p, s) VALGRIND_MAKE_MEM_NOACCESS((p), (s))
@@ -37,14 +37,14 @@
# define JMEM_VALGRIND_MALLOCLIKE_SPACE(p, s) VALGRIND_MALLOCLIKE_BLOCK((p), (s), 0, 0)
# define JMEM_VALGRIND_RESIZE_SPACE(p, o, n) VALGRIND_RESIZEINPLACE_BLOCK((p), (o), (n), 0)
# define JMEM_VALGRIND_FREELIKE_SPACE(p) VALGRIND_FREELIKE_BLOCK((p), 0)
#else /* !ENABLED (JERRY_VALGRIND) */
#else /* !JERRY_VALGRIND */
# define JMEM_VALGRIND_NOACCESS_SPACE(p, s)
# define JMEM_VALGRIND_UNDEFINED_SPACE(p, s)
# define JMEM_VALGRIND_DEFINED_SPACE(p, s)
# define JMEM_VALGRIND_MALLOCLIKE_SPACE(p, s)
# define JMEM_VALGRIND_RESIZE_SPACE(p, o, n)
# define JMEM_VALGRIND_FREELIKE_SPACE(p)
#endif /* ENABLED (JERRY_VALGRIND) */
#endif /* JERRY_VALGRIND */
/** @} */
void jmem_heap_init (void);
@@ -69,7 +69,7 @@ void jmem_pools_finalize (void);
* @{
* Jerry mem-stat definitions
*/
#if ENABLED (JERRY_MEM_STATS)
#if JERRY_MEM_STATS
void jmem_heap_stat_init (void);
void jmem_heap_stat_alloc (size_t num);
void jmem_heap_stat_free (size_t num);
@@ -77,11 +77,11 @@ void jmem_heap_stat_free (size_t num);
#define JMEM_HEAP_STAT_INIT() jmem_heap_stat_init ()
#define JMEM_HEAP_STAT_ALLOC(v1) jmem_heap_stat_alloc (v1)
#define JMEM_HEAP_STAT_FREE(v1) jmem_heap_stat_free (v1)
#else /* !ENABLED (JERRY_MEM_STATS) */
#else /* !JERRY_MEM_STATS */
#define JMEM_HEAP_STAT_INIT()
#define JMEM_HEAP_STAT_ALLOC(v1) JERRY_UNUSED (v1)
#define JMEM_HEAP_STAT_FREE(v1) JERRY_UNUSED (v1)
#endif /* ENABLED (JERRY_MEM_STATS) */
#endif /* JERRY_MEM_STATS */
/** @} */
jerry-core/jmem/jmem-allocator.c
+13 -13
View File
@@ -24,7 +24,7 @@
#define JMEM_ALLOCATOR_INTERNAL
#include "jmem-allocator-internal.h"
#if ENABLED (JERRY_MEM_STATS)
#if JERRY_MEM_STATS
/**
* Register byte code allocation.
*/
@@ -141,7 +141,7 @@ jmem_stats_free_property_bytes (size_t property_size)
heap_stats->property_bytes -= property_size;
} /* jmem_stats_free_property_bytes */
#endif /* ENABLED (JERRY_MEM_STATS) */
#endif /* JERRY_MEM_STATS */
/**
* Initialize memory allocators.
@@ -160,12 +160,12 @@ jmem_finalize (void)
{
jmem_pools_finalize ();
#if ENABLED (JERRY_MEM_STATS)
#if JERRY_MEM_STATS
if (JERRY_CONTEXT (jerry_init_flags) & ECMA_INIT_MEM_STATS)
{
jmem_heap_stats_print ();
}
#endif /* ENABLED (JERRY_MEM_STATS) */
#endif /* JERRY_MEM_STATS */
jmem_heap_finalize ();
} /* jmem_finalize */
@@ -185,21 +185,21 @@ jmem_compress_pointer (const void *pointer_p) /**< pointer to compress */
JERRY_ASSERT (uint_ptr % JMEM_ALIGNMENT == 0);
#if defined (ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY) && ENABLED (JERRY_CPOINTER_32_BIT)
#if defined (ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY) && JERRY_CPOINTER_32_BIT
JERRY_ASSERT (((jmem_cpointer_t) uint_ptr) == uint_ptr);
#else /* !ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY || !ENABLED (JERRY_CPOINTER_32_BIT) */
#else /* !ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY || !JERRY_CPOINTER_32_BIT */
const uintptr_t heap_start = (uintptr_t) &JERRY_HEAP_CONTEXT (first);
uint_ptr -= heap_start;
uint_ptr >>= JMEM_ALIGNMENT_LOG;
#if ENABLED (JERRY_CPOINTER_32_BIT)
#if JERRY_CPOINTER_32_BIT
JERRY_ASSERT (uint_ptr <= UINT32_MAX);
#else /* !ENABLED (JERRY_CPOINTER_32_BIT) */
#else /* !JERRY_CPOINTER_32_BIT */
JERRY_ASSERT (uint_ptr <= UINT16_MAX);
#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */
#endif /* JERRY_CPOINTER_32_BIT */
JERRY_ASSERT (uint_ptr != JMEM_CP_NULL);
#endif /* ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY && ENABLED (JERRY_CPOINTER_32_BIT) */
#endif /* ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY && JERRY_CPOINTER_32_BIT */
return (jmem_cpointer_t) uint_ptr;
} /* jmem_compress_pointer */
@@ -218,16 +218,16 @@ jmem_decompress_pointer (uintptr_t compressed_pointer) /**< pointer to decompres
JERRY_ASSERT (((jmem_cpointer_t) uint_ptr) == uint_ptr);
#if defined (ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY) && ENABLED (JERRY_CPOINTER_32_BIT)
#if defined (ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY) && JERRY_CPOINTER_32_BIT
JERRY_ASSERT (uint_ptr % JMEM_ALIGNMENT == 0);
#else /* !ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY || !ENABLED (JERRY_CPOINTER_32_BIT) */
#else /* !ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY || !JERRY_CPOINTER_32_BIT */
const uintptr_t heap_start = (uintptr_t) &JERRY_HEAP_CONTEXT (first);
uint_ptr <<= JMEM_ALIGNMENT_LOG;
uint_ptr += heap_start;
JERRY_ASSERT (jmem_is_heap_pointer ((void *) uint_ptr));
#endif /* ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY && ENABLED (JERRY_CPOINTER_32_BIT) */
#endif /* ECMA_VALUE_CAN_STORE_UINTPTR_VALUE_DIRECTLY && JERRY_CPOINTER_32_BIT */
return (void *) uint_ptr;
} /* jmem_decompress_pointer */
jerry-core/jmem/jmem-heap.c
+39 -40
View File
@@ -33,7 +33,7 @@
* @{
*/
#if !ENABLED (JERRY_SYSTEM_ALLOCATOR)
#if !JERRY_SYSTEM_ALLOCATOR
/**
* End of list marker.
*/
@@ -64,7 +64,7 @@ jmem_heap_get_region_end (jmem_heap_free_t *curr_p) /**< current region */
{
return (jmem_heap_free_t *) ((uint8_t *) curr_p + curr_p->size);
} /* jmem_heap_get_region_end */
#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */
#endif /* !JERRY_SYSTEM_ALLOCATOR */
/**
* Startup initialization of heap
@@ -72,11 +72,11 @@ jmem_heap_get_region_end (jmem_heap_free_t *curr_p) /**< current region */
void
jmem_heap_init (void)
{
#if !ENABLED (JERRY_SYSTEM_ALLOCATOR)
#if !ENABLED (JERRY_CPOINTER_32_BIT)
#if !JERRY_SYSTEM_ALLOCATOR
#if !JERRY_CPOINTER_32_BIT
/* the maximum heap size for 16bit compressed pointers should be 512K */
JERRY_ASSERT (((UINT16_MAX + 1) << JMEM_ALIGNMENT_LOG) >= JMEM_HEAP_SIZE);
#endif /* !ENABLED (JERRY_CPOINTER_32_BIT) */
#endif /* !JERRY_CPOINTER_32_BIT */
JERRY_ASSERT ((uintptr_t) JERRY_HEAP_CONTEXT (area) % JMEM_ALIGNMENT == 0);
JERRY_CONTEXT (jmem_heap_limit) = CONFIG_GC_LIMIT;
@@ -94,7 +94,7 @@ jmem_heap_init (void)
JMEM_VALGRIND_NOACCESS_SPACE (&JERRY_HEAP_CONTEXT (first), sizeof (jmem_heap_free_t));
JMEM_VALGRIND_NOACCESS_SPACE (JERRY_HEAP_CONTEXT (area), JMEM_HEAP_AREA_SIZE);
#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */
#endif /* !JERRY_SYSTEM_ALLOCATOR */
JMEM_HEAP_STAT_INIT ();
} /* jmem_heap_init */
@@ -105,9 +105,9 @@ void
jmem_heap_finalize (void)
{
JERRY_ASSERT (JERRY_CONTEXT (jmem_heap_allocated_size) == 0);
#if !ENABLED (JERRY_SYSTEM_ALLOCATOR)
#if !JERRY_SYSTEM_ALLOCATOR
JMEM_VALGRIND_NOACCESS_SPACE (&JERRY_HEAP_CONTEXT (first), JMEM_HEAP_SIZE);
#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */
#endif /* !JERRY_SYSTEM_ALLOCATOR */
} /* jmem_heap_finalize */
/**
@@ -122,7 +122,7 @@ jmem_heap_finalize (void)
static void * JERRY_ATTR_HOT
jmem_heap_alloc (const size_t size) /**< size of requested block */
{
#if !ENABLED (JERRY_SYSTEM_ALLOCATOR)
#if !JERRY_SYSTEM_ALLOCATOR
/* Align size. */
const size_t required_size = ((size + JMEM_ALIGNMENT - 1) / JMEM_ALIGNMENT) * JMEM_ALIGNMENT;
jmem_heap_free_t *data_space_p = NULL;
@@ -243,7 +243,7 @@ jmem_heap_alloc (const size_t size) /**< size of requested block */
JMEM_VALGRIND_MALLOCLIKE_SPACE (data_space_p, size);
return (void *) data_space_p;
#else /* ENABLED (JERRY_SYSTEM_ALLOCATOR) */
#else /* JERRY_SYSTEM_ALLOCATOR */
JERRY_CONTEXT (jmem_heap_allocated_size) += size;
while (JERRY_CONTEXT (jmem_heap_allocated_size) >= JERRY_CONTEXT (jmem_heap_limit))
@@ -252,7 +252,7 @@ jmem_heap_alloc (const size_t size) /**< size of requested block */
}
return malloc (size);
#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */
#endif /* !JERRY_SYSTEM_ALLOCATOR */
} /* jmem_heap_alloc */
/**
@@ -278,19 +278,18 @@ jmem_heap_gc_and_alloc_block (const size_t size, /**< required memory size */
jmem_pressure_t pressure = JMEM_PRESSURE_NONE;
#if !ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC)
#if !JERRY_MEM_GC_BEFORE_EACH_ALLOC
if (JERRY_CONTEXT (jmem_heap_allocated_size) + size >= JERRY_CONTEXT (jmem_heap_limit))
{
pressure = JMEM_PRESSURE_LOW;
ecma_free_unused_memory (pressure);
}
#else /* !ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */
#else /* !JERRY_MEM_GC_BEFORE_EACH_ALLOC */
ecma_gc_run ();
#endif /* ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */
#endif /* JERRY_MEM_GC_BEFORE_EACH_ALLOC */
void *data_space_p = jmem_heap_alloc (size);
/* cppcheck-suppress memleak */
while (JERRY_UNLIKELY (data_space_p == NULL) && JERRY_LIKELY (pressure < max_pressure))
{
pressure++;
@@ -342,17 +341,17 @@ jmem_heap_alloc_block_null_on_error (const size_t size) /**< required memory siz
{
void *block_p = jmem_heap_gc_and_alloc_block (size, JMEM_PRESSURE_HIGH);
#if ENABLED (JERRY_MEM_STATS)
#if JERRY_MEM_STATS
if (block_p != NULL)
{
JMEM_HEAP_STAT_ALLOC (size);
}
#endif /* ENABLED (JERRY_MEM_STATS) */
#endif /* JERRY_MEM_STATS */
return block_p;
} /* jmem_heap_alloc_block_null_on_error */
#if !ENABLED (JERRY_SYSTEM_ALLOCATOR)
#if !JERRY_SYSTEM_ALLOCATOR
/**
* Finds the block in the free block list which preceeds the argument block
*
@@ -446,7 +445,7 @@ jmem_heap_insert_block (jmem_heap_free_t *block_p, /**< block to insert */
JMEM_VALGRIND_NOACCESS_SPACE (block_p, sizeof (jmem_heap_free_t));
JMEM_VALGRIND_NOACCESS_SPACE (next_p, sizeof (jmem_heap_free_t));
} /* jmem_heap_insert_block */
#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */
#endif /* !JERRY_SYSTEM_ALLOCATOR */
/**
* Internal method for freeing a memory block.
@@ -459,7 +458,7 @@ jmem_heap_free_block_internal (void *ptr, /**< pointer to beginning of data spac
JERRY_ASSERT (JERRY_CONTEXT (jmem_heap_limit) >= JERRY_CONTEXT (jmem_heap_allocated_size));
JERRY_ASSERT (JERRY_CONTEXT (jmem_heap_allocated_size) > 0);
#if !ENABLED (JERRY_SYSTEM_ALLOCATOR)
#if !JERRY_SYSTEM_ALLOCATOR
/* checking that ptr points to the heap */
JERRY_ASSERT (jmem_is_heap_pointer (ptr));
JERRY_ASSERT ((uintptr_t) ptr % JMEM_ALIGNMENT == 0);
@@ -473,10 +472,10 @@ jmem_heap_free_block_internal (void *ptr, /**< pointer to beginning of data spac
JERRY_CONTEXT (jmem_heap_allocated_size) -= aligned_size;
JMEM_VALGRIND_FREELIKE_SPACE (ptr);
#else /* ENABLED (JERRY_SYSTEM_ALLOCATOR) */
#else /* JERRY_SYSTEM_ALLOCATOR */
JERRY_CONTEXT (jmem_heap_allocated_size) -= size;
free (ptr);
#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */
#endif /* !JERRY_SYSTEM_ALLOCATOR */
while (JERRY_CONTEXT (jmem_heap_allocated_size) + CONFIG_GC_LIMIT <= JERRY_CONTEXT (jmem_heap_limit))
{
JERRY_CONTEXT (jmem_heap_limit) -= CONFIG_GC_LIMIT;
@@ -495,7 +494,7 @@ jmem_heap_realloc_block (void *ptr, /**< memory region to reallocate */
const size_t old_size, /**< current size of the region */
const size_t new_size) /**< desired new size */
{
#if !ENABLED (JERRY_SYSTEM_ALLOCATOR)
#if !JERRY_SYSTEM_ALLOCATOR
JERRY_ASSERT (jmem_is_heap_pointer (ptr));
JERRY_ASSERT ((uintptr_t) ptr % JMEM_ALIGNMENT == 0);
JERRY_ASSERT (old_size != 0);
@@ -534,14 +533,14 @@ jmem_heap_realloc_block (void *ptr, /**< memory region to reallocate */
void *ret_block_p = NULL;
const size_t required_size = aligned_new_size - aligned_old_size;
#if !ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC)
#if !JERRY_MEM_GC_BEFORE_EACH_ALLOC
if (JERRY_CONTEXT (jmem_heap_allocated_size) + required_size >= JERRY_CONTEXT (jmem_heap_limit))
{
ecma_free_unused_memory (JMEM_PRESSURE_LOW);
}
#else /* !ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */
#else /* !JERRY_MEM_GC_BEFORE_EACH_ALLOC */
ecma_gc_run ();
#endif /* ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */
#endif /* JERRY_MEM_GC_BEFORE_EACH_ALLOC */
jmem_heap_free_t *prev_p = jmem_heap_find_prev (block_p);
JMEM_VALGRIND_DEFINED_SPACE (prev_p, sizeof (jmem_heap_free_t));
@@ -652,17 +651,17 @@ jmem_heap_realloc_block (void *ptr, /**< memory region to reallocate */
JMEM_HEAP_STAT_FREE (old_size);
JMEM_HEAP_STAT_ALLOC (new_size);
return ret_block_p;
#else /* ENABLED (JERRY_SYSTEM_ALLOCATOR) */
#else /* JERRY_SYSTEM_ALLOCATOR */
const size_t required_size = new_size - old_size;
#if !ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC)
#if !JERRY_MEM_GC_BEFORE_EACH_ALLOC
if (JERRY_CONTEXT (jmem_heap_allocated_size) + required_size >= JERRY_CONTEXT (jmem_heap_limit))
{
ecma_free_unused_memory (JMEM_PRESSURE_LOW);
}
#else /* !ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */
#else /* !JERRY_MEM_GC_BEFORE_EACH_ALLOC */
ecma_gc_run ();
#endif /* ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */
#endif /* JERRY_MEM_GC_BEFORE_EACH_ALLOC */
JERRY_CONTEXT (jmem_heap_allocated_size) += required_size;
@@ -679,7 +678,7 @@ jmem_heap_realloc_block (void *ptr, /**< memory region to reallocate */
JMEM_HEAP_STAT_FREE (old_size);
JMEM_HEAP_STAT_ALLOC (new_size);
return realloc (ptr, new_size);
#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */
#endif /* !JERRY_SYSTEM_ALLOCATOR */
} /* jmem_heap_realloc_block */
/**
@@ -707,17 +706,17 @@ jmem_heap_free_block (void *ptr, /**< pointer to beginning of data space of the
bool
jmem_is_heap_pointer (const void *pointer) /**< pointer */
{
#if !ENABLED (JERRY_SYSTEM_ALLOCATOR)
#if !JERRY_SYSTEM_ALLOCATOR
return ((uint8_t *) pointer >= JERRY_HEAP_CONTEXT (area)
&& (uint8_t *) pointer <= (JERRY_HEAP_CONTEXT (area) + JMEM_HEAP_AREA_SIZE));
#else /* ENABLED (JERRY_SYSTEM_ALLOCATOR) */
#else /* JERRY_SYSTEM_ALLOCATOR */
JERRY_UNUSED (pointer);
return true;
#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */
#endif /* !JERRY_SYSTEM_ALLOCATOR */
} /* jmem_is_heap_pointer */
#endif /* !JERRY_NDEBUG */
#if ENABLED (JERRY_MEM_STATS)
#if JERRY_MEM_STATS
/**
* Get heap memory usage statistics
*/
@@ -738,10 +737,10 @@ jmem_heap_stats_print (void)
jmem_heap_stats_t *heap_stats = &JERRY_CONTEXT (jmem_heap_stats);
JERRY_DEBUG_MSG ("Heap stats:\n");
#if !ENABLED (JERRY_SYSTEM_ALLOCATOR)
#if !JERRY_SYSTEM_ALLOCATOR
JERRY_DEBUG_MSG (" Heap size = %zu bytes\n",
heap_stats->size);
#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */
#endif /* !JERRY_SYSTEM_ALLOCATOR */
JERRY_DEBUG_MSG (" Allocated = %zu bytes\n"
" Peak allocated = %zu bytes\n"
" Waste = %zu bytes\n"
@@ -774,9 +773,9 @@ jmem_heap_stats_print (void)
void
jmem_heap_stat_init (void)
{
#if !ENABLED (JERRY_SYSTEM_ALLOCATOR)
#if !JERRY_SYSTEM_ALLOCATOR
JERRY_CONTEXT (jmem_heap_stats).size = JMEM_HEAP_AREA_SIZE;
#endif /* !ENABLED (JERRY_SYSTEM_ALLOCATOR) */
#endif /* !JERRY_SYSTEM_ALLOCATOR */
} /* jmem_heap_stat_init */
/**
@@ -819,7 +818,7 @@ jmem_heap_stat_free (size_t size) /**< Size of freed block */
heap_stats->waste_bytes -= waste_bytes;
} /* jmem_heap_stat_free */
#endif /* ENABLED (JERRY_MEM_STATS) */
#endif /* JERRY_MEM_STATS */
/**
* @}
jerry-core/jmem/jmem-poolman.c
+18 -18
View File
@@ -24,9 +24,9 @@
#define JMEM_ALLOCATOR_INTERNAL
#include "jmem-allocator-internal.h"
#if ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC)
#if JERRY_MEM_GC_BEFORE_EACH_ALLOC
#include "ecma-gc.h"
#endif /* ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */
#endif /* JERRY_MEM_GC_BEFORE_EACH_ALLOC */
/** \addtogroup mem Memory allocation
* @{
@@ -44,9 +44,9 @@ jmem_pools_finalize (void)
jmem_pools_collect_empty ();
JERRY_ASSERT (JERRY_CONTEXT (jmem_free_8_byte_chunk_p) == NULL);
#if ENABLED (JERRY_CPOINTER_32_BIT)
#if JERRY_CPOINTER_32_BIT
JERRY_ASSERT (JERRY_CONTEXT (jmem_free_16_byte_chunk_p) == NULL);
#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */
#endif /* JERRY_CPOINTER_32_BIT */
} /* jmem_pools_finalize */
/**
@@ -58,16 +58,16 @@ jmem_pools_finalize (void)
extern inline void * JERRY_ATTR_HOT JERRY_ATTR_ALWAYS_INLINE
jmem_pools_alloc (size_t size) /**< size of the chunk */
{
#if ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC)
#if JERRY_MEM_GC_BEFORE_EACH_ALLOC
ecma_gc_run ();
#endif /* ENABLED (JERRY_MEM_GC_BEFORE_EACH_ALLOC) */
#endif /* JERRY_MEM_GC_BEFORE_EACH_ALLOC */
#if ENABLED (JERRY_CPOINTER_32_BIT)
#if JERRY_CPOINTER_32_BIT
if (size <= 8)
{
#else /* !ENABLED (JERRY_CPOINTER_32_BIT) */
#else /* !JERRY_CPOINTER_32_BIT */
JERRY_ASSERT (size <= 8);
#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */
#endif /* JERRY_CPOINTER_32_BIT */
if (JERRY_CONTEXT (jmem_free_8_byte_chunk_p) != NULL)
{
@@ -87,7 +87,7 @@ jmem_pools_alloc (size_t size) /**< size of the chunk */
return chunk_p;
}
#if ENABLED (JERRY_CPOINTER_32_BIT)
#if JERRY_CPOINTER_32_BIT
}
JERRY_ASSERT (size <= 16);
@@ -109,7 +109,7 @@ jmem_pools_alloc (size_t size) /**< size of the chunk */
JMEM_HEAP_STAT_ALLOC (16);
return chunk_p;
}
#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */
#endif /* JERRY_CPOINTER_32_BIT */
} /* jmem_pools_alloc */
/**
@@ -126,17 +126,17 @@ jmem_pools_free (void *chunk_p, /**< pointer to the chunk */
JMEM_VALGRIND_DEFINED_SPACE (chunk_to_free_p, size);
#if ENABLED (JERRY_CPOINTER_32_BIT)
#if JERRY_CPOINTER_32_BIT
if (size <= 8)
{
#else /* !ENABLED (JERRY_CPOINTER_32_BIT) */
#else /* !JERRY_CPOINTER_32_BIT */
JERRY_ASSERT (size <= 8);
#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */
#endif /* JERRY_CPOINTER_32_BIT */
chunk_to_free_p->next_p = JERRY_CONTEXT (jmem_free_8_byte_chunk_p);
JERRY_CONTEXT (jmem_free_8_byte_chunk_p) = chunk_to_free_p;
#if ENABLED (JERRY_CPOINTER_32_BIT)
#if JERRY_CPOINTER_32_BIT
}
else
{
@@ -145,7 +145,7 @@ jmem_pools_free (void *chunk_p, /**< pointer to the chunk */
chunk_to_free_p->next_p = JERRY_CONTEXT (jmem_free_16_byte_chunk_p);
JERRY_CONTEXT (jmem_free_16_byte_chunk_p) = chunk_to_free_p;
}
#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */
#endif /* JERRY_CPOINTER_32_BIT */
JMEM_VALGRIND_NOACCESS_SPACE (chunk_to_free_p, size);
} /* jmem_pools_free */
@@ -169,7 +169,7 @@ jmem_pools_collect_empty (void)
chunk_p = next_p;
}
#if ENABLED (JERRY_CPOINTER_32_BIT)
#if JERRY_CPOINTER_32_BIT
chunk_p = JERRY_CONTEXT (jmem_free_16_byte_chunk_p);
JERRY_CONTEXT (jmem_free_16_byte_chunk_p) = NULL;
@@ -182,7 +182,7 @@ jmem_pools_collect_empty (void)
jmem_heap_free_block_internal (chunk_p, 16);
chunk_p = next_p;
}
#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */
#endif /* JERRY_CPOINTER_32_BIT */
} /* jmem_pools_collect_empty */
/**
jerry-core/jmem/jmem.h
+8 -8
View File
@@ -55,11 +55,11 @@
/**
* Shift for tag part in jmem_cpointer_tag_t
*/
#if defined (JMEM_CAN_STORE_POINTER_VALUE_DIRECTLY) && ENABLED (JERRY_CPOINTER_32_BIT)
#if defined (JMEM_CAN_STORE_POINTER_VALUE_DIRECTLY) && JERRY_CPOINTER_32_BIT
#define JMEM_TAG_SHIFT 0
#else /* !JMEM_CAN_STORE_POINTER_VALUE_DIRECTLY || !ENABLED (JERRY_CPOINTER_32_BIT) */
#else /* !JMEM_CAN_STORE_POINTER_VALUE_DIRECTLY || !JERRY_CPOINTER_32_BIT */
#define JMEM_TAG_SHIFT 3
#endif /* JMEM_CAN_STORE_POINTER_VALUE_DIRECTLY && ENABLED (JERRY_CPOINTER_32_BIT) */
#endif /* JMEM_CAN_STORE_POINTER_VALUE_DIRECTLY && JERRY_CPOINTER_32_BIT */
/**
* Bit mask for tag part in jmem_cpointer_tag_t
@@ -94,11 +94,11 @@ enum
/**
* Compressed pointer
*/
#if ENABLED (JERRY_CPOINTER_32_BIT)
#if JERRY_CPOINTER_32_BIT
typedef uint32_t jmem_cpointer_t;
#else /* !ENABLED (JERRY_CPOINTER_32_BIT) */
#else /* !JERRY_CPOINTER_32_BIT */
typedef uint16_t jmem_cpointer_t;
#endif /* ENABLED (JERRY_CPOINTER_32_BIT) */
#endif /* JERRY_CPOINTER_32_BIT */
/**
* Compressed pointer with tag value
@@ -147,7 +147,7 @@ void *jmem_heap_alloc_block_null_on_error (const size_t size);
void *jmem_heap_realloc_block (void *ptr, const size_t old_size, const size_t new_size);
void jmem_heap_free_block (void *ptr, const size_t size);
#if ENABLED (JERRY_MEM_STATS)
#if JERRY_MEM_STATS
/**
* Heap memory usage statistics
*/
@@ -186,7 +186,7 @@ void jmem_stats_free_property_bytes (size_t property_size);
void jmem_heap_get_stats (jmem_heap_stats_t *);
void jmem_heap_stats_reset_peak (void);
void jmem_heap_stats_print (void);
#endif /* ENABLED (JERRY_MEM_STATS) */
#endif /* JERRY_MEM_STATS */
jmem_cpointer_t JERRY_ATTR_PURE jmem_compress_pointer (const void *pointer_p);
void * JERRY_ATTR_PURE jmem_decompress_pointer (uintptr_t compressed_pointer);