ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gcc: support address sanitizer

This commit is contained in:
Gregory Hainaut 2014-07-12 19:57:26 +02:00
parent 8c03d50421
commit c60fefa1a6
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.sh
View File

@ -30,6 +30,7 @@ do
--gles ) flags="$flags -DGLES_API=TRUE" ;; --gles ) flags="$flags -DGLES_API=TRUE" ;;
--sdl2 ) flags="$flags -DSDL2_API=TRUE" ;; --sdl2 ) flags="$flags -DSDL2_API=TRUE" ;;
--extra ) flags="$flags -DEXTRA_PLUGINS=TRUE" ;; --extra ) flags="$flags -DEXTRA_PLUGINS=TRUE" ;;
--asan ) flags="$flags -DUSE_ASAN=TRUE";;
--clang ) use_clang=1; flags="$flags -DUSE_CLANG=TRUE" ;; --clang ) use_clang=1; flags="$flags -DUSE_CLANG=TRUE" ;;
--clean ) clean_build=1 ;; --clean ) clean_build=1 ;;
@ -40,8 +41,11 @@ do
echo "--debug : Build PCSX2 as a Debug build." echo "--debug : Build PCSX2 as a Debug build."
echo "--release : Build PCSX2 as a Release build." echo "--release : Build PCSX2 as a Release build."
echo "--clean : Do a clean build." echo "--clean : Do a clean build."
echo "--extra : Build all plugins"
echo "** Developper option **" echo "** Developper option **"
echo "--clang : Build with Clang/llvm"
echo "--extra : Build all plugins"
echo "--asan : Enable with Address sanitizer"
echo ""
echo "--glsl : Replace CG backend of ZZogl by GLSL" echo "--glsl : Replace CG backend of ZZogl by GLSL"
echo "--egl : Replace GLX by EGL (ZZogl plugins only)" echo "--egl : Replace GLX by EGL (ZZogl plugins only)"
echo "--sdl2 : Build with SDL2 (crash if wx is linked to SDL1)" echo "--sdl2 : Build with SDL2 (crash if wx is linked to SDL1)"

9
cmake/BuildParameters.cmake
View File

@ -53,6 +53,7 @@ endif(PACKAGE_MODE)
# Compiler extra # Compiler extra
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
option(USE_CLANG "Use llvm/clang to build PCSX2 (developer option)") option(USE_CLANG "Use llvm/clang to build PCSX2 (developer option)")
option(USE_ASAN "Enable address sanitizer")
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Select the architecture # Select the architecture
@ -204,7 +205,13 @@ else()
set(DEBUG_FLAG "") set(DEBUG_FLAG "")
endif() endif()
set(DEFAULT_GCC_FLAG "${ARCH_FLAG} ${COMMON_FLAG} ${DEFAULT_WARNINGS} ${HARDENING_FLAG} ${DEBUG_FLAG}") if (USE_ASAN)
set(ASAN_FLAG "-fsanitize=address -fno-omit-frame-pointer -g -mpreferred-stack-boundary=4 -mincoming-stack-boundary=2 -DASAN_WORKAROUND")
else()
set(ASAN_FLAG "")
endif()
set(DEFAULT_GCC_FLAG "${ARCH_FLAG} ${COMMON_FLAG} ${DEFAULT_WARNINGS} ${HARDENING_FLAG} ${DEBUG_FLAG} ${ASAN_FLAG}")
# c++ only flags # c++ only flags
set(DEFAULT_CPP_FLAG "${DEFAULT_GCC_FLAG} -Wno-invalid-offsetof") set(DEFAULT_CPP_FLAG "${DEFAULT_GCC_FLAG} -Wno-invalid-offsetof")

6
common/src/Utilities/AlignedMalloc.cpp
View File

@ -30,7 +30,7 @@ void* __fastcall pcsx2_aligned_malloc(size_t size, size_t align)
{ {
pxAssert( align < 0x10000 ); pxAssert( align < 0x10000 );
#ifdef __USE_ISOC11 #if defined(__USE_ISOC11) && !defined(ASAN_WORKAROUND) // not supported yet on gcc 4.9
return aligned_alloc(align, size); return aligned_alloc(align, size);
#else #else
u8* p = (u8*)malloc(size+align+headsize); u8* p = (u8*)malloc(size+align+headsize);
@ -57,7 +57,7 @@ void* __fastcall pcsx2_aligned_realloc(void* handle, size_t size, size_t align)
if( handle != NULL ) if( handle != NULL )
{ {
#ifdef __USE_ISOC11 #if defined(__USE_ISOC11) && !defined(ASAN_WORKAROUND) // not supported yet on gcc 4.9
memcpy_fast( newbuf, handle, size ); memcpy_fast( newbuf, handle, size );
free( handle ); free( handle );
#else #else
@ -71,7 +71,7 @@ void* __fastcall pcsx2_aligned_realloc(void* handle, size_t size, size_t align)
__fi void pcsx2_aligned_free(void* pmem) __fi void pcsx2_aligned_free(void* pmem)
{ {
#ifdef __USE_ISOC11 #if defined(__USE_ISOC11) && !defined(ASAN_WORKAROUND) // not supported yet on gcc 4.9
free(pmem); free(pmem);
#else #else
if( pmem == NULL ) return; if( pmem == NULL ) return;

2
plugins/GSdx/stdafx.cpp
View File

@ -107,7 +107,7 @@ void vmfree(void* ptr, size_t size)
// declare linux equivalents (alignment must be power of 2 (1,2,4...2^15) // declare linux equivalents (alignment must be power of 2 (1,2,4...2^15)
#if !defined(__USE_ISOC11) #if !defined(__USE_ISOC11) || defined(ASAN_WORKAROUND)
void* _aligned_malloc(size_t size, size_t alignment) void* _aligned_malloc(size_t size, size_t alignment)
{ {

2
plugins/GSdx/stdafx.h
View File

@ -358,7 +358,7 @@ struct aligned_free_second {template<class T> void operator()(T& p) {_aligned_fr
#if !defined(_MSC_VER) #if !defined(_MSC_VER)
#if defined(__USE_ISOC11) #if defined(__USE_ISOC11) && !defined(ASAN_WORKAROUND) // not supported yet on gcc 4.9
#define _aligned_malloc(size, a) aligned_alloc(a, size) #define _aligned_malloc(size, a) aligned_alloc(a, size)
static inline void _aligned_free(void* p) { free(p); } static inline void _aligned_free(void* p) { free(p); }