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

Merge pull request #1820 from Tilka/valgrind 

MemoryUtil: add comment for Valgrind
This commit is contained in:
Ryan Houdek 2015-01-11 19:27:29 -06:00
parent 7105e5a8f0 52b1a54597
commit 11a36ca8e2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Common/MemoryUtil.cpp
View File

@ -21,6 +21,10 @@
#include <sys/mman.h> #include <sys/mman.h>
#endif #endif
// Valgrind doesn't support MAP_32BIT.
// Uncomment the following line to be able to run Dolphin in Valgrind.
//#undef MAP_32BIT
#if !defined(_WIN32) && defined(_M_X86_64) && !defined(MAP_32BIT) #if !defined(_WIN32) && defined(_M_X86_64) && !defined(MAP_32BIT)
#include <unistd.h> #include <unistd.h>
#define PAGE_MASK (getpagesize() - 1) #define PAGE_MASK (getpagesize() - 1)
@ -65,7 +69,7 @@ void* AllocateExecutableMemory(size_t size, bool low)
{ {
ptr = nullptr; ptr = nullptr;
#endif #endif
PanicAlert("Failed to allocate executable memory"); PanicAlert("Failed to allocate executable memory. If you are running Dolphin in Valgrind, try '#undef MAP_32BIT'.");
} }
#if !defined(_WIN32) && defined(_M_X86_64) && !defined(MAP_32BIT) #if !defined(_WIN32) && defined(_M_X86_64) && !defined(MAP_32BIT)
else else