summaryrefslogtreecommitdiff
path: root/Source/Core/Common/Src/MemArena.cpp
diff options
context:
space:
mode:
authorhrydgard <hrydgard@gmail.com>2008-07-31 06:37:47 +0000
committerhrydgard <hrydgard@gmail.com>2008-07-31 06:37:47 +0000
commitd1140d999d6c17087e015f6512eaabe3cc7bbd8a (patch)
treef36487fb1fdf6bc4236696942b2c2aeb0c6894b1 /Source/Core/Common/Src/MemArena.cpp
parent8f1628b69c0499ce5dfaef6405def29a400c67a9 (diff)
Blargh, 109 broke things, reverted most of it.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@112 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common/Src/MemArena.cpp')
-rw-r--r--Source/Core/Common/Src/MemArena.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/Common/Src/MemArena.cpp b/Source/Core/Common/Src/MemArena.cpp
index aedd1f697e..11a87d524c 100644
--- a/Source/Core/Common/Src/MemArena.cpp
+++ b/Source/Core/Common/Src/MemArena.cpp
@@ -112,12 +112,12 @@ u64 MemArena::Find4GBBase()
VirtualFree(base, 0, MEM_RELEASE);
return((u64)base);
#else
- // TODO(ector): Do correctly (yeah i know how to do it now :P)
+ // Very precarious - mmap cannot return an error when trying to map already used pages.
+ // This makes the Windows approach above unusable on Linux, so we will simply pray...
return(0x2300000000ULL);
#endif
#else
- // This is the one that will be tricky on Unix, if I want to be nice.
// 32 bit
// The highest thing in any 1GB section of memory space is the locked cache. We only need to fit it.
u8* base = (u8*)VirtualAlloc(0, 0x31000000, MEM_RESERVE, PAGE_READWRITE);