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-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 */
/**