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

Revert "Fixes: JERRY_NVALGRIND effect was inverted; also a block was marked as inaccessible too early."

Browse Source 
This reverts commit 53c0da4307b1407f506ff71b0e014eefe00da985.
This commit is contained in:
Ruben Ayrapetyan
2014-08-01 18:29:55 +04:00
parent a6feea1068
commit fa87696275
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.mk
+1 -1
View File
@@ -165,7 +165,7 @@ CFLAGS_WFATAL_ERRORS ?= -Wfatal-errors
# Optimizations # Optimizations
CFLAGS_OPTIMIZE ?= -Os -flto CFLAGS_OPTIMIZE ?= -Os -flto
CFLAGS_NO_OPTIMIZE ?= -O0 CFLAGS_NO_OPTIMIZE ?= -Og
LDFLAGS_OPTIMIZE ?= LDFLAGS_OPTIMIZE ?=
LDFLAGS_NO_OPTIMIZE ?= LDFLAGS_NO_OPTIMIZE ?=
src/liballocator/mem-heap.c
+9 -9
View File
@@ -33,6 +33,13 @@
* Valgrind-related options and headers * Valgrind-related options and headers
*/ */
#ifndef JERRY_NVALGRIND #ifndef JERRY_NVALGRIND
# define VALGRIND_NOACCESS_STRUCT( s)
# define VALGRIND_UNDEFINED_STRUCT( s)
# define VALGRIND_DEFINED_STRUCT( s)
# define VALGRIND_NOACCESS_SPACE( p, s)
# define VALGRIND_UNDEFINED_SPACE( p, s)
# define VALGRIND_DEFINED_SPACET( p, s)
#else /* !JERRRY_NVALGRIND */
# include "memcheck.h" # include "memcheck.h"
# define VALGRIND_NOACCESS_STRUCT( s) VALGRIND_MAKE_MEM_NOACCESS( ( s ), sizeof( *( s ) ) ) # define VALGRIND_NOACCESS_STRUCT( s) VALGRIND_MAKE_MEM_NOACCESS( ( s ), sizeof( *( s ) ) )
@@ -41,13 +48,6 @@
# define VALGRIND_NOACCESS_SPACE( p, s) VALGRIND_MAKE_MEM_NOACCESS( ( p ), ( s ) ) # 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_UNDEFINED_SPACE( p, s) VALGRIND_MAKE_MEM_UNDEFINED( ( p ), ( s ) )
# define VALGRIND_DEFINED_SPACET( p, s) VALGRIND_MAKE_MEM_DEFINED( ( p ), ( s ) ) # define VALGRIND_DEFINED_SPACET( p, s) VALGRIND_MAKE_MEM_DEFINED( ( p ), ( s ) )
#else /* !JERRRY_NVALGRIND */
# define VALGRIND_NOACCESS_STRUCT( s)
# define VALGRIND_UNDEFINED_STRUCT( s)
# define VALGRIND_DEFINED_STRUCT( s)
# define VALGRIND_NOACCESS_SPACE( p, s)
# define VALGRIND_UNDEFINED_SPACE( p, s)
# define VALGRIND_DEFINED_SPACET( p, s)
#endif /* !JERRY_NVALGRIND */ #endif /* !JERRY_NVALGRIND */
/** /**
@@ -253,9 +253,9 @@ mem_init_block_header( uint8_t *first_chunk_p, /**< address of the first
block_header_p->neighbours[ MEM_DIRECTION_NEXT ] = next_block_p; block_header_p->neighbours[ MEM_DIRECTION_NEXT ] = next_block_p;
block_header_p->allocated_bytes = allocated_bytes; block_header_p->allocated_bytes = allocated_bytes;
JERRY_ASSERT( allocated_bytes <= mem_get_block_data_space_size( block_header_p) );
VALGRIND_NOACCESS_STRUCT( block_header_p); VALGRIND_NOACCESS_STRUCT( block_header_p);
JERRY_ASSERT( allocated_bytes <= mem_get_block_data_space_size( block_header_p) );
} /* mem_init_block_header */ } /* mem_init_block_header */
/** /**