diff options
| author | magumagu <magumagu9@gmail.com> | 2015-02-11 17:04:12 -0800 |
|---|---|---|
| committer | magumagu <magumagu9@gmail.com> | 2015-02-11 17:04:12 -0800 |
| commit | 0e0a196a1c3aefc3cd163de8d9e5636f4353a741 (patch) | |
| tree | d632f6eaa7e5ed6f571c16f95a1caf6b477a6ae5 /Source/Core/Common/MemArena.cpp | |
| parent | b7e455ece8dfef9a553b7685106626a6ca0d0877 (diff) | |
| parent | 4193350d226f5ca2d2d6630154b34b478bbedec9 (diff) | |
Merge pull request #1856 from magumagu/correct-translation-disable-2
Make address translation respect the CPU translation mode
Diffstat (limited to 'Source/Core/Common/MemArena.cpp')
| -rw-r--r-- | Source/Core/Common/MemArena.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/Common/MemArena.cpp b/Source/Core/Common/MemArena.cpp index 544f9354cf..fc910daf9c 100644 --- a/Source/Core/Common/MemArena.cpp +++ b/Source/Core/Common/MemArena.cpp @@ -127,12 +127,12 @@ void MemArena::ReleaseView(void* view, size_t size) } -u8* MemArena::Find4GBBase() +u8* MemArena::FindMemoryBase() { #if _ARCH_64 #ifdef _WIN32 // 64 bit - u8* base = (u8*)VirtualAlloc(0, 0xE1000000, MEM_RESERVE, PAGE_READWRITE); + u8* base = (u8*)VirtualAlloc(0, 0x400000000, MEM_RESERVE, PAGE_READWRITE); VirtualFree(base, 0, MEM_RELEASE); return base; #else @@ -250,7 +250,7 @@ u8 *MemoryMap_Setup(MemoryView *views, int num_views, u32 flags, MemArena *arena arena->GrabSHMSegment(total_mem); // Now, create views in high memory where there's plenty of space. - u8 *base = MemArena::Find4GBBase(); + u8 *base = MemArena::FindMemoryBase(); // This really shouldn't fail - in 64-bit, there will always be enough // address space. if (!Memory_TryBase(base, views, num_views, flags, arena)) |