Unifiy the comments of preprocessor conditionals
JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu
This commit is contained in:
@@ -56,9 +56,9 @@ mem_finalize (bool is_show_mem_stats) /**< show heap memory stats
|
||||
{
|
||||
mem_stats_print ();
|
||||
}
|
||||
#else /* MEM_STATS */
|
||||
#else /* !MEM_STATS */
|
||||
(void) is_show_mem_stats;
|
||||
#endif /* !MEM_STATS */
|
||||
#endif /* MEM_STATS */
|
||||
|
||||
mem_heap_finalize ();
|
||||
} /* mem_finalize */
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
# define VALGRIND_UNDEFINED_SPACE(p, s) VALGRIND_MAKE_MEM_UNDEFINED((p), (s))
|
||||
# define VALGRIND_DEFINED_SPACE(p, s) VALGRIND_MAKE_MEM_DEFINED((p), (s))
|
||||
|
||||
#else /* JERRY_VALGRIND */
|
||||
#else /* !JERRY_VALGRIND */
|
||||
# define VALGRIND_NOACCESS_SPACE(p, s)
|
||||
# define VALGRIND_UNDEFINED_SPACE(p, s)
|
||||
# define VALGRIND_DEFINED_SPACE(p, s)
|
||||
@@ -83,7 +83,7 @@ void mem_heap_valgrind_freya_mempool_request (void)
|
||||
VALGRIND_FREELIKE_BLOCK((p), 0); \
|
||||
}
|
||||
|
||||
#else /* JERRY_VALGRIND_FREYA */
|
||||
#else /* !JERRY_VALGRIND_FREYA */
|
||||
# define VALGRIND_FREYA_CHECK_MEMPOOL_REQUEST
|
||||
# define VALGRIND_FREYA_MALLOCLIKE_SPACE(p, s)
|
||||
# define VALGRIND_FREYA_FREELIKE_SPACE(p)
|
||||
@@ -105,11 +105,11 @@ typedef struct
|
||||
#if UINTPTR_MAX > UINT32_MAX
|
||||
#define MEM_HEAP_GET_OFFSET_FROM_ADDR(p) ((uint32_t) ((uint8_t *) (p) - (uint8_t *) mem_heap.area))
|
||||
#define MEM_HEAP_GET_ADDR_FROM_OFFSET(u) ((mem_heap_free_t *) &mem_heap.area[u])
|
||||
#else
|
||||
#else /* UINTPTR_MAX <= UINT32_MAX */
|
||||
/* In this case we simply store the pointer, since it fits anyway. */
|
||||
#define MEM_HEAP_GET_OFFSET_FROM_ADDR(p) ((uint32_t) (p))
|
||||
#define MEM_HEAP_GET_ADDR_FROM_OFFSET(u) ((mem_heap_free_t *)(u))
|
||||
#endif
|
||||
#endif /* UINTPTR_MAX > UINT32_MAX */
|
||||
|
||||
/**
|
||||
* Get end of region
|
||||
@@ -139,9 +139,9 @@ typedef struct
|
||||
*/
|
||||
#ifndef JERRY_HEAP_SECTION_ATTR
|
||||
mem_heap_t mem_heap;
|
||||
#else
|
||||
#else /* JERRY_HEAP_SECTION_ATTR */
|
||||
mem_heap_t mem_heap __attribute__ ((section (JERRY_HEAP_SECTION_ATTR)));
|
||||
#endif
|
||||
#endif /* !JERRY_HEAP_SECTION_ATTR */
|
||||
|
||||
/**
|
||||
* Check size of heap is corresponding to configuration
|
||||
@@ -191,7 +191,7 @@ static void mem_heap_stat_free_iter ();
|
||||
# define MEM_HEAP_STAT_NONSKIP()
|
||||
# define MEM_HEAP_STAT_ALLOC_ITER()
|
||||
# define MEM_HEAP_STAT_FREE_ITER()
|
||||
#endif /* !MEM_STATS */
|
||||
#endif /* MEM_STATS */
|
||||
|
||||
/**
|
||||
* Startup initialization of heap
|
||||
|
||||
@@ -75,13 +75,13 @@ extern void mem_heap_stats_print (void);
|
||||
|
||||
#ifdef JERRY_VALGRIND
|
||||
#error Valgrind and valgrind-freya modes are not compatible.
|
||||
#endif
|
||||
#endif /* JERRY_VALGRIND */
|
||||
|
||||
extern void mem_heap_valgrind_freya_mempool_request (void);
|
||||
|
||||
#define MEM_HEAP_VALGRIND_FREYA_MEMPOOL_REQUEST() mem_heap_valgrind_freya_mempool_request ()
|
||||
|
||||
#else /* JERRY_VALGRIND_FREYA */
|
||||
#else /* !JERRY_VALGRIND_FREYA */
|
||||
|
||||
#define MEM_HEAP_VALGRIND_FREYA_MEMPOOL_REQUEST()
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ static void mem_pools_stat_dealloc (void);
|
||||
# define MEM_POOLS_STAT_NEW_ALLOC()
|
||||
# define MEM_POOLS_STAT_REUSE()
|
||||
# define MEM_POOLS_STAT_DEALLOC()
|
||||
#endif /* !MEM_STATS */
|
||||
#endif /* MEM_STATS */
|
||||
|
||||
/*
|
||||
* Valgrind-related options and headers
|
||||
@@ -82,7 +82,7 @@ static void mem_pools_stat_dealloc (void);
|
||||
# define VALGRIND_NOACCESS_SPACE(p, s) VALGRIND_MAKE_MEM_NOACCESS((p), (s))
|
||||
# define VALGRIND_UNDEFINED_SPACE(p, s) VALGRIND_MAKE_MEM_UNDEFINED((p), (s))
|
||||
# define VALGRIND_DEFINED_SPACE(p, s) VALGRIND_MAKE_MEM_DEFINED((p), (s))
|
||||
#else /* JERRY_VALGRIND */
|
||||
#else /* !JERRY_VALGRIND */
|
||||
# define VALGRIND_NOACCESS_SPACE(p, s)
|
||||
# define VALGRIND_UNDEFINED_SPACE(p, s)
|
||||
# define VALGRIND_DEFINED_SPACE(p, s)
|
||||
@@ -93,7 +93,7 @@ static void mem_pools_stat_dealloc (void);
|
||||
|
||||
# define VALGRIND_FREYA_MALLOCLIKE_SPACE(p, s) VALGRIND_MALLOCLIKE_BLOCK((p), (s), 0, 0)
|
||||
# define VALGRIND_FREYA_FREELIKE_SPACE(p) VALGRIND_FREELIKE_BLOCK((p), 0)
|
||||
#else /* JERRY_VALGRIND_FREYA */
|
||||
#else /* !JERRY_VALGRIND_FREYA */
|
||||
# define VALGRIND_FREYA_MALLOCLIKE_SPACE(p, s)
|
||||
# define VALGRIND_FREYA_FREELIKE_SPACE(p)
|
||||
#endif /* JERRY_VALGRIND_FREYA */
|
||||
|
||||
Reference in New Issue
Block a user