Add a universal option to the osx flag, does not work yet since scons strips out the -arch flag that it thinks is a duplicate, add to linker flags since cross compiling on OSX was failing since it was trying to link everything as the wrong arch. Re-Enable the loadstores in 32bit Dolphin in OSX, due to the reason described in the comments (Fast 32bit OSX!). Add an alert if the memory space ends up above 32bit in *nix sides, since it will ALWAYS be above in 64bit OSX, Will try to fix.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5155 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1
2010-03-05 09:23:28 +00:00
parent e79dc93a5c
commit d18ab50520
3 changed files with 18 additions and 1 deletions

View File

@ -62,6 +62,13 @@ void* AllocateExecutableMemory(size_t size, bool low)
, -1, 0); // | MAP_FIXED
// printf("Mapped executable memory at %p (size %i)\n", retval, size);
if ((u64)ptr >= 0x80000000)
{
// Should only happen in 64bit OSX
// Just a reminder, to show a OSX user that it may fail
PanicAlert("Executable memory ended up above 2GB!");
}
if (!retval)
{
PanicAlert("Failed to allocate executable memory, errno=%i", errno);