From 9ed3862c0a7387adbe80125741c1e76de90eff77 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Wed, 12 Jan 2011 21:25:33 +0000 Subject: [PATCH] Executable memory above 2GB is okay on a 32-bit machine. Fixes issue 3913. The underlying problem, however, is that PanicAlert GUI popups are broken on 32-bit Linux. I haven't looked into why that is. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6836 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/MemoryUtil.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Core/Common/Src/MemoryUtil.cpp b/Source/Core/Common/Src/MemoryUtil.cpp index ee46dac345..0a5a64322a 100644 --- a/Source/Core/Common/Src/MemoryUtil.cpp +++ b/Source/Core/Common/Src/MemoryUtil.cpp @@ -48,8 +48,10 @@ void* AllocateExecutableMemory(size_t size, bool low) if (ptr == NULL) PanicAlert("Failed to allocate executable memory"); +#ifdef _M_X64 if ((u64)ptr >= 0x80000000 && low == true) PanicAlert("Executable memory ended up above 2GB!"); +#endif return ptr; }