Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5513 from kaienfr/fix_iOS7_crash

Browse source 
fix iOS7 crash
This commit is contained in:
Henrik Rydgård 2014-02-19 14:41:29 +07:00
commit 148b910de3
1 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Common/MemArena.cpp
View file

@ -34,6 +34,10 @@
#endif
#endif
#ifdef IOS
void* globalbase=NULL;
#endif
#ifdef ANDROID
// Hopefully this ABI will never change...
@ -230,13 +234,28 @@ u8* MemArena::Find4GBBase()
}
return base;
#else
void* base = mmap(0, 0x10000000, PROT_READ | PROT_WRITE,
MAP_ANON | MAP_SHARED, -1, 0);
if (base == MAP_FAILED) {
PanicAlert("Failed to map 256 MB of memory space: %s", strerror(errno));
return 0;
}
munmap(base, 0x10000000);
#ifdef IOS
void* base = NULL;
if (globalbase==NULL){
base = mmap(0, 0x08000000, PROT_READ | PROT_WRITE,
MAP_ANON | MAP_SHARED, -1, 0);
if (base == MAP_FAILED) {
PanicAlert("Failed to map 128 MB of memory space: %s", strerror(errno));
return 0;
}
munmap(base, 0x08000000);
globalbase=base;
}
else{base=globalbase;}
#else
void* base = mmap(0, 0x10000000, PROT_READ | PROT_WRITE,
MAP_ANON | MAP_SHARED, -1, 0);
if (base == MAP_FAILED) {
PanicAlert("Failed to map 256 MB of memory space: %s", strerror(errno));
return 0;
}
munmap(base, 0x10000000);
#endif
return static_cast<u8*>(base);
#endif
#endif