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

32-bit Linux fix: check result of mmap(): if it fails, it returns MAP_FAILED, which is not equal to 0. Also print error message associated with errno. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@554 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Maarten ter Huurne 2008-09-17 08:08:22 +00:00
parent f70819197a
commit 1f66120671
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Common/Src/MemArena.cpp
View File

@ -25,6 +25,8 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <cerrno>
#include <cstring>
#endif #endif
#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON) #if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
@ -131,6 +133,10 @@ u8* MemArena::Find4GBBase()
return base; return base;
#else #else
void* base = mmap(0, 0x31000000, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED, 0, 0); void* base = mmap(0, 0x31000000, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED, 0, 0);
if (base == MAP_FAILED) {
PanicAlert("Failed to map 1 GB of memory space: %s", strerror(errno));
return 0;
}
munmap(base, 0x31000000); munmap(base, 0x31000000);
return static_cast<u8*>(base); return static_cast<u8*>(base);
#endif #endif